From a013d478e0371db18edd889168a22ebf63bfc766 Mon Sep 17 00:00:00 2001
From: Ruben van der Linde <ruben@conduction.nl>
Date: Mon, 16 Feb 2026 09:57:28 +0100
Subject: [PATCH 1/2] Automatische versies

---
 .../ModuleComplianceSubscriber.php            |  16 +-
 lib/Service/ModuleVersionService.php          | 163 +++++++++++++++++
 lib/Service/SettingsService.php               |   1 +
 lib/Settings/softwarecatalogus_register.json  | 172 ++++++++++++++++--
 4 files changed, 338 insertions(+), 14 deletions(-)
 create mode 100644 lib/Service/ModuleVersionService.php

diff --git a/lib/EventListener/ModuleComplianceSubscriber.php b/lib/EventListener/ModuleComplianceSubscriber.php
index 8eabf3e0..fb21f0df 100644
--- a/lib/EventListener/ModuleComplianceSubscriber.php
+++ b/lib/EventListener/ModuleComplianceSubscriber.php
@@ -19,6 +19,7 @@
 namespace OCA\SoftwareCatalog\EventListener;
 
 use OCA\SoftwareCatalog\Service\ModuleComplianceService;
+use OCA\SoftwareCatalog\Service\ModuleVersionService;
 use OCA\SoftwareCatalog\Service\SettingsService;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
@@ -109,7 +110,7 @@ public function handle(Event $event): void
             // Handle module compliance update
             $moduleComplianceService = $this->container->get(ModuleComplianceService::class);
             $moduleComplianceService->handleModuleComplianceUpdate($object);
-            
+
             $logger->info('ModuleComplianceSubscriber: Successfully processed module compliance update', [
                 'objectId' => $objectId,
                 'timestamp' => date('Y-m-d H:i:s')
@@ -123,5 +124,18 @@ public function handle(Event $event): void
                 'trace' => $e->getTraceAsString()
             ]);
         }
+
+        // Ensure the module has at least one version (default 1.0.0).
+        try {
+            $moduleVersionService = $this->container->get(ModuleVersionService::class);
+            $moduleVersionService->ensureDefaultVersion($object);
+        } catch (\Exception $e) {
+            $logger->error('ModuleComplianceSubscriber: Failed to ensure default module version', [
+                'objectId' => $objectId,
+                'exception' => $e->getMessage(),
+                'file' => $e->getFile(),
+                'line' => $e->getLine(),
+            ]);
+        }
     }
 }
diff --git a/lib/Service/ModuleVersionService.php b/lib/Service/ModuleVersionService.php
new file mode 100644
index 00000000..2998b61e
--- /dev/null
+++ b/lib/Service/ModuleVersionService.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * Module Version Service
+ *
+ * Ensures every module has at least one version (moduleVersie).
+ * If no versions exist, creates a default 1.0.0 version using
+ * the module's name and description.
+ *
+ * @category  Service
+ * @package   OCA\SoftwareCatalog\Service
+ * @author    Conduction b.v. <info@conduction.nl>
+ * @copyright 2024 Conduction B.V.
+ * @license   AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
+ * @version   1.0.0
+ * @link      https://github.com/ConductionNL/SoftwareCatalog
+ */
+
+declare(strict_types=1);
+
+namespace OCA\SoftwareCatalog\Service;
+
+use OCA\OpenRegister\Service\ObjectService;
+use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Service for ensuring modules always have at least one version.
+ *
+ * @category Service
+ * @package  OCA\SoftwareCatalog\Service
+ */
+class ModuleVersionService
+{
+    /**
+     * Constructor for ModuleVersionService
+     *
+     * @param ContainerInterface $container        The DI container
+     * @param SettingsService    $settingsService   The settings service
+     * @param LoggerInterface    $logger            The logger instance
+     */
+    public function __construct(
+        private readonly ContainerInterface $container,
+        private readonly SettingsService $settingsService,
+        private readonly LoggerInterface $logger
+    ) {
+    }
+
+    /**
+     * Ensures a module has at least one version.
+     *
+     * Queries moduleVersie objects linked to this module. If none exist,
+     * creates a default version with versie "1.0.0" using the module's
+     * name and short description.
+     *
+     * @param object $moduleObject The module object entity
+     *
+     * @return void
+     */
+    public function ensureDefaultVersion(object $moduleObject): void
+    {
+        $moduleUuid = $moduleObject->getUuid();
+
+        $this->logger->info('ModuleVersionService: Checking if module has versions', [
+            'moduleUuid' => $moduleUuid,
+        ]);
+
+        try {
+            $objectService = $this->getObjectService();
+            if ($objectService === null) {
+                $this->logger->error('ModuleVersionService: ObjectService not available');
+                return;
+            }
+
+            // Get schema and register IDs.
+            $moduleVersieSchemaId = $this->settingsService->getSchemaIdForObjectType('moduleVersie');
+            $voorzieningenConfig = $this->settingsService->getVoorzieningenConfig();
+            $registerId = $voorzieningenConfig['register'] ?? null;
+
+            if ($moduleVersieSchemaId === null || $registerId === null) {
+                $this->logger->warning('ModuleVersionService: moduleVersie schema or register not configured', [
+                    'moduleVersieSchemaId' => $moduleVersieSchemaId,
+                    'registerId' => $registerId,
+                ]);
+                return;
+            }
+
+            // Query moduleVersie objects where module == this module's UUID.
+            $query = [
+                '@self' => [
+                    'schema' => (int) $moduleVersieSchemaId,
+                    'register' => (int) $registerId,
+                ],
+                'module' => $moduleUuid,
+            ];
+            $existingVersions = $objectService->searchObjects(
+                query: $query,
+                _rbac: false,
+                _multitenancy: false
+            );
+
+            $versionCount = is_array($existingVersions) ? count($existingVersions) : 0;
+
+            if ($versionCount > 0) {
+                $this->logger->info('ModuleVersionService: Module already has versions, skipping', [
+                    'moduleUuid' => $moduleUuid,
+                    'versionCount' => $versionCount,
+                ]);
+                return;
+            }
+
+            // No versions exist — create a default 1.0.0 version.
+            $moduleData = $moduleObject->getObject();
+            $moduleName = $moduleData['voorkeurnaam'] ?? $moduleData['naam'] ?? 'Onbekende applicatie';
+            $moduleDescription = $moduleData['beschrijvingKort'] ?? '';
+
+            $versionData = [
+                'module' => $moduleUuid,
+                'versie' => '1.0.0',
+                'beschrijvingKort' => $moduleDescription,
+                'beschrijvingLang' => '',
+                'status' => 'in gebruik',
+            ];
+
+            $savedVersion = $objectService->saveObject(
+                object: $versionData,
+                register: (int) $registerId,
+                schema: (int) $moduleVersieSchemaId,
+                _rbac: false,
+                _multitenancy: false
+            );
+
+            $this->logger->info('ModuleVersionService: Created default version 1.0.0', [
+                'moduleUuid' => $moduleUuid,
+                'moduleName' => $moduleName,
+                'versionUuid' => $savedVersion->getUuid(),
+            ]);
+        } catch (\Exception $e) {
+            $this->logger->error('ModuleVersionService: Failed to ensure default version', [
+                'moduleUuid' => $moduleUuid,
+                'exception' => $e->getMessage(),
+                'file' => $e->getFile(),
+                'line' => $e->getLine(),
+            ]);
+        }
+    }
+
+    /**
+     * Get the object service from the DI container.
+     *
+     * @return ObjectService|null The object service or null if not available
+     */
+    private function getObjectService(): ?ObjectService
+    {
+        try {
+            return $this->container->get('OCA\OpenRegister\Service\ObjectService');
+        } catch (\Exception $e) {
+            $this->logger->error('ModuleVersionService: Failed to get ObjectService', [
+                'exception' => $e->getMessage(),
+            ]);
+            return null;
+        }
+    }
+}
diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index d1b3acb5..91381b0c 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -715,6 +715,7 @@ public function getSchemaIdForObjectType(string $objectType): ?int
         $voorzieningenKeyMap = [
             'module' => 'module_schema',
             'compliancy' => 'compliancy_schema',
+            'moduleVersie' => 'moduleVersie_schema',
         ];
 
         // Only check voorzieningen config if object type exists in the key map
diff --git a/lib/Settings/softwarecatalogus_register.json b/lib/Settings/softwarecatalogus_register.json
index feb1f27d..5d6aa64c 100644
--- a/lib/Settings/softwarecatalogus_register.json
+++ b/lib/Settings/softwarecatalogus_register.json
@@ -3,7 +3,7 @@
   "info": {
     "title": "Software Catalog Register",
     "description": "Register containing AMEF and Voorzieningen schemas for the VNG Software Catalog application. This configuration includes schemas for applications, services, organizations, and compliance tracking.",
-    "version": "2.0.6"
+    "version": "2.1.0"
   },
   "x-openregister": {
     "type": "application",
@@ -56,10 +56,31 @@
             "slug": "home",
             "contents": [
               {
+                "id": 1,
                 "type": "RichText",
-                "id": "bs2ccjxkup",
                 "data": {
-                  "content": "<h1>Welkom bij de Softwarecatalogus</h1><p>Ontdek en vergelijk software voor de Nederlandse overheid. Deze catalogus biedt inzicht in beschikbare softwareoplossingen, leveranciers en compliance.</p>"
+                  "content": "<h2><span>Over de Softwarecatalogus</span></h2>"
+                }
+              },
+              {
+                "id": 2,
+                "type": "RichText",
+                "data": {
+                  "content": "<p>De Softwarecatalogus biedt een overzicht van software die wordt gebruikt binnen de Nederlandse gemeenten. Leveranciers en gemeenten werken hierin samen aan het (door)ontwikkelen van procesmatige en technische standaarden.</p><p>Op deze website vindt u informatie over softwarepakketten, leveranciers, standaarden en het gebruik daarvan door gemeenten. Zo willen we transparant zijn over de softwaremarkt voor de overheid.</p>"
+                }
+              },
+              {
+                "id": 3,
+                "type": "RichText",
+                "data": {
+                  "content": "<ul><li><p>Zoek en vergelijk software voor gemeenten</p></li><li><p>Bekijk welke organisaties welke software gebruiken</p></li><li><p>Inzicht in standaarden en compliance</p></li></ul>"
+                }
+              },
+              {
+                "id": 4,
+                "type": "RichText",
+                "data": {
+                  "content": "<p><a href=\"/over-ons\" class=\"utrecht-link\">Meer weten over de Softwarecatalogus?</a></p>"
                 }
               }
             ],
@@ -68,7 +89,7 @@
               "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
               "register": "publication",
               "schema": "page",
-              "version": "0.0.3"
+              "version": "0.0.4"
             }
           },
           {
@@ -483,6 +504,138 @@
               "version": "0.0.1"
             }
           }
+        ],
+        "glossary": [
+          {
+            "title": "Addendum",
+            "summary": "Aanvullende afspraak bij het convenant met nadere detaillering voor één standaard",
+            "description": "Voor elke op het convenant aanvullende afspraak die nadere detaillering behoeft, worden losse addenda (aanvullingen) aan het convenant gehangen. In een addendum wordt voor 1 standaard een realisatietermijn afgesproken. Leveranciers streven ernaar de betreffende standaard tijdig en juist in de softwareproducten in te bouwen, te implementeren en te laten gebruiken door gemeenten.",
+            "externalLink": "https://www.softwarecatalogus.nl/lexicon#Addendum",
+            "keywords": ["Addenda"],
+            "@self": {
+              "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
+              "register": "publication",
+              "schema": "glossary",
+              "version": "0.0.1"
+            }
+          },
+          {
+            "title": "Convenant VNG",
+            "summary": "Algemene samenwerkingsafspraken met leveranciers, gebruikersverenigingen en samenwerkingsverbanden",
+            "description": "Hierin zijn algemene samenwerkingsafspraken vastgelegd met leveranciers, gebruikersverenigingen, en samenwerkingsverbanden die voor gemeenten software inkopen. De samenwerking is gericht op het gezamenlijk (door)ontwikkelen van procesmatige en technische standaarden o.a. door vakmatig kennis te delen.",
+            "externalLink": "https://www.softwarecatalogus.nl/lexicon#Convenant%20VNG",
+            "keywords": ["VNG-convenant", "convenant"],
+            "@self": {
+              "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
+              "register": "publication",
+              "schema": "glossary",
+              "version": "0.0.1"
+            }
+          },
+          {
+            "title": "Eindproduct-standaard",
+            "summary": "Standaard waarbij functionaliteit, services en rolverdeling scherp gedefinieerd zijn",
+            "description": "Hierbij zijn de functionaliteit, de (web)services en rolverdeling tussen systemen gedetailleerd en scherp gedefinieerd. Juiste toepassing is preventief goed testbaar en daardoor is de voorspelbaarheid op goed functioneren hoog.",
+            "externalLink": "https://www.softwarecatalogus.nl/lexicon#Eindproduct-standaard",
+            "keywords": ["Eindproduct-standaarden"],
+            "@self": {
+              "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
+              "register": "publication",
+              "schema": "glossary",
+              "version": "0.0.1"
+            }
+          },
+          {
+            "title": "Gegevensstandaard",
+            "summary": "Afspraken over meervoudig gebruik en uitwisseling van gegevens",
+            "description": "Om ervoor te zorgen dat de uitgewisselde gegevens juist zijn en op de juiste manier worden gebruikt, met de juiste betekenis, dienen er zeer goede afspraken gemaakt te worden. De afspraken over het meervoudig gebruik van gegevens en de (gemeentelijke) gegevensuitwisseling zijn vastgelegd in gegevensstandaarden. Ook hiervoor geldt dat de leverancier dient aan te geven op welke wijze hieraan wordt voldaan.",
+            "externalLink": "https://www.softwarecatalogus.nl/lexicon#Gegevensstandaard",
+            "keywords": ["Gegevens-standaarden", "Gegevensstandaarden"],
+            "@self": {
+              "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
+              "register": "publication",
+              "schema": "glossary",
+              "version": "0.0.1"
+            }
+          },
+          {
+            "title": "Grondstof-standaard",
+            "summary": "Standaard die specialistische kennis en uitgebreide specificaties vereist",
+            "description": "Hierbij moeten n\u00f3g meer dan bij half-fabrikaten specificaties en activiteiten worden uitgevoerd om interoperabiliteit te kunnen realiseren. Dit vergt specialistische kennis.",
+            "externalLink": "https://www.softwarecatalogus.nl/lexicon#Grondstof-standaard",
+            "keywords": ["Grondstof-standaarden"],
+            "@self": {
+              "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
+              "register": "publication",
+              "schema": "glossary",
+              "version": "0.0.1"
+            }
+          },
+          {
+            "title": "Halffabrikaat-standaard",
+            "summary": "Standaard waarbij de opdrachtgever aanvullende specificaties moet toevoegen",
+            "description": "Hierbij dient de opdrachtgever aanvullende specificaties toe te voegen.",
+            "externalLink": "https://www.softwarecatalogus.nl/lexicon#Halffabrikaat-standaard",
+            "keywords": ["Halffabrikaat-standaarden"],
+            "@self": {
+              "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
+              "register": "publication",
+              "schema": "glossary",
+              "version": "0.0.1"
+            }
+          },
+          {
+            "title": "Leverancier",
+            "summary": "Aanbieder van standaard-softwarepakketten voor gemeentelijke taken",
+            "description": "Aanbieders van standaard-software(pakketten) voor gemeentelijke taken. Alleen leveranciers die het convenant met VNG ondertekend hebben, mogen hun gegevens in de Softwarecatalogus zetten.",
+            "externalLink": "https://www.softwarecatalogus.nl/lexicon#Leverancier",
+            "keywords": ["Leveranciers"],
+            "@self": {
+              "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
+              "register": "publication",
+              "schema": "glossary",
+              "version": "0.0.1"
+            }
+          },
+          {
+            "title": "Referentiecomponent",
+            "summary": "Verbinding tussen softwareaanbod van leveranciers en softwaregebruik van gemeenten",
+            "description": "De verbinding tussen softwareaanbod leveranciers en softwaregebruik gemeenten. Een softwarepakket kan functionaliteit bieden voor \u00e9\u00e9n of meerdere referentiecomponenten, daarmee krijgt u een globaal beeld van de functionaliteit.",
+            "externalLink": "https://www.softwarecatalogus.nl/lexicon#Referentiecomponent",
+            "keywords": ["Referentiecomponenten"],
+            "@self": {
+              "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
+              "register": "publication",
+              "schema": "glossary",
+              "version": "0.0.1"
+            }
+          },
+          {
+            "title": "SaaS",
+            "summary": "Software as a Service: applicatie aangeboden vanuit de cloud door een leverancier",
+            "description": "Bij Software as a Service maakt een gemeente of samenwerking gebruik van een applicatie die door een leverancier vanuit de cloud wordt aangeboden. De gemeente of samenwerking heeft g\u00e9\u00e9n toegang tot de onderliggende infrastructuur en software, oftewel het technisch beheer wordt geheel door de leverancier verzorgd.",
+            "externalLink": "https://www.softwarecatalogus.nl/lexicon#SaaS",
+            "keywords": ["Software as a Service"],
+            "@self": {
+              "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
+              "register": "publication",
+              "schema": "glossary",
+              "version": "0.0.1"
+            }
+          },
+          {
+            "title": "Standaard",
+            "summary": "Norm of set van eisen waaraan gemeentelijke software moet voldoen",
+            "description": "Norm of set van eisen/voorwaarden/afspraken waaraan (gemeentelijke) software moet voldoen. (Open) Standaarden zijn opgenomen die voor gemeenten van belang zijn voor interne en externe applicatiekoppelingen, gegevensmanagement, bedrijfsvoering en digitale dienstverlening. Standaarden kunnen als producten worden getypeerd in eindproducten, halffabrikaten, grondstoffen en gegevensstandaarden. Deze typering is een indicatie wat de benodigde inspanning is om op basis van de standaard tot een werkende koppeling te komen. VNG adviseert gemeenten bij voorkeur functioneel passende eindproduct-standaarden te gebruiken en pas daarna (in aflopende prioriteit) halffabrikaat- en grondstof-standaarden, en als laatste maatwerk toe te passen.",
+            "externalLink": "https://www.softwarecatalogus.nl/lexicon#Standaard",
+            "keywords": ["Standaarden"],
+            "@self": {
+              "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
+              "register": "publication",
+              "schema": "glossary",
+              "version": "0.0.1"
+            }
+          }
         ]
       }
     }
@@ -992,7 +1145,7 @@
         "slug": "dienst",
         "title": "Dienst",
         "description": "Een specifiek aanbod van een dienst op een of meerdere applicaties door een leverancier",
-        "version": "0.1.4",
+        "version": "0.1.5",
         "summary": "",
         "icon": "Handshake",
         "required": [
@@ -1069,13 +1222,6 @@
             "maxLength": 500,
             "example": "https://dienst.voorbeeld.nl"
           },
-          "status": {
-            "description": "De status van dit aanbod",
-            "type": "string",
-            "default": "Concept",
-            "example": "Bijvoorbeeld: Concept",
-            "title": "status"
-          },
           "contactpersoon": {
             "description": "Selecteer de contactpersoon voor deze dienst",
             "type": "object",
@@ -3300,7 +3446,7 @@
         },
         "configuration": {
           "autoPublish": false,
-          "objectNameField": "naam",
+          "objectNameField": "{{ moduleA }} {{ gegevensuitwisselingRichting | map: AnaarB=→, BnaarA=←, bi-directioneel=↔ }} {{ moduleB }}",
           "objectSummaryField": "beschrijvingKort",
           "objectDescriptionField": "beschrijvingLang"
         }

From 7c5b5a704fde3070d30ae7c808155d18d45c6240 Mon Sep 17 00:00:00 2001
From: Ruben van der Linde <ruben@conduction.nl>
Date: Mon, 16 Feb 2026 13:01:00 +0100
Subject: [PATCH 2/2] Loking into user contactpersoon sync

And prepare final go on archimate
---
 __pycache__/compare_archimate.cpython-38.pyc  |  Bin 0 -> 10206 bytes
 compare_archimate.py                          |  436 ++
 lib/AppInfo/Application.php                   |    5 +
 lib/Controller/ContactpersonenController.php  |   12 +-
 .../UserProfileUpdatedEventListener.php       |  196 +
 lib/Service/ArchiMateExportService.php        |  157 +-
 lib/Service/ArchiMateImportService.php        |  137 +-
 lib/Service/ContactpersoonService.php         |   61 +-
 .../ContactPersonHandler.php                  |   12 +-
 lib/Settings/softwarecatalogus_register.json  |   30 +
 .../softwarecatalogus_register_old.json       | 5435 -----------------
 test_archimate_unified.sh                     |  672 +-
 12 files changed, 1506 insertions(+), 5647 deletions(-)
 create mode 100644 __pycache__/compare_archimate.cpython-38.pyc
 create mode 100644 compare_archimate.py
 create mode 100644 lib/EventListener/UserProfileUpdatedEventListener.php
 delete mode 100644 lib/Settings/softwarecatalogus_register_old.json

diff --git a/__pycache__/compare_archimate.cpython-38.pyc b/__pycache__/compare_archimate.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c10b01dbe096dfe9240c564d0e42fd90afb05388
GIT binary patch
literal 10206
zcmb_i%X8dDdPf5o3}!eS4u=m>kF_D$mN>RZN|s;Cr4`E(m9^KR6j6Qzj&^oD4N_yy
zOAU~c5KK}PDkb@_TZ*riQkD;?@+F7-0Xe0TODcyPaZIXGt4oea#k=0k@9W0QfDhRf
zS1>iehwiVx{`%|g@6~vJbTqHwI{M$AH#W{_+P~9F`qJ_87XJQi+_>gyoN>L$Tqd8o
zYsjbB%IF%?T9%t-gkd!8R?f`<HhHGO+&s735uWAtUCk}<9M9u9%13ws&mte?MLfs&
z7%$;j^2Yi2hAslHv<;eEU)3t*+Bq<iKPT!p8kcH;=X`YOJ!jQx)!IR$?ws$mx;4@8
zJ8kD$r_;>mRe|R_!L5!nY;<P+wrsf8XrgYdBOE^voAqE*)S8ZWbF;BkYkKXvx0s)E
zE_JxqbQ;`44{HriIJGu++O?L4y5*+VLb+4#Y_<dcWC{x}gcscDdOi@Zdd*tU=(PPC
zjqd)~5>qwuJDZ~JEd({O?geQ4LBqS1G?GMzyb$TjV!hUGgp$0|2)tH;imEH3)AdAf
z=YqG^Xg8?;{rm2Zh{#<7#}02m9*s{nWs_DdfUw)^`TYBSZ5=XkaCPqlH#+Szphpt-
zsx_JrV0!c2JI+!^G}asKT66w(t9jO0@@{uKm_@E$Kc1WW6f<-^pI^S+AlY%xS42-a
zZ#uPR)2ZL^>Kne(t@*ykWp}4h(`kDSW~$W@ULRwvh6z*{F9X990tmA-t4_NUU}87h
z{3PfI-&2(*9WSWQSMpD=hP9Oni?iox>OA4<wO07jjUebQE-c)-b!#4yYp;vWW_P|L
z))#L3d|@!eg){S~7Q#vj`PLbU_427xrx&mwS22KAZLZPwgBn&*ol$SeHI1i@zk$F1
zZ>R~hFIl8LW<3_MFZIV-PmlC3<z{-UbG@O_ZykSbJk0hC)S282GLQA18DUFp<ixee
z{M72c%k?j_kG06)){+J+n`a5@f_D9tUM9-)DfTQ0+d=LNjprU2TnD9WWQkuyS+va`
z)FQOM`3p&5B%yGvXGivcLQcXvDdc5YK~fu$@Ti0fQBHgn<)e|Pz>5zJ^e~1Va_HeJ
z*+VJmVWl@3jShM!0`8A;EE=OxK44-o8vE3Gz`C!fk+vb7UMVV~#*9j!JPyjmCG7#b
zY2MS;7%%gQyY^=!3zJVuiH%3&39Y}luSMhA46UXTX-y9}DM#f2Cli4CoJ>ZON$Y=z
zCM73-pW<XHngA!iil#vG063YDoct;>ptNSfH?GJvSZk-05NR&CRB8Kpw*yhD2WdUj
zXs>nV<NR>9$66&D+bz;Z)dr9A3L;e$+n&-yemp8ts>Y8qTTmV-#UdVP2|u3fCYqtj
z2dcpjv$fVDQCkrf7H4>HeqjM6eab2L8}_GRrbik}WC`;*g}I|=LQfaOmQri6rSw|G
zh)qdh6cj{}ZnQ1JXB92UHqqdX+PbK<e1fS^<bbtfN0}(d;6H)C|2A&x8upU*CCpF2
z<PJC~_Y~F(H?Z2V3dKD38lI0C(*T)R4f-~tx0|JiVaCiADGgGmf_AE)PAZu=3q{JI
zqGEkzH8!B0W2@GMrr@!K8N{<<#uh2Wb`WQ%wI7@GaE(TTf6e0YdZ*d+>OmFrQI+*y
zYu~Ib+~~Bt1+n>w*KUHox6lT$db6|1=Xj^S;fXo!Z7tmDhz-A6gJtkNvE_*c^z6^c
zg|pyy)`DB;wq6Tr&CdG5erj19#2Eevf1jkSF_V>80rxzf;fqp9rquXSvs14%{j>9X
zI1WpgiXH1okmnFCsF~|8t)bD8bGNrxjG$E|AM4B4;*9Lx%|fE0(+NZwRk2CJ7UL2O
zFwQtbR;epWRAPLz`c7p!wrK}-YrzfI420*!CN+o5v3J}oE#|7%bak&88y>by#-k<Y
z8d#XIAsXDxz&c_T57uC8(i(G(E!5dt{q`9NxmgU_m-M<kHoAn;9iT`^90F@%hHi(6
z$+2Bhbx`QLxM_Nx*+!n}!{7f{BL!x&vO%*liFqj|P=RJimzdv{vQ%4O&oGOXj6$w}
z*(*rAq)Zntf_j~twf=Pg0Et>!oX@e4*R{`JUp~|BY4?mZxhwA4JsmJ3Ck;9i`tzP~
z&s>8o;aSwd>fG14eNem4=)R%zoO<VZKJu6PLG26ek<JUd%lN3mPhpwc27|=|X7Ql5
z&3YzamcW@vkIX0o>SK{9DVFHT$D<7H<tP)GGa8@x0^0mhmgtc7R+JJNM$fv(?&%oQ
zG(T|Hj;ssRM>f&}Ey`{)J_FhZ6%2}pqAWN&toR2_#T!!;$r7Wj9WX^Zd57(bavM4{
z{nh&hti%!08SNl|MGh?3Jy_sv1}LYX19$_Ke3XYBUg?o#w4)I|11$v0IDki^LNvNz
zfa;c{`Xl~KGy)EvjS6!7qqsYdvTHi^#*cnRHf~Ew@mNZV3LZ-FxkQT3f3Fl@z?jh*
zBPAL}uNW|XoS(Q$^Mn!_J4q5F8AHvitdY2>no=|tl^_{iH02m7J0vqUkWA?*k{KIF
zqY#w_a9=XIc#ufu#qW`fe)9pJ>5WH4Nc`PiS&bknAJlpiYJ3u&j3)R?u+o!shvW@^
z79}TT3GOJ-#joKl%)PGl#vkZ6e~q;{F4xa|G>+L=c%%<j@~PAuD0nyrr;|B&`FrQ!
z3^+w=@JKZJyX2J=Z3Pc$znai~?Yn8qb@F<Oj)I4D-bm>D_`B&~w=IH4v<8nv!{|*V
zyX_}(w@u02HZ6DCbh6u)u-gDbVsA#%dw1J?<G!{=VcpqqISJKdq$brSPx(sy@XYh)
z5lbOXYx~Zu@chjtg<UYnRSFg=^VjO6<@y)FWVoegKzcFK#N>TOo<YRaZfck1JACeB
zcNw1{xRoA2Y+gCHx*D4o&%N{B#jlwlDiy<pd8e=hx*yMK%U^eG3PT90=&{}BCC(=7
zDVre8K}H5PZP4+_*U@yCV7<t~>BL;m4~;HGKs&q~iXjGLA@g`&dN>i}C$$3ctgpo8
zhv%-Yh&j|FxG{()CKm9P;=+WZ(B49sFRcU%r}lJD7&|0M?2?g}lKf8qm{)jL+q#$z
zbn>N0@3k$0p(PB|>az9~lpvZJ)WXX`++vU>M^pj`PedesGqU_9X2PT-LIiuljYqIe
zQip_5M*OYRuNl%oWTQxD_p%Zn7AnX_s6iWBw#-FY!1;l`96=0ViT{uktX&jfwa^-+
zds}alZwOA`BFT=1C;RJj=#M+T7pUw(%~@}3d2JNbDP*1(FF{11c@D8`SWagJ92rcn
zJRyHooFpXsQp5KVT|3_}C!BHKx!^mEHo^gln4MX_*6KFBMO0QUhSo9#2~NdEP=F>X
zxQtESs0XnDUSe~@yW`7sO5Qd_+_Bk2C?6ZhW}sQ7S^EU;P>#a$Dm8O$bd*4{u)%#d
zOJx#hDc0PKbTVB_aZ`c&Ozg{Lb%r46^~e=Ik}M@^e+N~*gPUeN1Bb<yzZtA~a&Dga
zy=j<uPBMpuNA@hh6d6IX3J>i`!$?UYbKtBznI(+FdodcmL|Sx0)7kPJ6|5ZCk+e}0
zLS(|3T@}ODqsTj`ga(lb$CK&txHF4bET}o(=r3{c8n}S)R3Nrv@6tY_QOMmx%&tQd
zU3YrqTWGL33_2BBM?o6~;#u}r`b`t-j!B-SfT3LU`BUNrH2)fUrk_)Z?LKd*X~-|p
zw386eJ_f!|@tg%0a^`p8;XSe*;tEnS;WM;s{TqlT5SAthF7lFnC9Ck*j#3AUB$<lg
zauu(DP(@eU;Amg2L}Z`TlIN?PP;v(OG>Lg4G)`bzasz2!R1xBltEmWACA3nr_@n)5
z2UF=5(lP0tNs=xy35>Edn4%&jWoTkPK>qQj&Jh}Zt&1^Ku1IO)g#yl)2_^jDM#wF#
zdx+w?;_N>XJ<{B!rehuN6@MS`hj1hQ5QJ6VKOH~=F2uVi`zQPd{rBhO_zo#Obz;IP
z2j(`Fx>OT0jF+Cs6>~bZV$$+;c4RV<hii!bB0BDT2jXx^$!I^E{9up)P0jRFx^ytZ
zg7%jRNRM7lB|TE9(G-niPemCLq}VAu_Ox7Tir8~c#~Dy_%X<UiJrn;!bp>%M7Xzl5
z)}^S>?R>vf#-!pRUUf`cS}9ag6S$W@neFaR+??|ignbo3B`4mb?nwj27P9J_*zKeS
z#ZTz=W4bNTZIN!|)>ICNWr8oz?G)Yq05{i?=BZ7ls9SBjIc%d=r%l257_G_baLKrN
ziAtrun<MlDtiel^V9bJ;bz<hZ`GgGCqFa>B044aN)O7e-_C>uKtOu!{#EBtiLUASr
zoOQW7CX)k0&eYUol=YP3lOrA4QE5W6iH2x^xc@J>k(+4hMH_Mcw9bk!na961vy=tU
zkp-~Xk#9|F(kSTq@2rfDe1Oglp}vHy4srv!0}R5=vt!6O>~3|49oh%WOxir3^r16*
zzaG;Z?BWO63eD22-<z3Td|BcOMpP$*)W0SH(8{HC>gTai0{G|Tec=gzQ9k?c@W&`K
zkdz`@Fnp6oL>bChaGU4WGd&CK^9d#nnD{6%2SqwslF#wvS*GVBdw@3qPq4@*civS!
z<rA)d^(V-eQ(hp_BIH5>9X{|s2Znlscbfyus0MJpJ@d30<ivCEeMgWDn1aRsEuPa~
zn8;}#KxROeAsbNSGblOO8^uUQkgbp-h;sZ8jUdV=&jO7gLXO~3jz)3wVW5#L(B?3`
z^C?s774aWKww%rbevT20_saYTN1lN{i>y2{=e-Hpha7!W1}&4?BIb2uw&Sm(B0q{)
zxY#~|vSYIB?~s|Nvaz-ul_XR`UgGD2-k*z#kmB>v8164bCESlAZzJcE_=_mt@n7im
z1eLXIK(ne=%|5Td|9LSyaYZz6!gga5M|^X_tMS?=INecuL>}}Bk6h*X@Zy{QFIRZn
zNyVM}oh)9J9fqS0j@}Zl5N--ymy=^IXVIzXuAR6&zI5SGFnTp*Nqy<dpfp2P%$IhK
zaMJe3mu3v56MGGdFSDlzE}S`BIQXOkNC}6!<G9&X6^VrA(#x;<;#F)d*Y2|$nrBa+
z^1)!juba6*UTk=fNbP%t`C+ki62&=CjM*u4_M*&<OPYMhk2=AlR-x@UA5$cKT|yL1
zD~KZ1>j)+&R+1i|I8Bgz{aL>(9C4i0%~q=>?nqxy1>YyhEmVhp5~O$)F_a%3hQG4B
z`u=;@7M*kNz2}_&>GJuXtvb~E@`doouyXbCrR9DtakPA41)2Lym)4qiojQMmZe+VE
zlPQBFbu~plu?nJO=2-?&3Q7V%Uz{Zz1M!$xAwrjNb2BnnaC7oeMM}f9FfOF`-Mq{t
z$WvrDFS7{=OarS*7!h4i3pV{Y+wy!mhjq<Hz0=<9cNXLjV7F*fl*r6~fUY%NMPEgj
z56c`RoquE6Hk(BRRzNxaI++I>2BysBnPn)$QNnv({q%xvu_MgFJr9cFLr|`hYump_
zt&{U2RXK@(!uh+J3i%_bM1=el!W-PYixdGRjCkgu*~<i4z&_O@slI<H)jPMb{d3`u
z)b@XO_43L-n|_DqM6M_uN3G)T)AS(=0R~7DO9(lG1TqGYIe;<*aqD3Q-DX!**kyx=
z+?jGCs`HA>)2o<TFHAg7?W7kzaK&Rw&Z2*brlf#+Isr(2zX=biS)*g|R1Qe)=^aC)
z_=Myuhe)(#AX$b&XE@?wk<PV;dOvi86Zk$*1T6sNdKgKx;>WDDi$CcWy2KpKCrmfu
z!2OsS28$I_IWhxp&9&6I{S$KbkbSb~D61W;V2fWxNjyTstK!gdv+2bdzS-*f6>Gn}
zB|ai_tFsw&H-lY##`z&v?-IL3;A)1QCtt{7h2L5@%0@|@iu)JMBW17TviuvgQp*kV
z%{DagT7Xk<X?YB3Hw|v6H!f{pKv}5_Wuj<_atpRnL0B<8hU^ncH>{o>7J>{d@t*Oa
z)`m_Dtc|?*oWaterJ-_Dk91&XdG42Rz=w4ISZluxeEZWJTKp@+c3}uO&?c|Eo&DN;
zsJ)7eLC^d%^CJ!I^^Y{!KQ>n{gZ{Tv|FE!=0}e(aWVxQo!G%5tX!Ajehr<7bhaiuP
zS!P?ug0$$|1+=1IgvufdComXSyBrky@9>$}wxuKyWr6#UkHX)v2Kmh5$`e}g;oIuN
zlSBdhppQ+$x6Z3CRetEFK=a}0)aNQr|5FuG+$SCSJcZQuCUU+fox!Il;$v_x$d-kc
z`sgKemaksDe06c?I_&&d1)c+=bI+z1zK~#El;5~GK_~f+g~Am2wuU}nf=TQX>>G3S
zNx|Uj7hpV%5aJt|BUFT>S+9&r6^3l$9UNTa`=c$jbxjXn>d2GDc>E%mTj>NB>D!uR
z`rw8v6UV1F;s^%n=C9C~4zfbJ`f@i)OHr|1e1@QyuhI}*3b7;$>QyO-WZO%%LS|D%
zf&;_5TOXLMTBBVhO+ay^2191csK|zilKK^CFEVeF_?K}%BHziVQ5n4#Va`f=Sr<3Z
zKDMh>NwHcf$JuHX=kL|3AZ_BBq`$;<0;lj@(>#u<J#Rko@~#0!2uMZlNUBT<B}Q6Q
z9{bZ5U@{h#r`qBuXi2FmNs&2K;_7oE1ITJ>$U}Q#FDXrWmb9%;qBp0=$d?iG*~~QT
RckDmcX6;3L%AU2^{{mN`RUiNW

literal 0
HcmV?d00001

diff --git a/compare_archimate.py b/compare_archimate.py
new file mode 100644
index 00000000..116cf265
--- /dev/null
+++ b/compare_archimate.py
@@ -0,0 +1,436 @@
+#!/usr/bin/env python3
+"""
+ArchiMate XML Semantic Comparison Tool
+
+Compares two ArchiMate 3.x XML files for structural equivalence:
+- Model identifier and name
+- Element counts, identifiers, and types
+- Relationship counts, identifiers, types, and source/target
+- View counts and identifiers
+- Organization item counts
+- PropertyDefinition counts, identifiers, and names
+- Type distribution matching
+
+Usage:
+    python3 compare_archimate.py <original.xml> <exported.xml> [--json]
+
+Exit codes:
+    0 = all checks passed
+    1 = one or more checks failed
+    2 = error (file not found, parse error, etc.)
+"""
+
+import sys
+import json as json_module
+import xml.etree.ElementTree as ET
+from collections import Counter
+
+NS = {"am": "http://www.opengroup.org/xsd/archimate/3.0/"}
+XSI = "http://www.w3.org/2001/XMLSchema-instance"
+
+
+def parse_archimate(filepath):
+    """Parse an ArchiMate XML file and extract structural info."""
+    tree = ET.parse(filepath)
+    root = tree.getroot()
+
+    info = {
+        "model_id": root.get("identifier", ""),
+        "model_name": "",
+        "elements": {},
+        "relationships": {},
+        "views": {},
+        "organizations": [],
+        "property_definitions": {},
+    }
+
+    # Model name
+    name_el = root.find("am:name", NS)
+    if name_el is not None:
+        info["model_name"] = (name_el.text or "").strip()
+
+    # Elements
+    for el in root.findall(".//am:elements/am:element", NS):
+        eid = el.get("identifier", "")
+        etype = el.get(f"{{{XSI}}}type", "")
+        if eid:
+            info["elements"][eid] = etype
+
+    # Relationships
+    for rel in root.findall(".//am:relationships/am:relationship", NS):
+        rid = rel.get("identifier", "")
+        rtype = rel.get(f"{{{XSI}}}type", "")
+        source = rel.get("source", "")
+        target = rel.get("target", "")
+        if rid:
+            info["relationships"][rid] = {
+                "type": rtype,
+                "source": source,
+                "target": target,
+            }
+
+    # Views (diagrams)
+    for view in root.findall(".//am:views/am:diagrams/am:view", NS):
+        vid = view.get("identifier", "")
+        vname_el = view.find("am:name", NS)
+        vname = (vname_el.text or "").strip() if vname_el is not None else ""
+        if vid:
+            info["views"][vid] = vname
+
+    # Organizations — count all <item> elements recursively.
+    # ArchiMate organizations use <item> with optional identifierRef (element references)
+    # or <label> (folder items). We track total count + identifierRefs for comparison.
+    orgs_el = root.find("am:organizations", NS)
+    if orgs_el is not None:
+        all_items = orgs_el.findall(".//am:item", NS)
+        info["organizations"] = {
+            "total_items": len(all_items),
+            "identifier_refs": sorted(
+                [item.get("identifierRef") for item in all_items if item.get("identifierRef")]
+            ),
+            "folder_count": sum(
+                1 for item in all_items if not item.get("identifierRef")
+            ),
+        }
+    else:
+        info["organizations"] = {
+            "total_items": 0,
+            "identifier_refs": [],
+            "folder_count": 0,
+        }
+
+    # Property definitions
+    for pd in root.findall(".//am:propertyDefinitions/am:propertyDefinition", NS):
+        pid = pd.get("identifier", "")
+        pname_el = pd.find("am:name", NS)
+        pname = (pname_el.text or "").strip() if pname_el is not None else ""
+        if pid:
+            info["property_definitions"][pid] = pname
+
+    return info
+
+
+def compare(original, exported):
+    """Compare two parsed ArchiMate structures. Returns (results, all_pass)."""
+    results = []
+    all_pass = True
+
+    def check(passed, pass_msg, fail_msg):
+        nonlocal all_pass
+        if passed:
+            results.append(("PASS", pass_msg))
+        else:
+            results.append(("FAIL", fail_msg))
+            all_pass = False
+
+    def warn(msg):
+        results.append(("WARN", msg))
+
+    def compare_ids(label, orig_dict, exp_dict):
+        """Compare identifier sets for a given section."""
+        nonlocal all_pass
+        orig_ids = set(orig_dict.keys()) if isinstance(orig_dict, dict) else set(orig_dict)
+        exp_ids = set(exp_dict.keys()) if isinstance(exp_dict, dict) else set(exp_dict)
+        missing = orig_ids - exp_ids
+        extra = exp_ids - orig_ids
+        if not missing and not extra:
+            results.append(("PASS", f"All {label} identifiers match"))
+        else:
+            if missing:
+                sample = sorted(list(missing))[:5]
+                results.append(
+                    ("FAIL", f"Missing {len(missing)} {label} IDs in export (sample: {sample})")
+                )
+                all_pass = False
+            if extra:
+                sample = sorted(list(extra))[:5]
+                warn(f"Extra {len(extra)} {label} IDs in export (sample: {sample})")
+        return orig_ids & exp_ids
+
+    # --- Model ---
+    check(
+        original["model_id"] == exported["model_id"],
+        f"Model identifier matches: {original['model_id'][:40]}",
+        f"Model identifier mismatch: {original['model_id'][:40]} vs {exported['model_id'][:40]}",
+    )
+
+    # --- Elements ---
+    orig_n = len(original["elements"])
+    exp_n = len(exported["elements"])
+    check(
+        orig_n == exp_n,
+        f"Element count matches: {orig_n}",
+        f"Element count mismatch: {orig_n} original vs {exp_n} exported (delta {exp_n - orig_n:+d})",
+    )
+
+    common_el = compare_ids("element", original["elements"], exported["elements"])
+
+    # Element type consistency
+    type_mismatches = [
+        eid
+        for eid in common_el
+        if original["elements"][eid] != exported["elements"][eid]
+    ]
+    check(
+        len(type_mismatches) == 0,
+        "All shared element types match",
+        f"{len(type_mismatches)} element type mismatches (sample: {type_mismatches[:5]})",
+    )
+
+    # Element type distribution
+    orig_types = Counter(original["elements"].values())
+    exp_types = Counter(exported["elements"].values())
+    if orig_types == exp_types:
+        results.append(("PASS", "Element type distribution matches"))
+    else:
+        all_types = sorted(set(list(orig_types.keys()) + list(exp_types.keys())))
+        for t in all_types:
+            o = orig_types.get(t, 0)
+            e = exp_types.get(t, 0)
+            if o != e:
+                results.append(("FAIL", f"  Element type '{t}': {o} original vs {e} exported"))
+                all_pass = False
+
+    # --- Relationships ---
+    orig_n = len(original["relationships"])
+    exp_n = len(exported["relationships"])
+    check(
+        orig_n == exp_n,
+        f"Relationship count matches: {orig_n}",
+        f"Relationship count mismatch: {orig_n} original vs {exp_n} exported (delta {exp_n - orig_n:+d})",
+    )
+
+    common_rel = compare_ids("relationship", original["relationships"], exported["relationships"])
+
+    # Relationship type distribution
+    orig_rel_types = Counter(r["type"] for r in original["relationships"].values())
+    exp_rel_types = Counter(r["type"] for r in exported["relationships"].values())
+    if orig_rel_types == exp_rel_types:
+        results.append(("PASS", "Relationship type distribution matches"))
+    else:
+        all_types = sorted(set(list(orig_rel_types.keys()) + list(exp_rel_types.keys())))
+        for t in all_types:
+            o = orig_rel_types.get(t, 0)
+            e = exp_rel_types.get(t, 0)
+            if o != e:
+                results.append(("FAIL", f"  Relationship type '{t}': {o} original vs {e} exported"))
+                all_pass = False
+
+    # Relationship source/target consistency
+    src_tgt_mismatches = 0
+    for rid in common_rel:
+        orig_r = original["relationships"][rid]
+        exp_r = exported["relationships"][rid]
+        if orig_r["source"] != exp_r["source"] or orig_r["target"] != exp_r["target"]:
+            src_tgt_mismatches += 1
+    check(
+        src_tgt_mismatches == 0,
+        "All shared relationship source/target pairs match",
+        f"{src_tgt_mismatches} relationship source/target mismatches",
+    )
+
+    # --- Views ---
+    orig_n = len(original["views"])
+    exp_n = len(exported["views"])
+    check(
+        orig_n == exp_n,
+        f"View count matches: {orig_n}",
+        f"View count mismatch: {orig_n} original vs {exp_n} exported (delta {exp_n - orig_n:+d})",
+    )
+
+    compare_ids("view", original["views"], exported["views"])
+
+    # --- Organizations ---
+    orig_org = original["organizations"]
+    exp_org = exported["organizations"]
+    orig_n = orig_org["total_items"]
+    exp_n = exp_org["total_items"]
+    check(
+        orig_n == exp_n,
+        f"Organization total item count matches: {orig_n}",
+        f"Organization total item count mismatch: {orig_n} original vs {exp_n} exported (delta {exp_n - orig_n:+d})",
+    )
+
+    # Organization identifierRefs (element references within folders)
+    orig_refs = set(orig_org["identifier_refs"])
+    exp_refs = set(exp_org["identifier_refs"])
+    missing_refs = orig_refs - exp_refs
+    check(
+        len(missing_refs) == 0,
+        f"Organization identifierRefs match ({len(orig_refs)} refs)",
+        f"Missing {len(missing_refs)} organization identifierRefs in export",
+    )
+
+    # Organization folder count
+    check(
+        orig_org["folder_count"] == exp_org["folder_count"],
+        f"Organization folder count matches: {orig_org['folder_count']}",
+        f"Organization folder count mismatch: {orig_org['folder_count']} original vs {exp_org['folder_count']} exported",
+    )
+
+    # --- Property Definitions ---
+    orig_n = len(original["property_definitions"])
+    exp_n = len(exported["property_definitions"])
+    check(
+        orig_n == exp_n,
+        f"PropertyDefinition count matches: {orig_n}",
+        f"PropertyDefinition count mismatch: {orig_n} original vs {exp_n} exported (delta {exp_n - orig_n:+d})",
+    )
+
+    common_pd = compare_ids(
+        "propertyDefinition", original["property_definitions"], exported["property_definitions"]
+    )
+
+    # Property definition name consistency
+    name_mismatches = [
+        pid
+        for pid in common_pd
+        if original["property_definitions"][pid] != exported["property_definitions"][pid]
+    ]
+    check(
+        len(name_mismatches) == 0,
+        "All shared propertyDefinition names match",
+        f"{len(name_mismatches)} propertyDefinition name mismatches (sample: {name_mismatches[:5]})",
+    )
+
+    return results, all_pass
+
+
+def print_report(original, exported, results, all_pass, orig_path, exp_path):
+    """Print human-readable comparison report."""
+    print("=" * 70)
+    print("  ArchiMate Semantic Comparison Report")
+    print("=" * 70)
+    print(f"  Original : {orig_path}")
+    print(f"  Exported : {exp_path}")
+    print()
+
+    # Summary table
+    sections = [
+        ("Elements", "elements"),
+        ("Relationships", "relationships"),
+        ("Views", "views"),
+        ("PropertyDefinitions", "property_definitions"),
+    ]
+
+    print("  ---- Counts ----")
+    print(f"  {'Section':<25s} {'Original':>10s} {'Exported':>10s} {'Delta':>10s}")
+    print(f"  {'-'*25} {'-'*10} {'-'*10} {'-'*10}")
+    for label, key in sections:
+        o = len(original[key])
+        e = len(exported[key])
+        delta = e - o
+        delta_str = f"{delta:+d}" if delta != 0 else "0"
+        marker = " *" if delta != 0 else ""
+        print(f"  {label:<25s} {o:>10d} {e:>10d} {delta_str:>10s}{marker}")
+
+    # Organizations (special structure)
+    o = original["organizations"]["total_items"]
+    e = exported["organizations"]["total_items"]
+    delta = e - o
+    delta_str = f"{delta:+d}" if delta != 0 else "0"
+    marker = " *" if delta != 0 else ""
+    print(f"  {'Org items (total)':<25s} {o:>10d} {e:>10d} {delta_str:>10s}{marker}")
+    o = len(original["organizations"]["identifier_refs"])
+    e = len(exported["organizations"]["identifier_refs"])
+    delta = e - o
+    delta_str = f"{delta:+d}" if delta != 0 else "0"
+    marker = " *" if delta != 0 else ""
+    print(f"  {'Org identifierRefs':<25s} {o:>10d} {e:>10d} {delta_str:>10s}{marker}")
+    o = original["organizations"]["folder_count"]
+    e = exported["organizations"]["folder_count"]
+    delta = e - o
+    delta_str = f"{delta:+d}" if delta != 0 else "0"
+    marker = " *" if delta != 0 else ""
+    print(f"  {'Org folders':<25s} {o:>10d} {e:>10d} {delta_str:>10s}{marker}")
+    print()
+
+    # Detailed checks
+    print("  ---- Checks ----")
+    pass_count = fail_count = warn_count = 0
+    for status, message in results:
+        icon = {"PASS": "  [PASS]", "FAIL": "  [FAIL]", "WARN": "  [WARN]"}[status]
+        print(f"  {icon} {message}")
+        if status == "PASS":
+            pass_count += 1
+        elif status == "FAIL":
+            fail_count += 1
+        else:
+            warn_count += 1
+
+    print()
+    print(f"  Summary: {pass_count} passed, {fail_count} failed, {warn_count} warnings")
+    print()
+
+    if all_pass:
+        print("  RESULT: ALL CHECKS PASSED")
+    else:
+        print("  RESULT: SOME CHECKS FAILED")
+    print("=" * 70)
+
+
+def print_json(original, exported, results, all_pass):
+    """Print JSON comparison report."""
+
+    def counts(info):
+        return {
+            "elements": len(info["elements"]),
+            "relationships": len(info["relationships"]),
+            "views": len(info["views"]),
+            "organizations_total": info["organizations"]["total_items"],
+            "organizations_refs": len(info["organizations"]["identifier_refs"]),
+            "organizations_folders": info["organizations"]["folder_count"],
+            "property_definitions": len(info["property_definitions"]),
+        }
+
+    output = {
+        "all_pass": all_pass,
+        "original": counts(original),
+        "exported": counts(exported),
+        "checks": [{"status": s, "message": m} for s, m in results],
+    }
+    print(json_module.dumps(output, indent=2))
+
+
+def main():
+    if len(sys.argv) < 3:
+        print("Usage: compare_archimate.py <original.xml> <exported.xml> [--json]")
+        print()
+        print("Compares two ArchiMate 3.x XML files for structural equivalence.")
+        print("Exit codes: 0 = all pass, 1 = failures, 2 = error")
+        sys.exit(2)
+
+    original_file = sys.argv[1]
+    exported_file = sys.argv[2]
+    json_output = "--json" in sys.argv
+
+    try:
+        original = parse_archimate(original_file)
+    except FileNotFoundError:
+        print(f"ERROR: Original file not found: {original_file}", file=sys.stderr)
+        sys.exit(2)
+    except ET.ParseError as e:
+        print(f"ERROR: Failed to parse original XML: {e}", file=sys.stderr)
+        sys.exit(2)
+
+    try:
+        exported = parse_archimate(exported_file)
+    except FileNotFoundError:
+        print(f"ERROR: Exported file not found: {exported_file}", file=sys.stderr)
+        sys.exit(2)
+    except ET.ParseError as e:
+        print(f"ERROR: Failed to parse exported XML: {e}", file=sys.stderr)
+        sys.exit(2)
+
+    results, all_pass = compare(original, exported)
+
+    if json_output:
+        print_json(original, exported, results, all_pass)
+    else:
+        print_report(original, exported, results, all_pass, original_file, exported_file)
+
+    sys.exit(0 if all_pass else 1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 2e4f6b7b..e32cac65 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -25,6 +25,7 @@
 use OCA\SoftwareCatalog\EventListener\SoftwareCatalogEventListener;
 use OCA\SoftwareCatalog\EventListener\TestEventListener;
 use OCA\SoftwareCatalog\EventListener\ModuleComplianceSubscriber;
+use OCA\SoftwareCatalog\EventListener\UserProfileUpdatedEventListener;
 
 use OCA\OpenRegister\Event\ObjectCreatedEvent;
 use OCA\OpenRegister\Event\ObjectUpdatedEvent;
@@ -32,6 +33,7 @@
 use OCA\OpenRegister\Event\ObjectLockedEvent;
 use OCA\OpenRegister\Event\ObjectUnlockedEvent;
 use OCA\OpenRegister\Event\ObjectRevertedEvent;
+use OCA\OpenRegister\Event\UserProfileUpdatedEvent;
 use OCA\OpenRegister\Event\OrganisationCreatedEvent;
 use OCA\OpenRegister\Event\RegisterCreatedEvent;
 use OCA\OpenRegister\Event\RegisterDeletedEvent;
@@ -150,6 +152,9 @@ public function register(IRegistrationContext $context): void
         $context->registerEventListener(ObjectCreatedEvent::class, ModuleComplianceSubscriber::class);
         $context->registerEventListener(ObjectUpdatedEvent::class, ModuleComplianceSubscriber::class);
 
+        // Register listener to sync user profile updates to contactpersoon objects
+        $context->registerEventListener(UserProfileUpdatedEvent::class, UserProfileUpdatedEventListener::class);
+
 
 
         // Organization event listeners removed - now using cron job for organization synchronization
diff --git a/lib/Controller/ContactpersonenController.php b/lib/Controller/ContactpersonenController.php
index 2100258e..48f7c160 100644
--- a/lib/Controller/ContactpersonenController.php
+++ b/lib/Controller/ContactpersonenController.php
@@ -409,8 +409,16 @@ public function changePassword(string $username, string $newPassword): JSONRespo
                 ], 400);
             }
 
-            // Set new password
-            $user->setPassword($newPassword);
+            // Set new password — setPassword() returns false if the password
+            // is rejected (e.g., compromised password list, policy violation).
+            $result = $user->setPassword($newPassword);
+
+            if ($result === false) {
+                return new JSONResponse([
+                    'success' => false,
+                    'message' => 'Password was rejected. It may be too common or violate the password policy. Please choose a different password.'
+                ], 400);
+            }
 
             $this->logger->info('Password changed for user', [
                 'username' => $username
diff --git a/lib/EventListener/UserProfileUpdatedEventListener.php b/lib/EventListener/UserProfileUpdatedEventListener.php
new file mode 100644
index 00000000..64e9901f
--- /dev/null
+++ b/lib/EventListener/UserProfileUpdatedEventListener.php
@@ -0,0 +1,196 @@
+<?php
+
+/**
+ * UserProfileUpdatedEvent Listener
+ *
+ * Listens for user profile updates from OpenRegister and syncs
+ * the changed fields back to the corresponding contactpersoon object.
+ *
+ * @category  EventListener
+ * @package   OCA\SoftwareCatalog\EventListener
+ * @author    Conduction b.v. <info@conduction.nl>
+ * @copyright 2024 Conduction B.V.
+ * @license   AGPL-3.0-or-later https://www.gnu.org/licenses/agpl-3.0.html
+ */
+
+declare(strict_types=1);
+
+namespace OCA\SoftwareCatalog\EventListener;
+
+use OCA\OpenRegister\Event\UserProfileUpdatedEvent;
+use OCA\SoftwareCatalog\Service\SettingsService;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Syncs user profile changes to the corresponding contactpersoon object.
+ *
+ * When a user updates their profile via /api/user/me, this listener finds
+ * the matching contactpersoon (by username field) and updates the relevant
+ * fields: voornaam, tussenvoegsel, achternaam, functie, e-mailadres.
+ *
+ * @implements IEventListener<UserProfileUpdatedEvent>
+ */
+class UserProfileUpdatedEventListener implements IEventListener
+{
+    /**
+     * Field mapping from user profile keys to contactpersoon keys.
+     */
+    private const FIELD_MAP = [
+        'firstName'  => 'voornaam',
+        'middleName' => 'tussenvoegsel',
+        'lastName'   => 'achternaam',
+        'functie'    => 'functie',
+        'email'      => 'e-mailadres',
+    ];
+
+    public function __construct()
+    {
+    }
+
+    /**
+     * Handle the UserProfileUpdatedEvent.
+     *
+     * @param Event $event The dispatched event.
+     *
+     * @return void
+     */
+    public function handle(Event $event): void
+    {
+        if ($event instanceof UserProfileUpdatedEvent === false) {
+            return;
+        }
+
+        try {
+            $logger = \OC::$server->get(LoggerInterface::class);
+            $changes = $event->getChanges();
+
+            // Check if any of the mapped fields were changed.
+            $relevantChanges = array_intersect($changes, array_keys(self::FIELD_MAP));
+            if (empty($relevantChanges) === true) {
+                $logger->debug('[UserProfileUpdatedEventListener] No relevant field changes for contactpersoon sync', [
+                    'userId'  => $event->getUserId(),
+                    'changes' => $changes,
+                ]);
+                return;
+            }
+
+            $logger->info('[UserProfileUpdatedEventListener] Syncing user profile changes to contactpersoon', [
+                'userId'          => $event->getUserId(),
+                'relevantChanges' => $relevantChanges,
+            ]);
+
+            $this->syncToContactpersoon($event, $logger);
+        } catch (\Exception $e) {
+            try {
+                $logger = \OC::$server->get(LoggerInterface::class);
+                $logger->error('[UserProfileUpdatedEventListener] Error syncing profile to contactpersoon', [
+                    'userId'    => $event->getUserId(),
+                    'exception' => $e->getMessage(),
+                    'file'      => $e->getFile(),
+                    'line'      => $e->getLine(),
+                ]);
+            } catch (\Exception $logException) {
+                // Silently fail if logging fails.
+            }
+        }
+    }
+
+    /**
+     * Find the contactpersoon object by username and update its fields.
+     *
+     * @param UserProfileUpdatedEvent $event  The profile updated event.
+     * @param LoggerInterface         $logger The logger.
+     *
+     * @return void
+     */
+    private function syncToContactpersoon(UserProfileUpdatedEvent $event, LoggerInterface $logger): void
+    {
+        $objectService = \OC::$server->get('OCA\OpenRegister\Service\ObjectService');
+        $settingsService = \OC::$server->get(SettingsService::class);
+
+        // Get the voorzieningen config for register and schema.
+        $voorzieningenConfig = $settingsService->getVoorzieningenConfig();
+        $register = $voorzieningenConfig['register'] ?? '';
+        $contactpersoonSchema = $voorzieningenConfig['contactpersoon_schema'] ?? '';
+
+        if (empty($register) === true || empty($contactpersoonSchema) === true) {
+            $logger->warning('[UserProfileUpdatedEventListener] Voorzieningen config missing register or contactpersoon_schema');
+            return;
+        }
+
+        $userId = $event->getUserId();
+
+        // Find contactpersoon by username field using searchObjects.
+        $query = [
+            '@self' => [
+                'register' => (int) $register,
+                'schema'   => (int) $contactpersoonSchema,
+            ],
+            'username' => $userId,
+        ];
+
+        $results = $objectService->searchObjects(
+            query: $query,
+            _rbac: false,
+            _multitenancy: false
+        );
+
+        if (empty($results) === true || (is_array($results) === true && count($results) === 0)) {
+            $logger->info('[UserProfileUpdatedEventListener] No contactpersoon found for user', [
+                'userId'   => $userId,
+                'register' => $register,
+                'schema'   => $contactpersoonSchema,
+            ]);
+            return;
+        }
+
+        // Get the first matching contactpersoon.
+        $contactpersoon = is_array($results) === true ? reset($results) : $results;
+        $contactData = $contactpersoon->getObject();
+        $newData = $event->getNewData();
+        $changes = $event->getChanges();
+
+        // Build the patch with only changed fields.
+        $patch = [];
+        foreach (self::FIELD_MAP as $userField => $contactField) {
+            if (in_array($userField, $changes, true) === false) {
+                continue;
+            }
+
+            $newValue = $newData[$userField] ?? null;
+            $patch[$contactField] = $newValue ?? '';
+        }
+
+        if (empty($patch) === true) {
+            $logger->debug('[UserProfileUpdatedEventListener] No fields to patch on contactpersoon', [
+                'userId' => $userId,
+            ]);
+            return;
+        }
+
+        $logger->info('[UserProfileUpdatedEventListener] Patching contactpersoon object', [
+            'userId'           => $userId,
+            'contactpersoonId' => $contactpersoon->getUuid(),
+            'patch'            => $patch,
+        ]);
+
+        // Only save the changed fields to avoid property authorization issues
+        // with protected fields like 'rollen'.
+        $objectService->saveObject(
+            register: $contactpersoon->getRegister(),
+            schema: $contactpersoon->getSchema(),
+            object: $patch,
+            _rbac: false,
+            _multitenancy: false,
+            uuid: $contactpersoon->getUuid()
+        );
+
+        $logger->info('[UserProfileUpdatedEventListener] Successfully synced user profile to contactpersoon', [
+            'userId'           => $userId,
+            'contactpersoonId' => $contactpersoon->getUuid(),
+            'patchedFields'    => array_keys($patch),
+        ]);
+    }
+}
diff --git a/lib/Service/ArchiMateExportService.php b/lib/Service/ArchiMateExportService.php
index 3f5178dc..02ea7c86 100644
--- a/lib/Service/ArchiMateExportService.php
+++ b/lib/Service/ArchiMateExportService.php
@@ -110,6 +110,11 @@ public function arrayToXml(array $data, \SimpleXMLElement $xml): \SimpleXMLEleme
                 continue;
             }
 
+            // Skip colon-prefixed duplicate keys (artifacts from XML-to-JSON parsing)
+            if (is_string($key) && str_starts_with($key, ':')) {
+                continue;
+            }
+
             // Skip numeric keys - they indicate array items that should be handled differently
             if (is_int($key)) {
                 continue;
@@ -517,42 +522,101 @@ private function addObjectToFolder(\SimpleXMLElement $folder, array $object, str
 
     /**
      * Get all objects from the AMEF register
-     * 
+     *
+     * Queries each schema separately because OpenRegister's magic table routing
+     * requires both register AND schema in the query. Without schema, the query
+     * falls back to the generic objects table (which is empty for magic-table registers).
+     *
      * @param \OCA\OpenRegister\Service\ObjectService $objectService OpenRegister ObjectService
      * @param int $registerId AMEF register ID
+     * @param array $schemaIdMap Mapping of schema IDs to schema types
      * @return array Array of objects from all schemas in the register
      * @throws \RuntimeException If retrieval fails
      */
-    public function getObjectsFromDatabase(\OCA\OpenRegister\Service\ObjectService $objectService, int $registerId): array
+    public function getObjectsFromDatabase(\OCA\OpenRegister\Service\ObjectService $objectService, int $registerId, array $schemaIdMap = []): array
     {
         $this->logger->info('Retrieving all objects from AMEF register', [
-            'register_id' => $registerId
+            'register_id' => $registerId,
+            'schema_count' => count($schemaIdMap)
         ]);
 
-        // Build simple query for all objects in the register (all schemas)
-        $query = [
-            '@self' => [
-                'register' => $registerId
-            ]
+        $allObjects = [];
+
+        // Map schema types (singular) to section names used in XML generation
+        $sectionNameMap = [
+            'element' => 'element',
+            'relationship' => 'relationship',
+            'view' => 'view',
+            'organization' => 'organization',
+            'property_definition' => 'property_definition',
+            'model' => 'model'
         ];
 
-        try {
-            $allObjects = $objectService->searchObjects(query: $query, _rbac: false, _multitenancy: false);
-            
-            $this->logger->info('Objects retrieved successfully from AMEF register', [
-                'total_retrieved_count' => count($allObjects),
-                'register_id' => $registerId
-            ]);
+        // Query each schema separately (required for magic table routing)
+        foreach ($schemaIdMap as $schemaId => $schemaType) {
+            $query = [
+                '@self' => [
+                    'register' => $registerId,
+                    'schema' => (int) $schemaId
+                ],
+                '_limit' => 10000
+            ];
 
-            return $allObjects;
-            
-        } catch (\Exception $e) {
-            $this->logger->error("Failed to retrieve objects from AMEF register", [
-                'register_id' => $registerId,
-                'error' => $e->getMessage()
-            ]);
-            throw new \RuntimeException("Failed to retrieve objects from database: " . $e->getMessage());
+            try {
+                $schemaObjects = $objectService->searchObjects(query: $query, _rbac: false, _multitenancy: false);
+
+                // Inject 'section' field if missing (magic table objects don't store it)
+                $sectionName = $sectionNameMap[$schemaType] ?? $schemaType;
+                foreach ($schemaObjects as &$obj) {
+                    if (is_object($obj) && method_exists($obj, 'jsonSerialize')) {
+                        $obj = $obj->jsonSerialize();
+                    }
+                    if (!isset($obj['section'])) {
+                        $obj['section'] = $sectionName;
+                    }
+                }
+                unset($obj);
+
+                $this->logger->info("Objects retrieved for schema", [
+                    'schema_id' => $schemaId,
+                    'schema_type' => $schemaType,
+                    'count' => count($schemaObjects)
+                ]);
+
+                $allObjects = array_merge($allObjects, $schemaObjects);
+            } catch (\Exception $e) {
+                $this->logger->warning("Failed to retrieve objects for schema", [
+                    'schema_id' => $schemaId,
+                    'schema_type' => $schemaType,
+                    'error' => $e->getMessage()
+                ]);
+            }
         }
+
+        // Fallback: if no schemaIdMap provided, try querying register directly
+        if (empty($schemaIdMap)) {
+            $query = [
+                '@self' => ['register' => $registerId],
+                '_limit' => 10000
+            ];
+
+            try {
+                $allObjects = $objectService->searchObjects(query: $query, _rbac: false, _multitenancy: false);
+            } catch (\Exception $e) {
+                $this->logger->error("Failed to retrieve objects from AMEF register", [
+                    'register_id' => $registerId,
+                    'error' => $e->getMessage()
+                ]);
+                throw new \RuntimeException("Failed to retrieve objects from database: " . $e->getMessage());
+            }
+        }
+
+        $this->logger->info('Objects retrieved successfully from AMEF register', [
+            'total_retrieved_count' => count($allObjects),
+            'register_id' => $registerId
+        ]);
+
+        return $allObjects;
     }
 
 
@@ -593,8 +657,8 @@ public function exportArchiMateXml(
             'organization_filter' => $organization
         ]);
 
-        // Step 1: Get all objects from database in one efficient query
-        $objects = $this->getObjectsFromDatabase($objectService, $registerId);
+        // Step 1: Get all objects from database (queries each schema separately for magic table support)
+        $objects = $this->getObjectsFromDatabase($objectService, $registerId, $schemaIdMap);
         $dbTime = microtime(true) - $startTime;
         
         // Step 2: Process and generate XML in single optimized pass (no schema mapping needed)
@@ -756,7 +820,14 @@ private function addObjectDirectlyToXmlWithProperties(\SimpleXMLElement $folder,
             default => 'element'
         };
         $objectNode = $folder->addChild($tagName);
-        $xmlData = $this->cleanObjectDataForXml($object, $propertyDefinitionMap);
+        // Prefer the 'xml' field (original ArchiMate structure preserved during import)
+        // over cleanObjectDataForXml which loses array structure for name/documentation
+        if (isset($object['xml']) && is_array($object['xml']) && !empty($object['xml'])) {
+            $xmlData = $object['xml'];
+            unset($xmlData['_essential_data']);
+        } else {
+            $xmlData = $this->cleanObjectDataForXml($object, $propertyDefinitionMap);
+        }
         if (is_array($xmlData) && !empty($xmlData)) {
             if ($sectionName === 'views') {
                 $this->addViewDataToXmlNode($objectNode, $xmlData);
@@ -798,7 +869,11 @@ private function addViewDataToXmlNode(\SimpleXMLElement $viewNode, array $viewDa
         // Process all other elements, handling nodes and connections specially
         foreach ($viewData as $key => $value) {
             // Skip already processed attributes and metadata, including duplicate id element
-            if (in_array($key, ['_attributes', '_identifier', 'identifier', '_xsi__type', 'xsi:type', '_xsi:type', 'id'])) {
+            if (in_array($key, ['_attributes', '_identifier', 'identifier', '_xsi__type', 'xsi:type', '_xsi:type', 'id', '_essential_data', 'viewNodes', 'viewRelationships'])) {
+                continue;
+            }
+            // Skip colon-prefixed duplicate keys (artifacts from XML-to-JSON parsing)
+            if (is_string($key) && str_starts_with($key, ':')) {
                 continue;
             }
             
@@ -888,11 +963,16 @@ private function addNodeDataToXmlElement(\SimpleXMLElement $nodeElement, array $
             if (in_array($key, $skipKeys)) {
                 continue; // Skip already processed attributes
             }
-            
+
             // Skip numeric keys as they can't be valid XML element names
             if (is_numeric($key)) {
                 continue;
             }
+
+            // Skip colon-prefixed duplicate keys (artifacts from XML-to-JSON parsing)
+            if (is_string($key) && str_starts_with($key, ':')) {
+                continue;
+            }
             
             if ($key === 'node' && is_array($value)) {
                 // Handle nested nodes recursively
@@ -990,16 +1070,23 @@ private function addCleanDataToXmlNode(\SimpleXMLElement $node, array $data, ?st
         }
         if (isset($data['_attributes']) && is_array($data['_attributes'])) {
             foreach ($data['_attributes'] as $attrKey => $attrValue) {
-                $cleanKey = str_replace(':', '', $attrKey);
+                // Skip colon-prefixed duplicate keys
+                if (str_starts_with($attrKey, ':')) {
+                    continue;
+                }
                 $isPropertyDefinition = ($sectionName === 'property_definitions');
-                if ($cleanKey === 'type') {
+                if ($attrKey === 'xsi:type') {
                     if ($isPropertyDefinition) {
                         $attributes['type'] = (string)$attrValue;
                     } else {
                         $attributes['xsi:type'] = (string)$attrValue;
                     }
-                } elseif (in_array($cleanKey, ['identifier', 'source', 'target', 'accessType'])) {
-                    $attributes[$cleanKey] = (string)$attrValue;
+                } elseif (in_array($attrKey, ['identifier', 'source', 'target', 'accessType', 'type'])) {
+                    if ($attrKey === 'type' && !$isPropertyDefinition) {
+                        $attributes['xsi:type'] = (string)$attrValue;
+                    } else {
+                        $attributes[$attrKey] = (string)$attrValue;
+                    }
                 }
             }
         }
@@ -1038,7 +1125,11 @@ private function addCleanDataToXmlNode(\SimpleXMLElement $node, array $data, ?st
         }
         // Handle child elements
         foreach ($data as $key => $value) {
-            if (in_array($key, ['identifier', 'xsi:type', 'xsi_type', '_xsi:type', '_type', 'source', 'target', 'accessType', 'type', '_attributes'])) {
+            if (in_array($key, ['identifier', 'xsi:type', 'xsi_type', '_xsi:type', '_type', 'source', 'target', 'accessType', 'type', '_attributes', '_essential_data'])) {
+                continue;
+            }
+            // Skip colon-prefixed duplicate keys (artifacts from XML-to-JSON parsing)
+            if (is_string($key) && str_starts_with($key, ':')) {
                 continue;
             }
             if ($key === 'name' && is_array($value)) {
diff --git a/lib/Service/ArchiMateImportService.php b/lib/Service/ArchiMateImportService.php
index 293dfdc9..b8b256ea 100644
--- a/lib/Service/ArchiMateImportService.php
+++ b/lib/Service/ArchiMateImportService.php
@@ -1968,23 +1968,58 @@ private function buildStatisticsFromSaveResult(): array
 
         $saveResult = $this->lastSaveResult;
 
-        // For now, put all counts in 'elements' section since we don't categorize by ArchiMate type.
-        // TODO: Could enhance this by examining object properties to determine section type.
-        $statistics['elements']['created']   = count($saveResult['saved'] ?? []);
-        $statistics['elements']['updated']   = count($saveResult['updated'] ?? []);
-        $statistics['elements']['unchanged'] = count($saveResult['unchanged'] ?? []);
-
-        // Count invalid objects as errors.
-        $invalidCount = count($saveResult['invalid'] ?? []);
+        // Map singular section values (from import) to plural statistics keys
+        $sectionMap = [
+            'element' => 'elements',
+            'relationship' => 'relationships',
+            'organization' => 'organizations',
+            'view' => 'views',
+            'property_definition' => 'property_definitions',
+            'model' => 'elements', // model objects fall under elements
+        ];
+
+        // Helper to get the statistics key for an object
+        $getSectionKey = function ($obj) use ($sectionMap): string {
+            if (is_object($obj) && method_exists($obj, 'jsonSerialize')) {
+                $obj = $obj->jsonSerialize();
+            }
+            $section = $obj['section'] ?? 'element';
+            return $sectionMap[$section] ?? 'elements';
+        };
+
+        // Categorize saved (created) objects by section
+        foreach ($saveResult['saved'] ?? [] as $obj) {
+            $key = $getSectionKey($obj);
+            $statistics[$key]['created']++;
+        }
+
+        // Categorize updated objects by section
+        foreach ($saveResult['updated'] ?? [] as $obj) {
+            $key = $getSectionKey($obj);
+            $statistics[$key]['updated']++;
+        }
+
+        // Categorize unchanged objects by section
+        foreach ($saveResult['unchanged'] ?? [] as $obj) {
+            $key = $getSectionKey($obj);
+            $statistics[$key]['unchanged']++;
+        }
+
+        // Count invalid objects as errors
         foreach ($saveResult['invalid'] ?? [] as $invalidItem) {
-            $statistics['elements']['errors'][] = $invalidItem['error'] ?? 'Unknown error';
+            $obj = $invalidItem['object'] ?? [];
+            $key = $getSectionKey($obj);
+            $statistics[$key]['errors'][] = $invalidItem['error'] ?? 'Unknown error';
         }
 
-        // Calculate summary totals.
-        $statistics['summary']['total_objects_created']   = $statistics['elements']['created'];
-        $statistics['summary']['total_objects_updated']   = $statistics['elements']['updated'];
-        $statistics['summary']['total_objects_unchanged'] = $statistics['elements']['unchanged'];
-        $statistics['summary']['total_errors']            = $invalidCount;
+        // Calculate summary totals
+        foreach ($statistics as $section => $sectionStats) {
+            if ($section === 'summary') continue;
+            $statistics['summary']['total_objects_created']   += $sectionStats['created'];
+            $statistics['summary']['total_objects_updated']   += $sectionStats['updated'];
+            $statistics['summary']['total_objects_unchanged'] += $sectionStats['unchanged'];
+            $statistics['summary']['total_errors']            += count($sectionStats['errors']);
+        }
 
         return $statistics;
     }
@@ -2013,28 +2048,42 @@ private function calculateOptimizedStatistics(array $savedObjects): array
             ]
         ];
         
-        // DEBUG: Log initialized statistics structure.
-        error_log('[ArchiMate] Statistics initialized with keys: ' . json_encode(array_keys($statistics['elements'])));
-
         if ($this->lastSaveResult !== null) {
             $saveResult = $this->lastSaveResult;
 
-            // DEBUG: Log save result structure.
-            error_log('[ArchiMate] lastSaveResult has: saved=' . count($saveResult['saved'] ?? []) . ', updated=' . count($saveResult['updated'] ?? []) . ', unchanged=' . count($saveResult['unchanged'] ?? []));
-            
-            // Simple approach: Just count totals without trying to categorize by section.
-            // The section categorization isn't working, so let's just put everything in 'elements'.
-            $statistics['elements']['created'] = count($saveResult['saved'] ?? []);
-            $statistics['elements']['updated'] = count($saveResult['updated'] ?? []);
-            $statistics['elements']['unchanged'] = count($saveResult['unchanged'] ?? []);
-            
-            // Count errors.
-            $invalidObjects = $saveResult['invalid'] ?? [];
-            foreach ($invalidObjects as $invalidItem) {
-                $statistics['elements']['errors'][] = $invalidItem['error'] ?? 'Unknown validation error';
-            }
-
-            // Calculate summary totals from actual statistics.
+            // Map singular section values (from import) to plural statistics keys
+            $sectionMap = [
+                'element' => 'elements',
+                'relationship' => 'relationships',
+                'organization' => 'organizations',
+                'view' => 'views',
+                'property_definition' => 'property_definitions',
+                'model' => 'elements',
+            ];
+
+            $getSectionKey = function ($obj) use ($sectionMap): string {
+                if (is_object($obj) && method_exists($obj, 'jsonSerialize')) {
+                    $obj = $obj->jsonSerialize();
+                }
+                $section = $obj['section'] ?? 'element';
+                return $sectionMap[$section] ?? 'elements';
+            };
+
+            foreach ($saveResult['saved'] ?? [] as $obj) {
+                $statistics[$getSectionKey($obj)]['created']++;
+            }
+            foreach ($saveResult['updated'] ?? [] as $obj) {
+                $statistics[$getSectionKey($obj)]['updated']++;
+            }
+            foreach ($saveResult['unchanged'] ?? [] as $obj) {
+                $statistics[$getSectionKey($obj)]['unchanged']++;
+            }
+            foreach ($saveResult['invalid'] ?? [] as $invalidItem) {
+                $obj = $invalidItem['object'] ?? [];
+                $statistics[$getSectionKey($obj)]['errors'][] = $invalidItem['error'] ?? 'Unknown validation error';
+            }
+
+            // Calculate summary totals
             $summary = [
                 'total_objects_created' => 0,
                 'total_objects_updated' => 0,
@@ -2044,7 +2093,7 @@ private function calculateOptimizedStatistics(array $savedObjects): array
             ];
 
             foreach ($statistics as $section => $sectionStats) {
-                if ($section !== 'summary') { // Skip summary section itself.
+                if ($section !== 'summary') {
                     $summary['total_objects_created'] += $sectionStats['created'];
                     $summary['total_objects_updated'] += $sectionStats['updated'];
                     $summary['total_objects_unchanged'] += $sectionStats['unchanged'];
@@ -2055,16 +2104,6 @@ private function calculateOptimizedStatistics(array $savedObjects): array
             $statistics['summary'] = $summary;
         }
 
-        // DEBUG: Log final statistics before return.
-        $this->logger->info('[ArchiMate] calculateOptimizedStatistics returning', [
-            'statistics_keys' => array_keys($statistics),
-            'elements_keys' => array_keys($statistics['elements'] ?? []),
-            'summary' => $statistics['summary'] ?? []
-        ]);
-
-        // DEBUG: Force output to see what we're actually returning.
-        error_log('[ArchiMate DEBUG] Statistics structure: ' . json_encode($statistics['elements']));
-
         return $statistics;
     }
 
@@ -2403,7 +2442,15 @@ private function extractEssentialXmlData(array $item, array $elementsLookup = []
             }
         }
 
-        // Extract nodes and connections for view objects with element splicing
+        // Preserve original node/connection arrays for views (needed by export's addViewDataToXmlNode)
+        if (isset($item['node'])) {
+            $essential['node'] = $item['node'];
+        }
+        if (isset($item['connection'])) {
+            $essential['connection'] = $item['connection'];
+        }
+
+        // Extract flattened viewNodes/viewRelationships for frontend consumption
         if ($schemaType === 'view') {
             $this->extractViewNodesAndConnections($item, $essential, $elementsLookup);
         } else {
diff --git a/lib/Service/ContactpersoonService.php b/lib/Service/ContactpersoonService.php
index abe00959..37db8cea 100644
--- a/lib/Service/ContactpersoonService.php
+++ b/lib/Service/ContactpersoonService.php
@@ -333,7 +333,7 @@ public function handleContactpersoonUpdate(object $contactpersoonObject, object
         try {
             $contactData = $contactpersoonObject->getObject();
             $contactId = $contactpersoonObject->getId();
-            
+
             $this->logger->info('ContactpersoonService: Handling contactpersoon update', [
                 'contactId' => $contactId,
                 'hasOldObject' => $oldContactpersoonObject !== null
@@ -347,6 +347,9 @@ public function handleContactpersoonUpdate(object $contactpersoonObject, object
                 $this->handleRoleChanges($contactpersoonObject, $oldContactpersoonObject);
             }
 
+            // Sync name/functie fields back to the Nextcloud user when changed.
+            $this->syncNameFieldsToUser($contactpersoonObject, $oldContactpersoonObject);
+
             $this->logger->info('ContactpersoonService: Successfully handled contactpersoon update', [
                 'contactId' => $contactId
             ]);
@@ -360,6 +363,62 @@ public function handleContactpersoonUpdate(object $contactpersoonObject, object
         }
     }
 
+    /**
+     * Syncs name/functie fields from contactpersoon to the corresponding Nextcloud user.
+     *
+     * @param object      $contactpersoonObject    The updated contactpersoon object.
+     * @param object|null $oldContactpersoonObject The previous contactpersoon object.
+     *
+     * @return void
+     */
+    private function syncNameFieldsToUser(object $contactpersoonObject, ?object $oldContactpersoonObject): void
+    {
+        $newData = $contactpersoonObject->getObject();
+        $oldData = $oldContactpersoonObject !== null ? $oldContactpersoonObject->getObject() : [];
+
+        // Check if any name/functie fields have changed.
+        $nameFields = ['voornaam', 'tussenvoegsel', 'achternaam', 'functie', 'e-mailadres'];
+        $hasNameChanges = false;
+
+        foreach ($nameFields as $field) {
+            if (($newData[$field] ?? '') !== ($oldData[$field] ?? '')) {
+                $hasNameChanges = true;
+                break;
+            }
+        }
+
+        if ($hasNameChanges === false) {
+            return;
+        }
+
+        // Find the corresponding Nextcloud user.
+        $username = $newData['username'] ?? '';
+        if (empty($username) === true) {
+            return;
+        }
+
+        $userManager = \OC::$server->get('OCP\IUserManager');
+        $user = $userManager->get($username);
+
+        if ($user === null) {
+            $this->logger->debug('ContactpersoonService: No Nextcloud user found for name sync', [
+                'username' => $username,
+            ]);
+            return;
+        }
+
+        $this->logger->info('ContactpersoonService: Syncing contactpersoon name fields to user', [
+            'username'    => $username,
+            'contactId'   => $contactpersoonObject->getId(),
+            'changedData' => array_intersect_key(
+                $newData,
+                array_flip($nameFields)
+            ),
+        ]);
+
+        $this->contactPersonHandler->storeContactNameFields($user, $newData);
+    }
+
     /**
      * Handles role changes between old and new contactpersoon objects
      *
diff --git a/lib/Service/SoftwareCatalogue/ContactPersonHandler.php b/lib/Service/SoftwareCatalogue/ContactPersonHandler.php
index cf81f0a9..88ecc8d5 100644
--- a/lib/Service/SoftwareCatalogue/ContactPersonHandler.php
+++ b/lib/Service/SoftwareCatalogue/ContactPersonHandler.php
@@ -994,7 +994,7 @@ private function getDisplayNameFromContactData(array $contactData): string
      *
      * @return void
      */
-    private function storeContactNameFields(\OCP\IUser $user, array $contactData): void
+    public function storeContactNameFields(\OCP\IUser $user, array $contactData): void
     {
         try {
             $userId = $user->getUID();
@@ -1051,6 +1051,16 @@ private function storeContactNameFields(\OCP\IUser $user, array $contactData): v
                 }
             }
 
+            // Sync e-mailadres to user's email property.
+            $email = $contactData['e-mailadres'] ?? $contactData['email'] ?? '';
+            if (!empty($email) && $email !== $user->getEMailAddress()) {
+                $user->setEMailAddress($email);
+                $this->_logger->info('Updated user email from contactpersoon', [
+                    'userId' => $userId,
+                    'email' => $email
+                ]);
+            }
+
             $this->_logger->info('Stored contact name fields in user config', [
                 'userId' => $userId,
                 'firstName' => $firstName,
diff --git a/lib/Settings/softwarecatalogus_register.json b/lib/Settings/softwarecatalogus_register.json
index 5d6aa64c..e18dd386 100644
--- a/lib/Settings/softwarecatalogus_register.json
+++ b/lib/Settings/softwarecatalogus_register.json
@@ -4723,6 +4723,11 @@
                 "handling": "related-object"
               }
             }
+          },
+          "xml": {
+            "type": "object",
+            "title": "XML Data",
+            "description": "Original ArchiMate XML structure for round-trip export fidelity"
           }
         },
         "archive": [],
@@ -5108,6 +5113,11 @@
             "type": "string",
             "facetable": false,
             "title": "summary"
+          },
+          "xml": {
+            "type": "object",
+            "title": "XML Data",
+            "description": "Original ArchiMate XML structure for round-trip export fidelity"
           }
         },
         "archive": [],
@@ -5555,6 +5565,11 @@
             },
             "oneOf": [],
             "title": "views"
+          },
+          "xml": {
+            "type": "object",
+            "title": "XML Data",
+            "description": "Original ArchiMate XML structure for round-trip export fidelity"
           }
         },
         "archive": [],
@@ -5695,6 +5710,11 @@
               ],
               "maxSize": 5242880
             }
+          },
+          "xml": {
+            "type": "object",
+            "title": "XML Data",
+            "description": "Original ArchiMate XML structure for round-trip export fidelity"
           }
         },
         "archive": [],
@@ -5852,6 +5872,11 @@
               "indexed": false,
               "searchable": false
             }
+          },
+          "xml": {
+            "type": "object",
+            "title": "XML Data",
+            "description": "Original ArchiMate XML structure for round-trip export fidelity"
           }
         },
         "archive": [],
@@ -6334,6 +6359,11 @@
               "indexed": false,
               "searchable": false
             }
+          },
+          "xml": {
+            "type": "object",
+            "title": "XML Data",
+            "description": "Original ArchiMate XML structure for round-trip export fidelity"
           }
         },
         "archive": [],
diff --git a/lib/Settings/softwarecatalogus_register_old.json b/lib/Settings/softwarecatalogus_register_old.json
deleted file mode 100644
index eccbf435..00000000
--- a/lib/Settings/softwarecatalogus_register_old.json
+++ /dev/null
@@ -1,5435 +0,0 @@
-{
-  "openapi": "3.0.0",
-  "info": {
-    "title": "Software Catalog Register",
-    "description": "Register containing AMEF and Voorzieningen schemas for the VNG Software Catalog application. This configuration includes schemas for applications, services, organizations, and compliance tracking.",
-    "version": "2.0.4"
-  },
-  "x-openregister": {
-    "type": "application",
-    "app": "softwarecatalog",
-    "sourceType": "github",
-    "sourceUrl": "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/ConductionNL/opencatalogi/blob/master/apps-extra/softwarecatalog/lib/Settings/softwarecatalogus_register_magic.json",
-    "openregister": "^v0.2.10",
-    "github": {
-      "repo": "ConductionNL/opencatalogi",
-      "branch": "master",
-      "path": "apps-extra/softwarecatalog/lib/Settings/softwarecatalogus_register_magic.json"
-    },
-    "description": "Magic Mapper version - Uses dedicated SQL tables for high-performance schema storage"
-  },
-  "components": {
-    "registers": {
-      "voorzieningen": {
-        "slug": "voorzieningen",
-        "title": "Voorzieningen",
-        "version": "2.0.1",
-        "description": "Register voor voorzieningen uit de softwarecatalogus",
-        "schemas": [
-          "sector",
-          "suite",
-          "component",
-          "module",
-          "dienst",
-          "kwetsbaarheid",
-          "contactpersoon",
-          "organisatie",
-          "gebruik",
-          "contract",
-          "koppeling",
-          "beoordeeling",
-          "compliancy",
-          "moduleVersie"
-        ],
-        "source": "internal",
-        "tablePrefix": "",
-        "folder": "500",
-        "updated": "2025-07-29T12:00:00+00:00",
-        "created": "2025-05-09T12:14:18+00:00",
-        "owner": "1",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "authorization": null,
-        "groups": null,
-        "deleted": null,
-        "configuration": {
-          "schemas": {
-            "module": {
-              "magicMapping": true,
-              "autoCreateTable": true,
-              "comment": "High-volume applicaties schema - optimized for performance"
-            },
-            "organisatie": {
-              "magicMapping": true,
-              "autoCreateTable": true,
-              "comment": "Frequently queried organisaties - benefits from SQL indexing"
-            },
-            "gebruik": {
-              "magicMapping": true,
-              "autoCreateTable": true,
-              "comment": "Usage tracking - high query volume"
-            },
-            "dienst": {
-              "magicMapping": true,
-              "autoCreateTable": true,
-              "comment": "Service offerings - frequently filtered and sorted"
-            },
-            "koppeling": {
-              "magicMapping": true,
-              "autoCreateTable": true,
-              "comment": "Integration mappings - complex queries"
-            }
-          }
-        }
-      },
-      "vng-gemma": {
-        "slug": "vng-gemma",
-        "title": "AMEF",
-        "version": "0.0.5",
-        "description": "Register voor AMEF (ArchiMate Model Exchange Format) modellen en architectuur elementen",
-        "schemas": [
-          "element",
-          "model",
-          "organization",
-          "property-definition",
-          "relation",
-          "view",
-          "property"
-        ],
-        "source": "",
-        "tablePrefix": "",
-        "folder": "Open Registers/VNG Gemma Register",
-        "updated": "2025-05-15T12:05:44+00:00",
-        "created": "2025-05-02T10:30:47+00:00",
-        "owner": null,
-        "application": null,
-        "organisation": null,
-        "authorization": null,
-        "deleted": null,
-        "configuration": {
-          "schemas": {
-            "element": {
-              "magicMapping": true,
-              "autoCreateTable": true,
-              "comment": "AMEF elements - large dataset with complex queries"
-            },
-            "view": {
-              "magicMapping": true,
-              "autoCreateTable": true,
-              "comment": "Architecture views - frequently accessed"
-            },
-            "relation": {
-              "magicMapping": true,
-              "autoCreateTable": true,
-              "comment": "Element relations - many-to-many queries"
-            }
-          }
-        }
-      }
-    },
-    "endpoints": {
-      "register": {
-        "name": "Register",
-        "description": "Endpoint voor het registreren van organisaties in de softwarecatalogus",
-        "reference": "",
-        "version": "0.0.4",
-        "endpoint": "register",
-        "endpointArray": [
-          "register"
-        ],
-        "endpointRegex": "#^register$#",
-        "method": "POST",
-        "targetType": "register/schema",
-        "targetId": "voorzieningen/organisatie",
-        "conditions": [],
-        "inputMapping": null,
-        "outputMapping": null,
-        "configurations": [],
-        "slug": "register",
-        "created": "2025-05-16T13:11:49+00:00",
-        "updated": "2025-05-16T13:38:20+00:00"
-      },
-      "views": {
-        "name": "Views",
-        "description": "",
-        "reference": "https://vng.accept.commonground.nu/Endpoint-Views.json",
-        "version": "0.0.2",
-        "endpoint": "views",
-        "endpointArray": [
-          "views"
-        ],
-        "endpointRegex": "#^views$#",
-        "method": "GET",
-        "targetType": "register/schema",
-        "targetId": "vng-gemma/view",
-        "conditions": [],
-        "inputMapping": null,
-        "outputMapping": null,
-        "rules": [],
-        "configurations": [],
-        "slug": "views",
-        "created": "2025-05-01T14:48:08+00:00",
-        "updated": "2025-05-02T10:39:14+00:00"
-      },
-      "view": {
-        "name": "View",
-        "description": "",
-        "reference": "https://vng.accept.commonground.nu/Endpoint-View.json",
-        "version": "0.0.2",
-        "endpoint": "views/{{id}}",
-        "endpointArray": [
-          "views",
-          "{{id}}"
-        ],
-        "endpointRegex": "#^views(/([^/]+))$#",
-        "method": "GET",
-        "targetType": "register/schema",
-        "targetId": "vng-gemma/view",
-        "conditions": [],
-        "inputMapping": null,
-        "outputMapping": null,
-        "rules": [],
-        "configurations": [],
-        "slug": "view",
-        "created": "2025-05-01T14:48:08+00:00",
-        "updated": "2025-05-02T10:39:24+00:00"
-      }
-    },
-    "schemas": {
-      "property": {
-        "uri": null,
-        "slug": "property",
-        "title": "Property",
-        "description": "Schema voor generieke eigenschappen die aan voorzieningen of relaties kunnen hangen",
-        "version": "0.0.9",
-        "summary": "",
-        "icon": "Tag",
-        "required": [
-          "name",
-          "type"
-        ],
-        "properties": {
-          "name": {
-            "description": "Naam van de eigenschap",
-            "type": "string",
-            "minLength": 1,
-            "maxLength": 200,
-            "facetable": false,
-            "title": "Naam"
-          },
-          "type": {
-            "description": "Datatype van de eigenschap",
-            "type": "string",
-            "enum": [
-              "string",
-              "number",
-              "boolean",
-              "date"
-            ],
-            "facetable": true,
-            "title": "Type"
-          },
-          "value": {
-            "description": "Waarde van de eigenschap",
-            "type": "string",
-            "maxLength": 1000,
-            "facetable": false,
-            "title": "Waarde"
-          },
-          "lang": {
-            "description": "Taalcode (optioneel)",
-            "type": "string",
-            "minLength": 2,
-            "maxLength": 2,
-            "facetable": false,
-            "title": "Taal"
-          }
-        },
-        "archive": [],
-        "source": "",
-        "hardValidation": false,
-        "updated": "2025-08-10T00:00:00+00:00",
-        "created": "2025-08-10T00:00:00+00:00",
-        "maxDepth": 0,
-        "owner": "system",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "groups": null,
-        "authorization": {
-          "create": [
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar",
-            "aanbod-beheerder"
-          ],
-          "read": [
-            "public",
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "gebruik-raadpleger"
-          ],
-          "update": [
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "gebruik-raadpleger",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "software-catalog-admins",
-            "software-catalog-users",
-            "vng-raadpleger"
-          ],
-          "delete": [
-            "aanbod-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar"
-          ]
-        },
-        "deleted": null,
-        "configuration": {
-          "autoPublish": false
-        },
-        "searchable": true
-      },
-      "sector": {
-        "uri": null,
-        "slug": "sector",
-        "title": "Sector",
-        "description": "Schema voor sectoren binnen de softwarecatalogus",
-        "version": "0.0.9",
-        "summary": "",
-        "icon": "Domain",
-        "required": [
-          "naam"
-        ],
-        "properties": {
-          "naam": {
-            "description": "Naam van de sector",
-            "type": "string",
-            "required": true,
-            "visible": true,
-            "order": 1,
-            "facetable": false,
-            "title": "Naam",
-            "maxLength": 200,
-            "example": "Bijvoorbeeld: Overheid"
-          },
-          "beschrijving": {
-            "description": "Beschrijving van de sector",
-            "type": "string",
-            "visible": true,
-            "order": 2,
-            "facetable": false,
-            "title": "Beschrijving",
-            "maxLength": 1000,
-            "example": "Bijvoorbeeld: Publieke sector en overheidsdiensten"
-          }
-        },
-        "archive": [],
-        "source": "",
-        "hardValidation": false,
-        "immutable": false,
-        "updated": "2025-05-13T19:35:39+00:00",
-        "created": "2025-05-01T14:49:42+00:00",
-        "maxDepth": 0,
-        "owner": "system",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "groups": null,
-        "authorization": {
-          "create": [
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar",
-            "aanbod-beheerder"
-          ],
-          "read": [
-            "public",
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "gebruik-raadpleger"
-          ],
-          "update": [
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "gebruik-raadpleger",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "software-catalog-admins",
-            "software-catalog-users",
-            "vng-raadpleger"
-          ],
-          "delete": [
-            "aanbod-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar"
-          ]
-        },
-        "deleted": null,
-        "configuration": {
-          "objectNameField": "naam",
-          "objectDescriptionField": "beschrijving",
-          "autoPublish": false
-        },
-        "searchable": true
-      },
-      "suite": {
-        "uri": null,
-        "slug": "suite",
-        "title": "Suite",
-        "description": "Een suite is een verzameling van applicaties die samen een product vormen",
-        "version": "0.1.2",
-        "summary": "",
-        "icon": "PackageVariant",
-        "required": [
-          "naam",
-          "beschrijvingKort"
-        ],
-        "properties": {
-          "naam": {
-            "description": "Naam van de suite",
-            "type": "string",
-            "required": true,
-            "visible": true,
-            "order": 1,
-            "maxLength": 200,
-            "facetable": false,
-            "title": "Naam",
-            "table": {
-              "default": true
-            },
-            "example": "Bijvoorbeeld: VNG Suite"
-          },
-          "beschrijvingKort": {
-            "type": "string",
-            "title": "Korte omschrijving",
-            "description": "Korte beschrijving van de suite",
-            "facetable": false,
-            "maxLength": 255,
-            "order": 2,
-            "table": {
-              "default": true
-            },
-            "example": "Bijvoorbeeld: Een korte samenvatting van de suite"
-          },
-          "beschrijvingLang": {
-            "description": "Uitgebreide beschrijving van de suite",
-            "type": "string",
-            "format": "markdown",
-            "visible": true,
-            "order": 3,
-            "maxLength": 5000,
-            "facetable": false,
-            "title": "Uitgebreide omschrijving",
-            "example": "Bijvoorbeeld: Een uitgebreide beschrijving van de suite met alle functionaliteiten"
-          },
-          "logo": {
-            "description": "URL naar het logo van de suite",
-            "type": "string",
-            "format": "url",
-            "visible": true,
-            "order": 4,
-            "maxLength": 500,
-            "facetable": false,
-            "table": {
-              "default": true
-            },
-            "title": "Logo",
-            "example": "https://voorbeeld.nl/logo.png"
-          },
-          "website": {
-            "description": "Website van de suite",
-            "type": "string",
-            "format": "url",
-            "visible": true,
-            "order": 5,
-            "maxLength": 500,
-            "facetable": false,
-            "title": "Website",
-            "example": "https://voorbeeld.nl/suite"
-          },
-          "contactpersoon": {
-            "description": "Contactpersoon voor de suite",
-            "type": "object",
-            "visible": true,
-            "order": 6,
-            "facetable": false,
-            "title": "Contact",
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/contactpersoon"
-          },
-          "applicaties": {
-            "description": "De modules (applicaties) die onderdeel zijn van deze suite",
-            "type": "array",
-            "visible": true,
-            "order": 7,
-            "facetable": false,
-            "title": "Applicaties",
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/module"
-            }
-          }
-        },
-        "archive": [],
-        "source": "internal",
-        "hardValidation": false,
-        "immutable": false,
-        "updated": "2025-11-04T12:00:00+00:00",
-        "created": "2025-11-04T12:00:00+00:00",
-        "maxDepth": 0,
-        "owner": "system",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "groups": null,
-        "authorization": {
-          "create": [
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar",
-            "aanbod-beheerder"
-          ],
-          "read": [
-            "public",
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "gebruik-raadpleger"
-          ],
-          "update": [
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "gebruik-raadpleger",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "software-catalog-admins",
-            "software-catalog-users",
-            "vng-raadpleger"
-          ],
-          "delete": [
-            "aanbod-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar"
-          ]
-        },
-        "deleted": null,
-        "configuration": {
-          "objectNameField": "naam",
-          "objectSummaryField": "beschrijvingKort",
-          "objectDescriptionField": "beschrijvingLang",
-          "objectImageField": "logo",
-          "allowFiles": true,
-          "allowedTags": [
-            "DPIA",
-            "Handleiding"
-          ],
-          "autoPublish": true
-        },
-        "searchable": true
-      },
-      "component": {
-        "uri": null,
-        "slug": "component",
-        "title": "Component",
-        "description": "Een component is een logische groepering van applicaties",
-        "version": "0.1.2",
-        "summary": "",
-        "icon": "ViewModule",
-        "required": [
-          "naam",
-          "beschrijvingKort"
-        ],
-        "properties": {
-          "naam": {
-            "description": "Naam van het component",
-            "type": "string",
-            "required": true,
-            "visible": true,
-            "order": 1,
-            "maxLength": 200,
-            "facetable": false,
-            "title": "Naam",
-            "table": {
-              "default": true
-            },
-            "example": "Bijvoorbeeld: Zaaksysteem Component"
-          },
-          "beschrijvingKort": {
-            "type": "string",
-            "title": "Korte omschrijving",
-            "description": "Korte beschrijving van het component",
-            "facetable": false,
-            "maxLength": 255,
-            "order": 2,
-            "table": {
-              "default": true
-            },
-            "example": "Bijvoorbeeld: Een korte samenvatting van het component"
-          },
-          "beschrijvingLang": {
-            "description": "Uitgebreide beschrijving van het component",
-            "type": "string",
-            "format": "markdown",
-            "visible": true,
-            "order": 3,
-            "maxLength": 5000,
-            "facetable": false,
-            "title": "Uitgebreide omschrijving",
-            "example": "Bijvoorbeeld: Een uitgebreide beschrijving van het component"
-          },
-          "logo": {
-            "description": "URL naar het logo van het component",
-            "type": "string",
-            "format": "url",
-            "visible": true,
-            "order": 4,
-            "maxLength": 500,
-            "facetable": false,
-            "table": {
-              "default": true
-            },
-            "title": "Logo",
-            "example": "https://voorbeeld.nl/logo.png"
-          },
-          "website": {
-            "description": "Website van het component",
-            "type": "string",
-            "format": "url",
-            "visible": true,
-            "order": 5,
-            "maxLength": 500,
-            "facetable": false,
-            "title": "Website",
-            "example": "https://voorbeeld.nl/component"
-          },
-          "contactpersoon": {
-            "description": "Contactpersoon voor het component",
-            "type": "object",
-            "visible": true,
-            "order": 6,
-            "facetable": false,
-            "title": "Contact",
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/contactpersoon"
-          },
-          "modules": {
-            "description": "De applicaties die onderdeel zijn van dit component",
-            "type": "array",
-            "visible": true,
-            "order": 7,
-            "facetable": false,
-            "title": "Applicaties",
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/module"
-            }
-          }
-        },
-        "archive": [],
-        "source": "internal",
-        "hardValidation": false,
-        "immutable": false,
-        "updated": "2025-11-04T12:00:00+00:00",
-        "created": "2025-11-04T12:00:00+00:00",
-        "maxDepth": 0,
-        "owner": "system",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "groups": null,
-        "authorization": {
-          "create": [
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar",
-            "aanbod-beheerder"
-          ],
-          "read": [
-            "public",
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "gebruik-raadpleger"
-          ],
-          "update": [
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "gebruik-raadpleger",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "software-catalog-admins",
-            "software-catalog-users",
-            "vng-raadpleger"
-          ],
-          "delete": [
-            "aanbod-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar"
-          ]
-        },
-        "deleted": null,
-        "configuration": {
-          "objectNameField": "naam",
-          "objectSummaryField": "beschrijvingKort",
-          "objectDescriptionField": "beschrijvingLang",
-          "objectImageField": "logo",
-          "allowFiles": true,
-          "allowedTags": [
-            "DPIA",
-            "Handleiding"
-          ],
-          "autoPublish": true
-        },
-        "searchable": true
-      },
-      "dienst": {
-        "uri": null,
-        "slug": "dienst",
-        "title": "Dienst",
-        "description": "Een specifiek aanbod van een dienst op een of meerdere applicaties door een leverancier",
-        "version": "0.1.3",
-        "summary": "",
-        "icon": "Handshake",
-        "required": [
-          "naam",
-          "aanbieder"
-        ],
-        "properties": {
-          "naam": {
-            "description": "De naam van de dienst",
-            "type": "string",
-            "required": true,
-            "visible": true,
-            "order": 1,
-            "minLength": null,
-            "maxLength": 200,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "table": {
-              "default": true
-            },
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false,
-            "title": "Naam",
-            "example": "Bijvoorbeeld: Implementatie en ondersteuning"
-          },
-          "beschrijvingKort": {
-            "type": "string",
-            "description": "Korte beschrijving van de dienst",
-            "title": "Samenvatting",
-            "facetable": false,
-            "maxLength": 255,
-            "table": {
-              "default": true
-            },
-            "order": 5,
-            "example": "Bijvoorbeeld: Korte beschrijving van de dienst"
-          },
-          "beschrijvingLang": {
-            "description": "Uitgebreide beschrijving van de dienst",
-            "type": "string",
-            "format": "markdown",
-            "visible": true,
-            "order": 6,
-            "facetable": false,
-            "title": "Beschrijving",
-            "maxLength": 5000,
-            "example": "Bijvoorbeeld: Uitgebreide beschrijving van de dienst met alle details"
-          },
-          "website": {
-            "type": "string",
-            "format": "url",
-            "description": "De website waarop meer informatie over dit aanbod te vinden is",
-            "facetable": false,
-            "title": "Website",
-            "order": 4,
-            "visible": true,
-            "maxLength": 500,
-            "example": "https://dienst.voorbeeld.nl"
-          },
-          "status": {
-            "description": "De status van dit aanbod",
-            "type": "string",
-            "default": "Concept",
-            "example": "Bijvoorbeeld: Concept"
-          },
-          "contactpersoon": {
-            "description": "Contactpersoon voor deze dienst",
-            "type": "object",
-            "visible": true,
-            "order": 1,
-            "facetable": false,
-            "title": "Contactpersoon",
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/contactpersoon"
-          },
-          "modules": {
-            "description": "Welke applicaties worden via de dienst aangeboden",
-            "type": "array",
-            "visible": true,
-            "order": 2,
-            "facetable": false,
-            "title": "Applicaties",
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/module"
-            }
-          },
-          "aanbieder": {
-            "description": "De leverende partij die deze dienst beschikbaar stelt",
-            "type": "object",
-            "required": true,
-            "visible": true,
-            "order": 3,
-            "facetable": false,
-            "table": {
-              "default": true
-            },
-            "title": "Aanbieder",
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/organisatie"
-          },
-          "type": {
-            "description": "Het type dienst dat wordt aangeboden",
-            "type": "string",
-            "required": true,
-            "visible": true,
-            "order": 4,
-            "table": {
-              "default": true
-            },
-            "facetable": true,
-            "title": "Soort dienst",
-            "enum": [
-              "Functioneel beheer",
-              "Applicatiebeheer",
-              "Technisch beheer",
-              "Implementatieondersteuning",
-              "Opleidingen",
-              "Licentiereseller"
-            ],
-            "example": "Bijvoorbeeld: Implementatieondersteuning"
-          },
-          "logo": {
-            "description": "URL naar het logo van de dienst",
-            "type": "string",
-            "format": "url",
-            "visible": true,
-            "order": 5,
-            "facetable": false,
-            "title": "Logo",
-            "example": "https://dienst.voorbeeld.nl/logo.png"
-          },
-          "koppelingen": {
-            "description": "Koppelingen die gebruikt worden door deze dienst",
-            "type": "array",
-            "visible": true,
-            "order": 8,
-            "facetable": false,
-            "title": "Koppelingen",
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/koppeling",
-              "inversedBy": "dienst"
-            }
-          }
-        },
-        "archive": [],
-        "source": "internal",
-        "hardValidation": false,
-        "immutable": false,
-        "updated": "2025-07-29T09:35:54+00:00",
-        "created": "2025-05-09T12:14:18+00:00",
-        "maxDepth": 0,
-        "owner": "1",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "groups": null,
-        "authorization": {
-          "create": [
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar",
-            "aanbod-beheerder"
-          ],
-          "read": [
-            "public",
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "gebruik-raadpleger"
-          ],
-          "update": [
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "gebruik-raadpleger",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "software-catalog-admins",
-            "software-catalog-users",
-            "vng-raadpleger"
-          ],
-          "delete": [
-            "aanbod-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar"
-          ]
-        },
-        "deleted": null,
-        "configuration": {
-          "objectNameField": "naam",
-          "objectSummaryField": "beschrijvingKort",
-          "objectDescriptionField": "beschrijvingLang",
-          "objectImageField": "logo",
-          "allowFiles": true,
-          "allowedTags": [
-            "ISO-9001",
-            "ISO-27001",
-            "ISO-16075",
-            "Verklaring van toepasselijkheid"
-          ],
-          "autoPublish": true
-        },
-        "searchable": true
-      },
-      "kwetsbaarheid": {
-        "uri": null,
-        "slug": "kwetsbaarheid",
-        "title": "Kwetsbaarheid",
-        "description": "Schema voor kwetsbaarheden",
-        "version": "1.0.19",
-        "summary": "",
-        "icon": "ShieldAlert",
-        "required": [
-          "naam",
-          "beschrijvingKort",
-          "modules"
-        ],
-        "properties": {
-          "naam": {
-            "description": "Naam van de kwetsbaarheid",
-            "type": "string",
-            "visible": true,
-            "order": 1,
-            "facetable": false,
-            "title": "Naam",
-            "maxLength": 200,
-            "example": "Bijvoorbeeld: SQL Injection"
-          },
-          "beschrijvingKort": {
-            "description": "Korte beschrijving van de kwetsbaarheid",
-            "type": "string",
-            "maxLength": 255,
-            "visible": true,
-            "order": 2,
-            "facetable": false,
-            "title": "Samenvatting",
-            "example": "Bijvoorbeeld: Korte beschrijving van de kwetsbaarheid"
-          },
-          "beschrijvingLang": {
-            "description": "Uitgebreide beschrijving van de kwetsbaarheid",
-            "type": "string",
-            "format": "markdown",
-            "visible": true,
-            "order": 3,
-            "facetable": false,
-            "title": "Beschrijving",
-            "maxLength": 5000,
-            "example": "Bijvoorbeeld: Uitgebreide beschrijving van de kwetsbaarheid"
-          },
-          "cveCode": {
-            "description": "CVE (Common Vulnerabilities and Exposures) identificatiecode",
-            "type": "string",
-            "pattern": "^CVE-\\d{4}-\\d{4,}$",
-            "visible": true,
-            "order": 4,
-            "facetable": false,
-            "title": "CVE Code",
-            "maxLength": 20,
-            "example": "Bijvoorbeeld: CVE-2021-44228"
-          },
-          "cvssScore": {
-            "description": "CVSS (Common Vulnerability Scoring System) score van 0.0 tot 10.0",
-            "type": "number",
-            "minimum": 0,
-            "maximum": 10,
-            "visible": true,
-            "order": 5,
-            "facetable": false,
-            "title": "CVSS Score",
-            "example": "Bijvoorbeeld: 9.8"
-          },
-          "modules": {
-            "description": "De applicaties die door deze kwetsbaarheid getroffen worden",
-            "type": "array",
-            "visible": true,
-            "order": 6,
-            "facetable": false,
-            "title": "Getroffen Applicaties",
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/module",
-              "inversedBy": "kwetsbaarheid"
-            }
-          }
-        },
-        "archive": [],
-        "source": "internal",
-        "hardValidation": true,
-        "immutable": false,
-        "updated": "2025-05-09T12:14:18+00:00",
-        "created": "2025-05-09T12:14:18+00:00",
-        "maxDepth": 0,
-        "owner": "1",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "groups": null,
-        "authorization": {
-          "create": [
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar",
-            "aanbod-beheerder"
-          ],
-          "read": [
-            "public",
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "gebruik-raadpleger"
-          ],
-          "update": [
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "gebruik-raadpleger",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "software-catalog-admins",
-            "software-catalog-users",
-            "vng-raadpleger"
-          ],
-          "delete": [
-            "aanbod-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar"
-          ]
-        },
-        "deleted": null,
-        "configuration": {
-          "objectNameField": "naam",
-          "objectSummaryField": "beschrijvingKort",
-          "objectDescriptionField": "beschrijvingLang",
-          "autoPublish": false
-        },
-        "searchable": true
-      },
-      "contactpersoon": {
-        "uri": null,
-        "slug": "contactpersoon",
-        "title": "Contactpersoon",
-        "description": "Contactgegevens van een persoon",
-        "version": "0.0.25",
-        "summary": "",
-        "icon": "AccountMultiple",
-        "required": [
-          "e-mailadres"
-        ],
-        "properties": {
-          "voornaam": {
-            "type": "string",
-            "description": "Voornaam van de contactpersoon",
-            "facetable": false,
-            "title": "Voornaam",
-            "order": 1,
-            "maxLength": 100,
-            "example": "Bijvoorbeeld: Jan"
-          },
-          "tussenvoegsel": {
-            "type": "string",
-            "description": "Tussenvoegsel van de contactpersoon",
-            "facetable": false,
-            "title": "Tussenvoegsel",
-            "order": 2,
-            "maxLength": 20,
-            "example": "Bijvoorbeeld: van"
-          },
-          "achternaam": {
-            "type": "string",
-            "description": "Achternaam van de contactpersoon",
-            "facetable": false,
-            "title": "Achternaam",
-            "order": 3,
-            "maxLength": 100,
-            "example": "Bijvoorbeeld: Jansen"
-          },
-          "functie": {
-            "description": "Functie van de medewerker",
-            "type": "string",
-            "visible": true,
-            "minLength": null,
-            "maxLength": 100,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false,
-            "title": "Functie",
-            "order": 4,
-            "example": "Bijvoorbeeld: Beheerder"
-          },
-          "organisatie": {
-            "type": "object",
-            "title": "Organisatie",
-            "description": "De organisatie waartoe deze contactpersoon behoort",
-            "visible": false,
-            "hideOnCollection": true,
-            "facetable": false,
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/organisatie",
-            "order": 9
-          },
-          "username": {
-            "description": "Gebruikersnaam van de contactpersoon",
-            "title": "Gebruikersnaam",
-            "type": "string",
-            "visible": false,
-            "hideOnCollection": true,
-            "facetable": false,
-            "order": 10,
-            "minLength": null,
-            "maxLength": 50,
-            "immutable": true,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "telefoonnummer": {
-            "type": "string",
-            "description": "Telefoonnummer van de contactpersoon",
-            "facetable": false,
-            "title": "Telefoonnummer",
-            "order": 5,
-            "example": "Bijvoorbeeld: 06 12345678"
-          },
-          "notificaties": {
-            "type": "array",
-            "title": "Notificaties",
-            "description": "Lijst van notificaties voor deze contactpersoon",
-            "facetable": false,
-            "hideOnCollection": true,
-            "items": {
-              "type": "string",
-              "enum": [
-                "Nieuw in organisatie",
-                "Nieuw buiten de organisatie",
-                "Gewijzigd in de organisatie"
-              ]
-            },
-            "order": 11,
-            "example": "Bijvoorbeeld: ['Nieuw in organisatie', 'Gewijzigd in de organisatie']"
-          },
-          "rollen": {
-            "description": "De rollen die deze contactpersoon heeft",
-            "title": "Rollen",
-            "type": "array",
-            "visible": true,
-            "facetable": false,
-            "order": 7,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "register": "",
-            "writeBack": false,
-            "removeAfterWriteBack": false,
-            "items": {
-              "type": "string"
-            },
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "enum": [
-              "Aanbod-beheerder",
-              "Gebruik-beheerder",
-              "Functioneel-beheerder",
-              "Organisatie-beheerder"
-            ],
-            "example": "Bijvoorbeeld: [\"Aanbod-beheerder\", \"Functioneel-beheerder\"]"
-          },
-          "e-mailadres": {
-            "description": "E-mailadres van de contactpersoon",
-            "title": "E-mailadres",
-            "type": "string",
-            "format": "email",
-            "required": true,
-            "visible": true,
-            "facetable": false,
-            "order": 6,
-            "minLength": null,
-            "maxLength": 320,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "register": "",
-            "writeBack": false,
-            "removeAfterWriteBack": false,
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "example": "Bijvoorbeeld: jan.jansen@organisatie.nl"
-          }
-        },
-        "archive": [],
-        "source": "internal",
-        "hardValidation": false,
-        "immutable": false,
-        "updated": "2025-06-05T11:53:54+00:00",
-        "created": "2025-05-09T12:14:18+00:00",
-        "maxDepth": 0,
-        "owner": "1",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "groups": null,
-        "authorization": {
-          "create": [
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar",
-            "aanbod-beheerder"
-          ],
-          "read": [
-            "public",
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "gebruik-raadpleger"
-          ],
-          "update": [
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "gebruik-raadpleger",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "software-catalog-admins",
-            "software-catalog-users",
-            "vng-raadpleger"
-          ],
-          "delete": [
-            "aanbod-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar"
-          ]
-        },
-        "deleted": null,
-        "configuration": {
-          "objectNameField": "achternaam",
-          "objectDescriptionField": "functie",
-          "autoPublish": true
-        },
-        "searchable": true
-      },
-      "organisatie": {
-        "uri": null,
-        "slug": "organisatie",
-        "title": "Organisatie",
-        "description": "Een organisatie die voorzieningen aanbiedt",
-        "version": "0.1.0",
-        "summary": "",
-        "icon": "OfficeBuildingOutline",
-        "required": [
-          "naam",
-          "type",
-          "website"
-        ],
-        "properties": {
-          "naam": {
-            "description": "Naam van de organisatie",
-            "type": "string",
-            "required": true,
-            "visible": true,
-            "order": 1,
-            "minLength": null,
-            "maxLength": 200,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false,
-            "title": "Naam",
-            "example": "Bijvoorbeeld: VNG Realisatie"
-          },
-          "beschrijvingKort": {
-            "description": "Beschrijving van de leverancier",
-            "type": "string",
-            "visible": true,
-            "order": 1,
-            "facetable": false,
-            "title": "Samenvatting",
-            "maxLength": 255
-          },
-          "beschrijvingLang": {
-            "description": "Overige informatie",
-            "type": "string",
-            "visible": true,
-            "order": 2,
-            "facetable": false,
-            "title": "Beschrijving",
-            "format": "markdown",
-            "maxLength": 5000
-          },
-          "logo": {
-            "description": "Logo van de organisatie",
-            "type": "string",
-            "format": "uri",
-            "visible": true,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false,
-            "title": "Logo",
-            "order": 10
-          },
-          "cbsCode": {
-            "description": "CBS nummer van de organisatie",
-            "type": "number",
-            "visible": true,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false,
-            "title": "CBS Nummer",
-            "order": 3
-          },
-          "contactpersonen": {
-            "description": "De contactpersoon van de organisatie",
-            "type": "array",
-            "visible": true,
-            "order": 4,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "items": {
-              "cascadeDelete": false,
-              "$ref": "#/components/schemas/contactpersoon",
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "inversedBy": "organisatie"
-            },
-            "objectConfiguration": {
-              "handling": null,
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false,
-            "title": "Contactpersonen"
-          },
-          "e-mailadres": {
-            "description": "Het e-mailadres van de contactpersoon of de organisatie",
-            "type": "string",
-            "visible": true,
-            "order": 7,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false,
-            "title": "E-mailadres",
-            "example": "contact@organisatie.nl"
-          },
-          "website": {
-            "description": "URL van de website van de organisatie",
-            "title": "Website",
-            "type": "string",
-            "required": true,
-            "visible": true,
-            "facetable": false,
-            "order": 16,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "example": "https://www.organisatie.nl"
-          },
-          "telefoonnummer": {
-            "description": "Telefoonnummer van de contactpersoon of de organisatie",
-            "title": "Telefoonnummer",
-            "type": "string",
-            "visible": true,
-            "facetable": false,
-            "order": 15,
-            "minLength": null,
-            "maxLength": null,
-            "example": "06 12345678",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "deelnames": {
-            "description": "Deelnames van deze organisatie in andere organisaties",
-            "type": "array",
-            "visible": true,
-            "order": 5,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "items": {
-              "cascadeDelete": false,
-              "$ref": "#/components/schemas/organisatie",
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              }
-            },
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false,
-            "title": "Deelnames"
-          },
-          "deelnemers": {
-            "description": "Deelnemers in deze organisatie",
-            "type": "array",
-            "visible": true,
-            "order": 6,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "items": {
-              "cascadeDelete": false,
-              "$ref": "#/components/schemas/organisatie",
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "inversedBy": "deelnames"
-            },
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false,
-            "title": "Deelnemers",
-            "writeBack": true,
-            "removeAfterWriteBack": false
-          },
-          "type": {
-            "description": "Type van de organisatie (Gemeente, Leverancier, Samenwerking) ",
-            "title": "Organisatie Type",
-            "type": "string",
-            "required": true,
-            "visible": true,
-            "facetable": true,
-            "order": 3,
-            "minLength": null,
-            "maxLength": null,
-            "immutable": true,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "enum": [
-              "Gemeente",
-              "Leverancier",
-              "Samenwerking",
-              "Community"
-            ]
-          },
-          "status": {
-            "description": "Geeft aan of de VNG de organisatie positief beoordeeld heeft voor toegang tot de Softwarecatalogus",
-            "title": "Status",
-            "type": "string",
-            "default": "Concept",
-            "visible": false,
-            "hideOnCollection": true,
-            "facetable": false,
-            "order": 17,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "enum": [
-              "Concept",
-              "Actief",
-              "Deactief"
-            ]
-          },
-          "samenwerkingtype": {
-            "description": "Type samenwerking van de organisatie",
-            "title": "Samenwerkingstype",
-            "type": "string",
-            "visible": false,
-            "hideOnCollection": true,
-            "facetable": true,
-            "order": 14,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "enum": [
-              "Uitvoeringsorganisatie",
-              "Sociaal Domein samenwerking",
-              "Shared Service Center",
-              "samenwerkingtype",
-              "Omgevingsdienst",
-              "ICT (bijvoorbeeld Shared Service Center)",
-              "Gemeentelijke herindeling (gepland)",
-              "Gemeenschappelijke Regeling (samenwerking meerdere domeinen)",
-              "Gemeenschappelijke Regeling",
-              "DVO",
-              "Centrumgemeenteregeling",
-              "Belastingsamenwerking",
-              "Bedrijfsvoeringsorganisatie",
-              "Archiefdienst (regionaal)",
-              "Ambtelijke fusie"
-            ]
-          }
-        },
-        "archive": [],
-        "source": "internal",
-        "hardValidation": false,
-        "immutable": false,
-        "updated": "2025-07-29T09:35:54+00:00",
-        "created": "2025-05-09T12:14:18+00:00",
-        "maxDepth": 0,
-        "owner": "1",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "groups": null,
-        "authorization": {
-          "create": [
-            "public",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar",
-            "aanbod-beheerder"
-          ],
-          "read": [
-            "public",
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "gebruik-raadpleger"
-          ],
-          "update": [
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "gebruik-raadpleger",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "software-catalog-admins",
-            "software-catalog-users",
-            "vng-raadpleger"
-          ],
-          "delete": [
-            "aanbod-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar"
-          ]
-        },
-        "deleted": null,
-        "configuration": {
-          "objectNameField": "naam",
-          "objectSummaryField": "beschrijvingKort",
-          "objectDescriptionField": "beschrijvingLang",
-          "objectImageField": "logo",
-          "allowFiles": true,
-          "allowedTags": [
-            "Verklaring betaling sociale premies",
-            "Verklaring betaling belastingen",
-            "Bestuurdersverklaring",
-            "Uittreksel KvK",
-            "BTW-nummer bevestiging",
-            "Compliance verklaring",
-            "Jaarrekening",
-            "ISO-certificaten",
-            "Privacy verklaring",
-            "AVG compliance document",
-            "ESPD (Europees aanbestedingsdocument)",
-            "Integriteitsverklaring",
-            "Financiële capaciteitsverklaring",
-            "Technische capaciteitsverklaring",
-            "Kwaliteitscertificaten",
-            "Milieucertificaten",
-            "Verzekeringsbewijs",
-            "Beroepsaansprakelijkheidsverzekering",
-            "Referentieprojecten",
-            "VCA-certificaat",
-            "BRL-certificaten",
-            "CE-markering documenten",
-            "Aanbestedingsdocumentatie"
-          ],
-          "autoPublish": false
-        },
-        "searchable": true
-      },
-      "gebruik": {
-        "uri": null,
-        "slug": "gebruik",
-        "title": "Gebruik",
-        "description": "Het gebruik van applicaties, diensten en koppelingen door afnemers",
-        "version": "1.1.3",
-        "summary": "",
-        "icon": "Usage",
-        "required": [
-          "afnemer",
-          "status"
-        ],
-        "properties": {
-          "afnemer": {
-            "type": "object",
-            "title": "Afnemer",
-            "description": "De organisatie die afnemer is van de applicatie",
-            "facetable": false,
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/organisatie",
-            "required": true,
-            "order": 11
-          },
-          "contactpersoon": {
-            "type": "object",
-            "description": "De contactpersoon voor dit gebruik",
-            "facetable": false,
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/contactpersoon",
-            "title": "Contactpersoon",
-            "order": 3
-          },
-          "deelnemers": {
-            "description": "De organisaties die deelnemen aan dit gebruik (voor samenwerkingen)",
-            "type": "array",
-            "visible": true,
-            "facetable": false,
-            "title": "Deelnemers",
-            "order": 6,
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/organisatie"
-            }
-          },
-          "startDatumVerwerving": {
-            "description": "De start datum voor het \"Verwerving\" status",
-            "type": "string",
-            "format": "date",
-            "visible": true,
-            "order": 14,
-            "facetable": false,
-            "title": "Startdatum Verwerving",
-            "example": "Bijvoorbeeld: 2025-01-01"
-          },
-          "startDatumGepland": {
-            "description": "De start datum voor het \"Gepland\" status",
-            "type": "string",
-            "format": "date",
-            "visible": true,
-            "order": 16,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false,
-            "title": "Geplande Startdatum",
-            "example": "Bijvoorbeeld: 2025-02-01"
-          },
-          "startDatumInProductie": {
-            "description": "De start datum voor het \"actief\" status",
-            "type": "string",
-            "format": "date",
-            "visible": true,
-            "order": 14,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false,
-            "title": "Startdatum In Productie",
-            "example": "Bijvoorbeeld: 2025-03-01"
-          },
-          "startDatumUitTeFaseren": {
-            "description": "De start datum voor het \"Beëindigd\" status",
-            "type": "string",
-            "format": "date",
-            "visible": true,
-            "order": 15,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false,
-            "title": "Startdatum Uit Te Faseren",
-            "example": "Bijvoorbeeld: 2025-12-31"
-          },
-          "startDatumUitGefaseerd": {
-            "description": "De start datum voor het \"Uit gefaseerd\" status",
-            "type": "string",
-            "format": "date",
-            "visible": true,
-            "order": 15,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false,
-            "title": "Startdatum Uit Gefaseerd",
-            "example": "Bijvoorbeeld: 2025-12-31"
-          },
-          "status": {
-            "description": "De status van het gebruik",
-            "type": "string",
-            "default": "Concept",
-            "required": true,
-            "visible": true,
-            "order": 17,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "enum": [
-              "Verwerving",
-              "Gepland",
-              "In productie",
-              "Uit te faseren",
-              "Uitgefaseerd"
-            ],
-            "facetable": false,
-            "title": "Status",
-            "example": "Bijvoorbeeld: Gepland"
-          },
-          "interneAantekening": {
-            "description": "Aanvullende interne informatie over het gebruik van de voorziening",
-            "type": "string",
-            "visible": true,
-            "hideOnCollection": true,
-            "order": 10,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false,
-            "title": "Interne Aantekening",
-            "example": "Bijvoorbeeld: Interne notitie over het gebruik"
-          },
-          "module": {
-            "description": "De specifieke applicatie die gebruikt wordt",
-            "type": "object",
-            "visible": true,
-            "order": 20,
-            "facetable": false,
-            "title": "Applicatie",
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/module",
-            "inversedBy": "gebruik",
-            "table": {
-              "default": true
-            }
-          },
-          "moduleVersie": {
-            "description": "De specifieke versie van de applicatie die gebruikt wordt",
-            "type": "object",
-            "visible": true,
-            "order": 21,
-            "facetable": false,
-            "title": "Applicatie Versie",
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/moduleVersie",
-            "inversedBy": "gebruik",
-            "table": {
-              "default": true
-            }
-          },
-          "gebruiktVoorReferentiecomponenten": {
-            "description": "GEMMA referentiecomponenten waarvoor dit product wordt gebruikt",
-            "type": "array",
-            "visible": true,
-            "order": 22,
-            "facetable": true,
-            "title": "Referentiecomponenten",
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object",
-                "queryParams": "gemmaType=referentiecomponent&_extend=aanbevolenStandaarden,verplichteStandaarden"
-              },
-              "$ref": "#/components/schemas/element"
-            },
-            "table": {
-              "default": true
-            }
-          },
-          "amefElements": {
-            "description": "Ids van AMEF elementen waarvoor dit product wordt gebruikt",
-            "type": "array",
-            "visible": true,
-            "order": 22,
-            "facetable": false,
-            "title": "Amef elementen",
-            "items": {
-              "type": "string"
-            }
-          },
-          "koppelingen": {
-            "description": "De koppelingen die gebruikt worden binnen dit productgebruik",
-            "type": "array",
-            "visible": true,
-            "order": 24,
-            "facetable": false,
-            "title": "Koppelingen",
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/koppeling"
-            }
-          },
-          "diensten": {
-            "description": "De diensten die onderdeel zijn van dit gebruik",
-            "type": "array",
-            "visible": true,
-            "order": 25,
-            "facetable": false,
-            "title": "Diensten",
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/dienst"
-            }
-          },
-          "cloudDienstverleningsmodel": {
-            "type": "array",
-            "format": "",
-            "title": "Hosting",
-            "description": "Het cloud dienstverleningsmodel voor de applicatie",
-            "facetable": true,
-            "items": {
-              "type": "string",
-              "enum": [
-                "On-premises (self-managed)",
-                "IaaS",
-                "PaaS",
-                "SaaS"
-              ]
-            },
-            "example": "SaaS",
-            "table": {
-              "default": true
-            }
-          }
-        },
-        "archive": [],
-        "source": "internal",
-        "hardValidation": false,
-        "immutable": false,
-        "updated": "2025-07-29T09:35:54+00:00",
-        "created": "2025-05-09T12:14:18+00:00",
-        "maxDepth": 0,
-        "owner": "1",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "groups": null,
-        "authorization": {
-          "create": [
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar",
-            "aanbod-beheerder"
-          ],
-          "read": [
-            "public",
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "gebruik-raadpleger"
-          ],
-          "update": [
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "gebruik-raadpleger",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "software-catalog-admins",
-            "software-catalog-users",
-            "vng-raadpleger"
-          ],
-          "delete": [
-            "aanbod-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar"
-          ]
-        },
-        "deleted": null,
-        "configuration": {
-          "objectNameField": "afnemer",
-          "objectDescriptionField": "module",
-          "allowFiles": true,
-          "allowedTags": [
-            "DPIA",
-            "Contract",
-            "Verwerkingsovereenkomst"
-          ],
-          "autoPublish": false
-        },
-        "searchable": true
-      },
-      "contract": {
-        "uri": null,
-        "slug": "contract",
-        "title": "Contract",
-        "description": "Een formele overeenkomst voor het inzetten van een Dienst op een Gebruik",
-        "version": "0.0.11",
-        "summary": "",
-        "icon": "FileDocumentEdit",
-        "required": [
-          "dienst",
-          "gebruik",
-          "startDatum",
-          "contractNummer",
-          "contractType",
-          "status"
-        ],
-        "properties": {
-          "dienst": {
-            "description": "De dienst waarop dit contract betrekking heeft",
-            "type": "object",
-            "facetable": false,
-            "required": true,
-            "title": "Dienst",
-            "order": 12,
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/dienst"
-          },
-          "gebruik": {
-            "description": "Het gebruik van de voorziening waarop dit contract betrekking heeft",
-            "type": "object",
-            "facetable": false,
-            "required": true,
-            "title": "Gebruik",
-            "order": 13,
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/gebruik"
-          },
-          "startDatum": {
-            "type": "string",
-            "format": "date",
-            "description": "De startdatum van het contract",
-            "facetable": false,
-            "required": true,
-            "title": "Startdatum",
-            "order": 10,
-            "example": "Bijvoorbeeld: 2025-01-01"
-          },
-          "eindDatum": {
-            "type": "string",
-            "format": "date",
-            "description": "De einddatum van het contract (indien van toepassing)",
-            "facetable": false,
-            "title": "Einddatum",
-            "order": 6,
-            "example": "Bijvoorbeeld: 2025-12-31"
-          },
-          "contractNummer": {
-            "type": "string",
-            "description": "Het referentienummer van het contract",
-            "facetable": false,
-            "required": true,
-            "title": "Contract Nummer",
-            "order": 3,
-            "example": "Bijvoorbeeld: CON-2025-001"
-          },
-          "contractType": {
-            "type": "string",
-            "enum": [
-              "SLA",
-              "Licentie",
-              "Onderhoud"
-            ],
-            "description": "Het type contract",
-            "facetable": false,
-            "required": true,
-            "title": "Contract Type",
-            "order": 4,
-            "example": "Bijvoorbeeld: SLA"
-          },
-          "kosten": {
-            "type": "number",
-            "description": "De kosten verbonden aan het contract",
-            "facetable": false,
-            "title": "Kosten",
-            "order": 7,
-            "example": "Bijvoorbeeld: 1000.00"
-          },
-          "kostenPeriode": {
-            "type": "string",
-            "enum": [
-              "Maandelijks",
-              "Jaarlijks",
-              "Eenmalig"
-            ],
-            "description": "De periode waarop de kosten betrekking hebben",
-            "facetable": false,
-            "title": "Kosten Periode",
-            "order": 8,
-            "example": "Bijvoorbeeld: Jaarlijks"
-          },
-          "contactpersoonAanbieder": {
-            "type": "object",
-            "properties": {
-              "naam": {
-                "type": "string"
-              },
-              "email": {
-                "type": "string"
-              }
-            },
-            "description": "De contactpersoon bij de aanbieder",
-            "facetable": false,
-            "objectConfiguration": {
-              "handling": "nested-object"
-            },
-            "title": "Contactpersoon Aanbieder",
-            "order": 1
-          },
-          "contactpersoonGebruiker": {
-            "type": "object",
-            "properties": {
-              "naam": {
-                "type": "string"
-              },
-              "email": {
-                "type": "string"
-              }
-            },
-            "description": "De contactpersoon bij de gebruiker",
-            "facetable": false,
-            "objectConfiguration": {
-              "handling": "nested-object"
-            },
-            "title": "Contactpersoon Gebruiker",
-            "order": 2
-          },
-          "documentReferentie": {
-            "type": "string",
-            "description": "Referentie naar het contractdocument",
-            "facetable": false,
-            "title": "Document Referentie",
-            "order": 5,
-            "example": "Bijvoorbeeld: CON-2025-001.pdf"
-          },
-          "status": {
-            "type": "string",
-            "enum": [
-              "Actief",
-              "Verlopen",
-              "In onderhandeling"
-            ],
-            "description": "De status van het contract",
-            "facetable": false,
-            "required": true,
-            "title": "Status",
-            "order": 11,
-            "example": "Bijvoorbeeld: Actief"
-          },
-          "opmerkingen": {
-            "type": "string",
-            "description": "Aanvullende informatie over het contract",
-            "facetable": false,
-            "title": "Remarks",
-            "order": 9,
-            "example": "Bijvoorbeeld: Aanvullende opmerkingen over het contract"
-          }
-        },
-        "archive": [],
-        "source": "internal",
-        "hardValidation": false,
-        "immutable": false,
-        "updated": "2025-05-09T12:14:18+00:00",
-        "created": "2025-05-09T12:14:18+00:00",
-        "maxDepth": 0,
-        "owner": "1",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "groups": null,
-        "authorization": {
-          "create": [
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar",
-            "aanbod-beheerder"
-          ],
-          "read": [
-            "public",
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "gebruik-raadpleger"
-          ],
-          "update": [
-            "aanbod-beheerder",
-            "ambtenaar",
-            "functioneel-beheerder",
-            "gebruik-beheerder",
-            "gebruik-raadpleger",
-            "organisatie-beheerder",
-            "organisaties-beheerder",
-            "software-catalog-admins",
-            "software-catalog-users",
-            "vng-raadpleger"
-          ],
-          "delete": [
-            "aanbod-beheerder",
-            "vng-raadpleger",
-            "software-catalog-users",
-            "software-catalog-admins",
-            "organisaties-beheerder",
-            "organisatie-beheerder",
-            "gebruik-raadpleger",
-            "gebruik-beheerder",
-            "functioneel-beheerder",
-            "ambtenaar"
-          ]
-        },
-        "deleted": null,
-        "configuration": {
-          "objectNameField": "contractNummer",
-          "objectDescriptionField": "contractType",
-          "autoPublish": false
-        },
-        "searchable": true
-      },
-      "koppeling": {
-        "uri": null,
-        "slug": "koppeling",
-        "title": "Koppeling",
-        "description": "Schema voor koppelingen tussen applicaties en systemen. Er moet óf ApplicatieB óf buitengemeentelijkVoorziening gevuld zijn.",
-        "version": "0.0.12",
-        "summary": "",
-        "icon": "Link",
-        "required": [],
-        "properties": {
-          "naam": {
-            "description": "Naam van de koppeling",
-            "type": "string",
-            "order": 1,
-            "facetable": false,
-            "title": "Naam",
-            "table": {
-              "default": true
-            },
-            "example": "Bijvoorbeeld: API Koppeling"
-          },
-          "beschrijvingKort": {
-            "description": "Korte beschrijving van de koppeling",
-            "type": "string",
-            "table": {
-              "default": true
-            },
-            "order": 5,
-            "facetable": false,
-            "title": "Samenvatting",
-            "example": "Bijvoorbeeld: Korte beschrijving van de koppeling"
-          },
-          "beschrijvingLang": {
-            "description": "Uitgebreide beschrijving van de koppeling",
-            "type": "string",
-            "format": "markdown",
-            "order": 6,
-            "facetable": false,
-            "title": "Beschrijving",
-            "example": "Bijvoorbeeld: Uitgebreide beschrijving van de koppeling"
-          },
-          "type": {
-            "description": "Het type koppeling, bijvoorbeeld 'bestandsoverdracht', 'digikoppeling', of 'api'.",
-            "type": "string",
-            "order": 1,
-            "facetable": true,
-            "title": "Type",
-            "enum": [
-              "n.v.t.",
-              "bestandsoverdracht",
-              "digikoppeling",
-              "message que",
-              "upload naar portaal",
-              "webservices",
-              "api"
-            ],
-            "example": "Bijvoorbeeld: api"
-          },
-          "status": {
-            "description": "De status van de koppeling",
-            "type": "string",
-            "order": 3,
-            "facetable": false,
-            "title": "Status",
-            "table": {
-              "default": true
-            },
-            "enum": [
-              "in ontwikkeling",
-              "in gebruik",
-              "einde ondersteuning",
-              "teruggetrokken"
-            ]
-          },
-          "datumInOntwikkeling": {
-            "description": "Startdatum van de ontwikkelingsfase",
-            "type": "string",
-            "format": "date",
-            "order": 4,
-            "facetable": false,
-            "title": "Datum In Ontwikkeling",
-            "example": "Bijvoorbeeld: 2025-01-01"
-          },
-          "datumInGebruik": {
-            "description": "Startdatum van gebruik",
-            "type": "string",
-            "format": "date",
-            "order": 5,
-            "facetable": false,
-            "title": "Datum In Gebruik"
-          },
-          "datumEindeOndersteuning": {
-            "description": "Startdatum einde ondersteuning",
-            "type": "string",
-            "format": "date",
-            "order": 6,
-            "facetable": false,
-            "title": "Datum Einde Ondersteuning"
-          },
-          "datumTeruggetrokken": {
-            "description": "Datum waarop de koppeling teruggetrokken is",
-            "type": "string",
-            "format": "date",
-            "order": 7,
-            "facetable": false,
-            "title": "Datum Teruggetrokken"
-          },
-          "gegevensuitwisselingRichting": {
-            "description": "De richting van de gegevensuitwisseling",
-            "type": "string",
-            "order": 8,
-            "title": "Gegevensuitwisseling Richting",
-            "facetable": false,
-            "enum": [
-              "AnaarB",
-              "BnaarA",
-              "bi-directioneel"
-            ]
-          },
-          "moduleA": {
-            "description": "De applicatie waarvan de gegevens uitgewisseld worden",
-            "type": "object",
-            "order": 9,
-            "facetable": false,
-            "table": {
-              "default": true
-            },
-            "title": "Applicatie A",
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/module",
-            "inversedBy": "koppeling"
-          },
-          "moduleB": {
-            "description": "De applicatie waarnaar de gegevens uitgewisseld worden",
-            "type": "object",
-            "items": {
-              "oneOf": [
-                {
-                  "objectConfiguration": {
-                    "handling": "related-object"
-                  },
-                  "$ref": "#/components/schemas/module"
-                },
-                {
-                  "objectConfiguration": {
-                    "handling": "related-object"
-                  },
-                  "$ref": "#/components/schemas/element"
-                }
-              ]
-            },
-            "order": 10,
-            "facetable": false,
-            "table": {
-              "default": true
-            },
-            "title": "Applicatie B"
-          },
-          "buitengemeentelijkVoorziening": {
-            "description": "Buitengemeentelijke voorziening waarmee gekoppeld wordt",
-            "type": "object",
-            "order": 11,
-            "facetable": false,
-            "title": "Buitengemeentelijke Voorziening",
-            "objectConfiguration": {
-              "handling": "related-object",
-              "queryParams": "gemmaType=Buitengemeentenlijke voorziening"
-            },
-            "$ref": "#/components/schemas/element"
-          },
-          "standaardversies": {
-            "description": "Standaardversies die door deze koppeling geïmplementeerd worden",
-            "type": "array",
-            "order": 12,
-            "facetable": false,
-            "title": "Standaard Versies",
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object",
-                "queryParams": "gemmaType=standaardversie"
-              },
-              "$ref": "#/components/schemas/element"
-            }
-          },
-          "gerealiseerdMetIntermediairModule": {
-            "description": "Intermediaire applicatie die wordt gebruikt voor de realisatie van deze koppeling",
-            "type": "object",
-            "order": 13,
-            "facetable": false,
-            "title": "Gerealiseerd Met Intermediair Applicatie",
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/module",
-            "inversedBy": "koppeling"
-          },
-          "aanbieder": {
-            "description": "De aanbieder van deze koppeling",
-            "type": "object",
-            "visible": true,
-            "order": 14,
-            "table": {
-              "default": true
-            },
-            "facetable": false,
-            "title": "Aanbieder",
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/organisatie"
-          },
-          "dienst": {
-            "description": "De dienst die deze koppeling gebruikt",
-            "type": "object",
-            "visible": true,
-            "order": 15,
-            "facetable": false,
-            "title": "Dienst",
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/dienst",
-            "inversedBy": "koppelingen"
-          }
-        },
-        "archive": [],
-        "source": "",
-        "hardValidation": false,
-        "updated": "2025-08-08T07:11:40+00:00",
-        "created": "2025-08-08T07:11:40+00:00",
-        "maxDepth": 0,
-        "owner": "system",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "groups": null,
-        "authorization": null,
-        "deleted": null,
-        "configuration": {
-          "objectNameField": "type",
-          "objectDescriptionField": "beschrijvingKort",
-          "autoPublish": false
-        },
-        "searchable": true
-      },
-      "beoordeeling": {
-        "uri": null,
-        "slug": "beoordeeling",
-        "title": "Beoordeeling",
-        "description": "Schema voor beoordelingen en waarderingen van applicaties en diensten",
-        "version": "0.1.2",
-        "summary": "",
-        "icon": "Star",
-        "required": [
-          "naam",
-          "waardering"
-        ],
-        "properties": {
-          "naam": {
-            "description": "Naam van de beoordeling",
-            "type": "string",
-            "visible": true,
-            "required": true,
-            "facetable": false,
-            "title": "Naam",
-            "order": 1
-          },
-          "beschrijvingKort": {
-            "description": "Korte beschrijving van de beoordeling",
-            "type": "string",
-            "maxLength": 255,
-            "visible": true,
-            "facetable": false,
-            "title": "Samenvatting",
-            "order": 2
-          },
-          "beschrijvingLang": {
-            "description": "Uitgebreide beschrijving van de beoordeling",
-            "type": "string",
-            "format": "markdown",
-            "visible": true,
-            "facetable": false,
-            "title": "Beschrijving",
-            "order": 3
-          },
-          "waardering": {
-            "description": "Waardering van 1 tot en met 10",
-            "type": "integer",
-            "minimum": 1,
-            "maximum": 10,
-            "visible": true,
-            "required": true,
-            "facetable": false,
-            "title": "Waardering",
-            "order": 4
-          },
-          "modules": {
-            "description": "Optioneel: specifieke applicaties die beoordeeld worden",
-            "type": "array",
-            "visible": true,
-            "facetable": false,
-            "title": "Applicaties",
-            "order": 6,
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/module",
-              "inversedBy": "beoordeeling"
-            }
-          },
-          "diensten": {
-            "description": "Optioneel: specifieke diensten die beoordeeld worden",
-            "type": "array",
-            "visible": true,
-            "facetable": false,
-            "title": "Diensten",
-            "order": 7,
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/dienst"
-            }
-          },
-          "koppelingen": {
-            "description": "Optioneel: specifieke koppelingen die beoordeeld worden",
-            "type": "array",
-            "visible": true,
-            "facetable": false,
-            "title": "Koppelingen",
-            "order": 8,
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/koppeling"
-            }
-          },
-          "gebruik": {
-            "description": "Optioneel: het specifieke gebruik dat beoordeeld wordt",
-            "type": "object",
-            "visible": true,
-            "facetable": false,
-            "title": "Gebruik",
-            "order": 9,
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/gebruik"
-          }
-        },
-        "archive": [],
-        "source": "internal",
-        "hardValidation": false,
-        "immutable": false,
-        "updated": "2025-05-12T20:01:42+00:00",
-        "created": "2025-05-12T19:58:51+00:00",
-        "maxDepth": 0,
-        "owner": "system",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "groups": null,
-        "authorization": null,
-        "deleted": null,
-        "configuration": {
-          "objectNameField": "naam",
-          "objectSummaryField": "beschrijvingKort",
-          "objectDescriptionField": "beschrijvingLang",
-          "autoPublish": false
-        },
-        "searchable": true
-      },
-      "element": {
-        "slug": "element",
-        "title": "Element",
-        "description": "AMEF Element - Architectuur elementen uit het ArchiMate model",
-        "version": "0.0.9",
-        "summary": "",
-        "icon": "Cube",
-        "required": [
-          "identifier",
-          "type",
-          "properties"
-        ],
-        "properties": {
-          "identifier": {
-            "description": "De identifier van dit Element",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "id-009fa62f25844aa3a87d252bf2b6bb0c",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "type": {
-            "description": "Het type van dit Element",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "Capability",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": true
-          },
-          "name": {
-            "description": "De naam van dit Element",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "Publiceren en gebruiken van informatie over datadiensten",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false
-          },
-          "name-lang": {
-            "description": "De name-language van dit Element",
-            "type": "string",
-            "minLength": 2,
-            "maxLength": 2,
-            "example": "nl",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false
-          },
-          "documentation": {
-            "description": "De documentation van dit Element",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "Dienstenafnemers moeten in online catalogi kunnen opvragen welke diensten, met welke kenmerken, door dienstenaanbieder worden aangeboden. \\nOnder andere ontwikkelaars hebben baat bij informatie over beschikbare diensten en de vereisten voor het gebruik van de dienst (bijv. specificatie van een dienst conform de OAS-standaard).",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false
-          },
-          "documentation-lang": {
-            "description": "De documentation-language van dit Element",
-            "type": "string",
-            "minLength": 2,
-            "maxLength": 2,
-            "example": "nl",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false
-          },
-          "properties": {
-            "description": "De properties van dit Element",
-            "type": "array",
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "items": {
-              "cascadeDelete": true,
-              "$ref": "#/components/schemas/property",
-              "type": "object"
-            },
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false
-          },
-          "gemmaType": {
-            "description": "Het gemma type van dit Element",
-            "type": "string",
-            "facetable": false,
-            "order": 10
-          },
-          "gemmaThema": {
-            "description": "Het gemma thema van dit Element",
-            "type": "string",
-            "facetable": false,
-            "order": 10
-          },
-          "gemmaUrl": {
-            "description": "De gemma url van dit Element",
-            "type": "string",
-            "facetable": false,
-            "order": 10
-          }
-        },
-        "archive": [],
-        "source": "",
-        "hardValidation": false,
-        "updated": "2025-04-01T12:16:33+00:00",
-        "created": "2025-03-03T13:56:42+00:00",
-        "maxDepth": 4,
-        "owner": null,
-        "application": null,
-        "organisation": null,
-        "authorization": null,
-        "deleted": null,
-        "configuration": {
-          "objectNameField": "name",
-          "objectSummaryField": "summary",
-          "autoPublish": false,
-          "searchable": true
-        },
-        "searchable": true
-      },
-      "view": {
-        "slug": "view",
-        "title": "View",
-        "description": "AMEF View - Architectuur views en diagrammen uit het ArchiMate model",
-        "version": "0.0.7",
-        "summary": "",
-        "icon": "Eye",
-        "required": [
-          "identifier",
-          "type",
-          "name",
-          "properties",
-          "nodes",
-          "connections"
-        ],
-        "properties": {
-          "identifier": {
-            "description": "De identifier van deze View",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "id-a6ee6077d3094afa91fc6ea92a9a2a40",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "type": {
-            "description": "De type van deze View",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "Diagram",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": true
-          },
-          "viewpoint": {
-            "description": "De viewpoint van deze View",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "Application Structure",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "name": {
-            "description": "De name van deze View",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "LV01 BGT basisregistratie en SVB view",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": false
-          },
-          "name-lang": {
-            "description": "De name-language van deze View",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "nl",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "documentation": {
-            "description": "De documentation van deze View",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "Toont de referentiecomponenten ter ondersteuning van applicatieservices voor publieksdiensten",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "documentation-lang": {
-            "description": "De documentation-language van deze View",
-            "type": "string",
-            "minLength": 2,
-            "maxLength": 2,
-            "example": "nl",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "properties": {
-            "description": "De properties van deze View",
-            "type": "array",
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "items": {
-              "cascadeDelete": true,
-              "$ref": "#/components/schemas/property",
-              "type": "object"
-            },
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "nodes": {
-            "description": "De nodes van deze View",
-            "type": "array",
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "items": {
-              "cascadeDelete": true,
-              "type": "object"
-            },
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "connections": {
-            "description": "De connections van deze View",
-            "type": "array",
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "items": {
-              "cascadeDelete": true,
-              "type": "object"
-            },
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          }
-        },
-        "archive": [],
-        "source": "",
-        "hardValidation": false,
-        "updated": "2025-03-25T16:30:49+00:00",
-        "created": "2025-03-03T13:56:48+00:00",
-        "maxDepth": 0,
-        "owner": null,
-        "application": null,
-        "organisation": null,
-        "authorization": null,
-        "deleted": null,
-        "configuration": {
-          "autoPublish": false
-        },
-        "searchable": true
-      },
-      "model": {
-        "slug": "model",
-        "title": "Model",
-        "description": "AMEF Model - Volledig ArchiMate model met alle elementen, relaties en views",
-        "version": "0.0.43",
-        "summary": "",
-        "icon": "Database",
-        "required": [
-          "xmlns",
-          "xsi",
-          "schemaLocation",
-          "identifier",
-          "name",
-          "name-lang",
-          "version",
-          "documentation",
-          "documentation-lang",
-          "properties",
-          "elements",
-          "relationships",
-          "organizations",
-          "propertyDefinitions",
-          "views"
-        ],
-        "properties": {
-          "xmlns": {
-            "description": "De xmlns van dit GEMMA Model",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "http://www.opengroup.org/xsd/archimate/3.0/",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "xsi": {
-            "description": "De xsi van dit GEMMA Model",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "http://www.w3.org/2001/XMLSchema-instance",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "schemaLocation": {
-            "description": "De schemaLocation van dit GEMMA Model",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "http://www.opengroup.org/xsd/archimate/3.0/ http://www.opengroup.org/xsd/archimate/3.1/archimate3_Diagram.xsd",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "identifier": {
-            "description": "De identifier van dit GEMMA Model",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "id-b58b6b03-a59d-472b-bd87-88ba77ded4e6",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "name": {
-            "description": "De name van dit GEMMA Model",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "GEMMA release (test)",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "name-lang": {
-            "description": "De name-language van dit GEMMA Model",
-            "type": "string",
-            "minLength": 2,
-            "maxLength": 2,
-            "example": "nl",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "version": {
-            "description": "De version van dit GEMMA Model",
-            "type": "string",
-            "minLength": 3,
-            "maxLength": null,
-            "example": "3.0",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "documentation": {
-            "description": "De documentation van dit GEMMA Model",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "De GEMeentelijk Model Architectuur (GEMMA) bevat een blauwdruk van de gemeente en haar informatievoorziening. De GEMMA kan worden gebruikt als basis voor de projectmodellen",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "documentation-lang": {
-            "description": "De documentation-language van dit GEMMA Model",
-            "type": "string",
-            "minLength": 2,
-            "maxLength": 2,
-            "example": "nl",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "properties": {
-            "description": "De properties van dit GEMMA Model",
-            "type": "array",
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": 1,
-            "maxItems": null,
-            "$ref": "",
-            "items": {
-              "cascadeDelete": true,
-              "$ref": "#/components/schemas/property",
-              "type": "object"
-            },
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "elements": {
-            "description": "De elements van dit GEMMA Model",
-            "type": "array",
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": 1,
-            "maxItems": null,
-            "$ref": "",
-            "items": {
-              "cascadeDelete": true,
-              "$ref": "#/components/schemas/element",
-              "type": "object"
-            },
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "relationships": {
-            "description": "De relationships van dit GEMMA Model",
-            "type": "array",
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": 1,
-            "maxItems": null,
-            "$ref": "",
-            "items": {
-              "cascadeDelete": true,
-              "$ref": "#/components/schemas/relation",
-              "type": "object"
-            },
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "organizations": {
-            "description": "De organizations van dit GEMMA Model",
-            "type": "array",
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": 1,
-            "maxItems": null,
-            "$ref": "",
-            "items": {
-              "cascadeDelete": true,
-              "$ref": "#/components/schemas/organization",
-              "type": "object"
-            },
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "propertyDefinitions": {
-            "description": "De propertyDefinitions van dit GEMMA Model",
-            "type": "array",
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": 1,
-            "maxItems": null,
-            "$ref": "",
-            "items": {
-              "cascadeDelete": true,
-              "$ref": "#/components/schemas/property-definition",
-              "type": "object"
-            },
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "views": {
-            "description": "De views van dit GEMMA Model",
-            "type": "array",
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": 1,
-            "maxItems": null,
-            "$ref": "",
-            "items": {
-              "cascadeDelete": true,
-              "$ref": "#/components/schemas/view",
-              "type": "object"
-            },
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          }
-        },
-        "archive": [],
-        "source": "",
-        "hardValidation": false,
-        "updated": "2025-04-01T15:12:59+00:00",
-        "created": "2025-03-03T13:57:16+00:00",
-        "maxDepth": 4,
-        "owner": null,
-        "application": null,
-        "organisation": null,
-        "authorization": null,
-        "deleted": null,
-        "configuration": {
-          "autoPublish": false
-        },
-        "searchable": true
-      },
-      "organization": {
-        "slug": "organization",
-        "title": "Organization",
-        "description": "AMEF Organization - Organisatie structuren uit het ArchiMate model",
-        "version": "0.0.7",
-        "summary": "",
-        "icon": "Building",
-        "required": [],
-        "properties": {
-          "identifierRef": {
-            "description": "De identifierRef van deze Organization",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "id-009fa62f25844aa3a87d252bf2b6bb0c",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "label": {
-            "description": "De label van deze Organization",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "Strategy",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "label-lang": {
-            "description": "De label-language van deze Organization",
-            "type": "string",
-            "minLength": 2,
-            "maxLength": 2,
-            "example": "nl",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "documentation": {
-            "description": "De documentation van deze Organization",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "Het Ondernemingsdossier stelt een ondernemer in staat om bepaalde informatie uit de bedrijfsvoering eenmalig vast te leggen en meerdere keren beschikbaar te stellen aan overheden zoals toezichthouders en vergunningverleners",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "documentation-lang": {
-            "description": "De documentation-language van deze Organization",
-            "type": "string",
-            "minLength": 2,
-            "maxLength": 2,
-            "example": "nl",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "item": {
-            "description": "De items (Organizations) van deze Organization",
-            "type": "array",
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "items": {
-              "cascadeDelete": true,
-              "$ref": "#/components/schemas/organization",
-              "type": "object"
-            },
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          }
-        },
-        "archive": [],
-        "source": "",
-        "hardValidation": false,
-        "updated": "2025-04-03T09:28:37+00:00",
-        "created": "2025-03-03T13:56:55+00:00",
-        "maxDepth": 4,
-        "owner": null,
-        "application": null,
-        "organisation": null,
-        "authorization": null,
-        "deleted": null,
-        "configuration": {
-          "autoPublish": false
-        },
-        "searchable": true
-      },
-      "property-definition": {
-        "slug": "property-definition",
-        "title": "Property Definition",
-        "description": "AMEF Property Definition - Definitie van eigenschappen voor ArchiMate elementen",
-        "version": "0.0.7",
-        "summary": "",
-        "icon": "Settings",
-        "required": [
-          "identifier",
-          "type"
-        ],
-        "properties": {
-          "identifier": {
-            "description": "De identifier van deze Property Definition",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "propid-43",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "type": {
-            "description": "De type van deze Property Definition",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "string",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": true
-          },
-          "name": {
-            "description": "De name van deze Property Definition",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "API-portaal",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "name-lang": {
-            "description": "De name-language van deze Property Definition",
-            "type": "string",
-            "minLength": 2,
-            "maxLength": 2,
-            "example": "nl",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          }
-        },
-        "archive": [],
-        "source": "",
-        "hardValidation": false,
-        "updated": "2025-03-27T14:48:34+00:00",
-        "created": "2025-03-10T13:31:19+00:00",
-        "maxDepth": 0,
-        "owner": null,
-        "application": null,
-        "organisation": null,
-        "authorization": null,
-        "deleted": null,
-        "configuration": {
-          "autoPublish": false
-        },
-        "searchable": true
-      },
-      "relation": {
-        "slug": "relation",
-        "title": "Relation",
-        "description": "AMEF Relation - Relaties tussen architectuur elementen uit het ArchiMate model",
-        "version": "0.0.7",
-        "summary": "",
-        "icon": "ArrowRight",
-        "required": [
-          "identifier",
-          "source",
-          "target",
-          "type",
-          "properties"
-        ],
-        "properties": {
-          "identifier": {
-            "description": "De identifier van deze Relation",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "id-1b46181d68e5477a9c0b5a95a0677924",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "source": {
-            "description": "De source van deze Relation",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "id-d143a1fc-02dc-11e6-11ba-005056a85f9c",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "target": {
-            "description": "De target van deze Relation",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "id-a85f22d89af14222a914fcb9ecfe6815",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "type": {
-            "description": "De type van deze Relation",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "Access",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": [],
-            "facetable": true
-          },
-          "accessType": {
-            "description": "De accessType van deze Relation",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "Read",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "isDirected": {
-            "description": "De isDirected van deze Relation",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "true",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "name": {
-            "description": "De name van deze Relation",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "Verplicht",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "name-lang": {
-            "description": "De name-language van deze Relation",
-            "type": "string",
-            "minLength": 2,
-            "maxLength": 2,
-            "example": "nl",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "documentation": {
-            "description": "De documentation van deze Relation",
-            "type": "string",
-            "minLength": null,
-            "maxLength": null,
-            "example": "Op basis van het zaaktype routeert de servicebuscomponent de aanvraag naar een Zaakafhandelcomponent (generiek of specifiek).",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "documentation-lang": {
-            "description": "De documentation-lang van deze Relation",
-            "type": "string",
-            "minLength": 2,
-            "maxLength": 2,
-            "example": "nl",
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          },
-          "properties": {
-            "description": "De properties van deze Relation",
-            "type": "array",
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "$ref": "",
-            "items": {
-              "cascadeDelete": true,
-              "$ref": "#/components/schemas/property",
-              "type": "object"
-            },
-            "objectConfiguration": {
-              "handling": "nested-object",
-              "schema": ""
-            },
-            "fileConfiguration": {
-              "handling": "ignore",
-              "allowedMimeTypes": [],
-              "location": "",
-              "maxSize": 0
-            },
-            "oneOf": []
-          }
-        },
-        "archive": [],
-        "source": "",
-        "hardValidation": false,
-        "updated": "2025-04-01T08:47:45+00:00",
-        "created": "2025-03-03T13:57:01+00:00",
-        "maxDepth": 4,
-        "owner": null,
-        "application": null,
-        "organisation": null,
-        "authorization": null,
-        "deleted": null,
-        "configuration": {
-          "autoPublish": false
-        },
-        "searchable": true
-      },
-      "module": {
-        "uri": null,
-        "slug": "module",
-        "title": "Applicatie",
-        "description": "Een applicatie is een softwarecomponent (applicatie of systeemsoftware)",
-        "version": "0.1.3",
-        "summary": "",
-        "icon": "Package",
-        "required": [
-          "naam",
-          "beschrijvingKort"
-        ],
-        "properties": {
-          "naam": {
-            "type": "string",
-            "description": "Naam van de applicatie",
-            "title": "Naam",
-            "order": 1,
-            "facetable": false,
-            "required": true,
-            "maxLength": 200,
-            "table": {
-              "default": true
-            },
-            "example": "Bijvoorbeeld: VNG Applicatie Suite"
-          },
-          "beschrijvingKort": {
-            "type": "string",
-            "description": "Korte beschrijving van de applicatie",
-            "title": "Korte omschrijving",
-            "order": 2,
-            "facetable": false,
-            "maxLength": 255,
-            "table": {
-              "default": true
-            },
-            "example": "Bijvoorbeeld: Een korte samenvatting van de applicatie"
-          },
-          "beschrijvingLang": {
-            "type": "string",
-            "description": "Uitgebreide beschrijving van de applicatie",
-            "title": "Beschrijving",
-            "order": 3,
-            "facetable": false,
-            "format": "markdown",
-            "maxLength": 5000,
-            "example": "Bijvoorbeeld: Een uitgebreide beschrijving van de applicatie met alle functionaliteiten en kenmerken"
-          },
-          "website": {
-            "description": "Website van de applicatie",
-            "type": "string",
-            "format": "url",
-            "visible": true,
-            "order": 4,
-            "maxLength": 500,
-            "table": {
-              "default": true
-            },
-            "facetable": false,
-            "title": "Website",
-            "example": "https://voorbeeld.nl/applicatie"
-          },
-          "contactpersoon": {
-            "description": "Contactpersoon voor de applicatie",
-            "type": "object",
-            "visible": true,
-            "order": 5,
-            "facetable": false,
-            "title": "Contact",
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/contactpersoon"
-          },
-          "cloudDienstverleningsmodel": {
-            "description": "Het cloud dienstverleningsmodel voor de applicatie",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "enum": [
-                "On-premises (self-managed)",
-                "IaaS",
-                "PaaS",
-                "SaaS"
-              ]
-            },
-            "order": 6,
-            "objectConfiguration": [],
-            "fileConfiguration": [],
-            "oneOf": [],
-            "facetable": true,
-            "title": "Hosting vorm",
-            "example": [
-              "SaaS"
-            ]
-          },
-          "hostingJurisdictie": {
-            "description": "De jurisdictie waar de hosting plaatsvindt",
-            "type": "string",
-            "visible": true,
-            "order": 7,
-            "enum": [
-              "NL",
-              "EU",
-              "US",
-              "Elders"
-            ],
-            "facetable": true,
-            "title": "In welk land wordt de data opgeslagen?",
-            "example": "Bijvoorbeeld: NL"
-          },
-          "hostingLocatie": {
-            "description": "De locatie waar de hosting plaatsvindt",
-            "type": "string",
-            "visible": true,
-            "order": 8,
-            "enum": [
-              "NL",
-              "EU",
-              "US",
-              "Elders"
-            ],
-            "facetable": true,
-            "title": "Waar wordt de applicatie gehost?",
-            "example": "Bijvoorbeeld: NL"
-          },
-          "aanbieder": {
-            "description": "De aanbieder van de applicatie",
-            "type": "object",
-            "visible": true,
-            "order": 9,
-            "facetable": false,
-            "table": {
-              "default": true
-            },
-            "title": "Aanbieder",
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/organisatie"
-          },
-          "licentietype": {
-            "description": "Het type licentie van de voorziening (open source of closed source)",
-            "type": "string",
-            "visible": true,
-            "order": 9,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "table": {
-              "default": true
-            },
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "default": "Closed source",
-            "enum": [
-              "Closed source",
-              "Open source"
-            ],
-            "objectConfiguration": [],
-            "fileConfiguration": [],
-            "oneOf": [],
-            "facetable": true,
-            "title": "Licentievorm"
-          },
-          "licentie": {
-            "description": "De specifieke licentie van de voorziening, alleen opgeven indien Open Source",
-            "type": "string",
-            "visible": true,
-            "order": 10,
-            "minLength": null,
-            "maxLength": null,
-            "minimum": null,
-            "maximum": null,
-            "multipleOf": null,
-            "minItems": null,
-            "maxItems": null,
-            "inversedBy": "",
-            "$ref": "",
-            "objectConfiguration": [],
-            "fileConfiguration": [],
-            "oneOf": [],
-            "facetable": false,
-            "enum": [
-              "MIT License",
-              "GNU General Public License (GPL)",
-              "Apache License 2.0",
-              "BSD Licentie (Berkeley Software Distribution)",
-              "European Union Public Licence (EUPL), versie 1.2"
-            ],
-            "licentie": "License"
-          },
-          "referentieComponenten": {
-            "description": "GEMMA referentiecomponenten die de applicatie implementeert",
-            "type": "array",
-            "visible": true,
-            "order": 9,
-            "facetable": true,
-            "title": "Referentie Componenten",
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object",
-                "queryParams": "gemmaType=referentiecomponent&_extend=aanbevolenStandaarden,verplichteStandaarden"
-              },
-              "$ref": "#/components/schemas/element"
-            },
-            "hideOnForm": true
-          },
-          "type": {
-            "description": "Het type applicatie zoals geregistreerd in de catalogus",
-            "type": "string",
-            "visible": true,
-            "order": 11,
-            "facetable": true,
-            "title": "Type",
-            "default": "Applicatie",
-            "enum": [
-              "Applicatie",
-              "Systeemsoftware"
-            ]
-          },
-          "logo": {
-            "description": "URL naar het logo van de applicatie",
-            "type": "string",
-            "format": "url",
-            "visible": true,
-            "order": 18,
-            "facetable": false,
-            "title": "Logo",
-            "maxLength": 500,
-            "table": {
-              "default": true
-            }
-          },
-          "omvat": {
-            "description": "Andere applicaties die onderdeel zijn van deze applicatie",
-            "type": "array",
-            "visible": true,
-            "order": 19,
-            "facetable": false,
-            "title": "Omvat",
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/module",
-              "inversedBy": "onderdeelVan"
-            }
-          },
-          "onderdeelVan": {
-            "description": "Applicaties waarvan deze applicatie onderdeel is",
-            "type": "array",
-            "visible": true,
-            "order": 20,
-            "facetable": false,
-            "title": "Onderdeel van",
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/module",
-              "inversedBy": "omvat"
-            }
-          },
-          "diensten": {
-            "description": "De diensten waarvan deze applicatie onderdeel is",
-            "type": "array",
-            "visible": true,
-            "order": 21,
-            "facetable": false,
-            "title": "Diensten",
-            "hideOnForm": true,
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/dienst",
-              "inversedBy": "modules"
-            }
-          },
-          "koppelingen": {
-            "description": "De koppelingen waarbij deze applicatie betrokken is",
-            "type": "array",
-            "visible": true,
-            "order": 22,
-            "facetable": false,
-            "title": "Koppelingen",
-            "hideOnForm": true,
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/koppeling",
-              "inversedBy": "moduleA"
-            }
-          },
-          "compliancy": {
-            "description": "De standaarden waar deze applicatie aan voldoet (compliance registraties)",
-            "type": "array",
-            "visible": true,
-            "order": 23,
-            "facetable": false,
-            "title": "Compliance",
-            "hideOnForm": true,
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/compliancy"
-            }
-          },
-          "standaarden": {
-            "description": "Een array van amef id's van standaarden die deze applicatie implementeert",
-            "type": "array",
-            "visible": true,
-            "order": 24,
-            "facetable": true,
-            "title": "Standaarden AMEF",
-            "hideOnForm": true,
-            "items": {
-              "type": "string"
-            }
-          },
-          "standaardenGemma": {
-            "description": "Een array van gemma id's van standaarden die deze applicatie implementeert",
-            "type": "array",
-            "visible": true,
-            "order": 25,
-            "facetable": true,
-            "title": "Standaarden Gemma",
-            "hideOnForm": true,
-            "items": {
-              "type": "string"
-            }
-          },
-          "moduleVersies": {
-            "description": "De versies van deze applicatie",
-            "type": "array",
-            "visible": true,
-            "order": 26,
-            "facetable": false,
-            "title": "Applicatie Versies",
-            "hideOnForm": true,
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/moduleVersie",
-              "inversedBy": "module"
-            }
-          },
-          "gebruiken": {
-            "description": "Het gebruik van deze applicatie",
-            "type": "array",
-            "visible": true,
-            "order": 27,
-            "facetable": false,
-            "title": "Gebruik",
-            "hideOnForm": true,
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/gebruik"
-            }
-          },
-          "beoordelingen": {
-            "description": "De beoordelingen van deze applicatie",
-            "type": "array",
-            "visible": true,
-            "order": 28,
-            "facetable": false,
-            "title": "Beoordelingen",
-            "hideOnForm": true,
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/beoordeeling"
-            }
-          },
-          "kwetsbaarheden": {
-            "description": "De kwetsbaarheden die deze applicatie treffen",
-            "type": "array",
-            "visible": true,
-            "order": 29,
-            "facetable": false,
-            "title": "Kwetsbaarheden",
-            "hideOnForm": true,
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/kwetsbaarheid"
-            }
-          }
-        },
-        "archive": [],
-        "source": "internal",
-        "hardValidation": false,
-        "immutable": false,
-        "updated": "2025-07-29T09:24:00+00:00",
-        "created": "2025-07-29T09:24:00+00:00",
-        "maxDepth": 0,
-        "owner": "system",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "groups": null,
-        "authorization": null,
-        "deleted": null,
-        "configuration": {
-          "objectNameField": "naam",
-          "objectSummaryField": "beschrijvingKort",
-          "objectDescriptionField": "beschrijvingLang",
-          "objectImageField": "logo",
-          "allowFiles": true,
-          "allowedTags": [
-            "Documentatie",
-            "Handleiding",
-            "Technische specificatie"
-          ],
-          "autoPublish": true,
-          "searchable": true
-        },
-        "searchable": true
-      },
-      "compliancy": {
-        "uri": null,
-        "slug": "compliancy",
-        "title": "Compliancy",
-        "description": "Schema voor compliancy en standaard ondersteuning",
-        "version": "0.0.10",
-        "summary": "",
-        "icon": "CheckCircle",
-        "required": [],
-        "properties": {
-          "standaardversie": {
-            "description": "Standaardversie die door deze compliance wordt ondersteund",
-            "type": "object",
-            "order": 1,
-            "title": "Standaard Versie",
-            "visible": true,
-            "facetable": true,
-            "objectConfiguration": {
-              "handling": "related-object",
-              "queryParams": "gemmaType=standaardversie"
-            },
-            "$ref": "#/components/schemas/element"
-          },
-          "standaardGemma": {
-            "description": "Het gemma id van de standaardversie die door deze compliance wordt ondersteund",
-            "type": "string",
-            "order": 1,
-            "title": "Standaard Gemaa",
-            "visible": true,
-            "facetable": true
-          },
-          "module": {
-            "description": "De applicatie waarvan de compliance wordt geregistreerd",
-            "type": "object",
-            "order": 4,
-            "title": "Applicatie",
-            "visible": true,
-            "facetable": false,
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/module",
-            "inversedBy": "compliancy"
-          },
-          "bewijs": {
-            "description": "Bewijsstuk voor de compliance (bijvoorbeeld testrapport of certificaat)",
-            "type": "file",
-            "format": "base64",
-            "order": 5,
-            "title": "Bewijs",
-            "visible": true,
-            "facetable": false,
-            "fileConfiguration": {
-              "allowedMimeTypes": [
-                "application/pdf",
-                "image/jpeg",
-                "image/png",
-                "application/msword",
-                "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
-              ],
-              "maxSize": 10485760
-            }
-          },
-          "url": {
-            "description": "URL naar het bewijs van de compliance",
-            "type": "string",
-            "format": "url",
-            "order": 1,
-            "title": "URL",
-            "visible": true,
-            "facetable": false
-          }
-        },
-        "archive": [],
-        "source": "",
-        "hardValidation": false,
-        "updated": "2025-08-08T07:11:40+00:00",
-        "created": "2025-08-08T07:11:40+00:00",
-        "maxDepth": 0,
-        "owner": "system",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "groups": null,
-        "authorization": null,
-        "deleted": null,
-        "configuration": {
-          "objectNameField": "module",
-          "objectSummaryField": "standaardversie",
-          "objectDescriptionField": "module",
-          "allowFiles": true,
-          "allowedTags": [
-            "testraport"
-          ],
-          "autoPublish": true
-        },
-        "searchable": true
-      },
-      "moduleVersie": {
-        "uri": null,
-        "slug": "moduleVersie",
-        "title": "Applicatie Versie",
-        "description": "Schema voor applicatie versies",
-        "version": "0.0.8",
-        "summary": "",
-        "icon": "ViewModule",
-        "required": [],
-        "properties": {
-          "module": {
-            "description": "De applicatie waarvan dit een versie is",
-            "type": "object",
-            "order": 1,
-            "title": "Applicatie",
-            "facetable": false,
-            "objectConfiguration": {
-              "handling": "related-object"
-            },
-            "$ref": "#/components/schemas/module",
-            "inversedBy": "moduleVersie"
-          },
-          "versie": {
-            "description": "Versienummer in semantic versioning format (MAJOR.MINOR.PATCH)",
-            "type": "string",
-            "order": 2,
-            "title": "Versienummer",
-            "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$",
-            "maxLength": 50,
-            "default": "1.0.0"
-          },
-          "beschrijvingKort": {
-            "description": "Korte beschrijving van de applicatie versie",
-            "type": "string",
-            "order": 3,
-            "title": "Wat is er nieuw of bijzonder in deze versie?",
-            "maxLength": 255
-          },
-          "beschrijvingLang": {
-            "description": "Uitgebreide beschrijving van de applicatie versie",
-            "type": "string",
-            "order": 4,
-            "title": "Beschrijving",
-            "format": "markdown",
-            "maxLength": 5000
-          },
-          "status": {
-            "description": "De status van de applicatie",
-            "type": "string",
-            "order": 13,
-            "title": "Status",
-            "enum": [
-              "in ontwikkeling",
-              "in gebruik",
-              "einde ondersteuning",
-              "teruggetrokken"
-            ],
-            "default": "in gebruik"
-          },
-          "datumInOntwikkeling": {
-            "description": "Startdatum van de ontwikkelingsfase",
-            "type": "string",
-            "format": "date",
-            "order": 14,
-            "title": "Datum In Ontwikkeling"
-          },
-          "datumInGebruik": {
-            "description": "Startdatum van gebruik",
-            "type": "string",
-            "format": "date",
-            "order": 15,
-            "title": "Datum In Gebruik"
-          },
-          "datumEindeOndersteuning": {
-            "description": "Startdatum einde ondersteuning",
-            "type": "string",
-            "format": "date",
-            "order": 16,
-            "title": "Datum Einde Ondersteuning"
-          },
-          "datumTeruggetrokken": {
-            "description": "Datum waarop de applicatie teruggetrokken is",
-            "type": "string",
-            "format": "date",
-            "order": 17,
-            "title": "Datum Teruggetrokken"
-          },
-          "gebruiken": {
-            "description": "Het gebruik van deze applicatie versie",
-            "type": "array",
-            "visible": true,
-            "order": 18,
-            "facetable": false,
-            "title": "Gebruik",
-            "items": {
-              "type": "object",
-              "objectConfiguration": {
-                "handling": "related-object"
-              },
-              "$ref": "#/components/schemas/gebruik"
-            }
-          }
-        },
-        "archive": [],
-        "source": "",
-        "hardValidation": false,
-        "updated": "2025-08-08T07:11:40+00:00",
-        "created": "2025-08-08T07:11:40+00:00",
-        "maxDepth": 0,
-        "owner": "system",
-        "application": null,
-        "organisation": "cb2bca24-40bf-4568-a138-454c63ab761c",
-        "groups": null,
-        "authorization": null,
-        "deleted": null,
-        "configuration": {
-          "objectNameField": "versie",
-          "objectSummaryField": "beschrijvingKort",
-          "objectDescriptionField": "beschrijvingLang",
-          "autoPublish": true
-        },
-        "searchable": true
-      }
-    },
-    "objects": [
-      {
-        "title": "Welkom",
-        "slug": "home",
-        "contents": [
-          {
-            "type": "RichText",
-            "order": 0,
-            "data": {
-              "content": "<h1>Welkom bij de Softwarecatalogus</h1><p>Ontdek en vergelijk software voor de Nederlandse overheid. Deze catalogus biedt inzicht in beschikbare softwareoplossingen, leveranciers en compliance.</p>"
-            }
-          }
-        ],
-        "published": true,
-        "@self": {
-          "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
-          "register": "publication",
-          "schema": "page",
-          "version": "0.0.3"
-        }
-      },
-      {
-        "title": "Over Ons",
-        "slug": "over-ons",
-        "contents": [
-          {
-            "type": "RichText",
-            "order": 0,
-            "data": {
-              "content": "<h1>Over de Softwarecatalogus</h1><p>De Softwarecatalogus is een initiatief om overheidssoftware inzichtelijk en vergelijkbaar te maken.</p>"
-            }
-          }
-        ],
-        "published": true,
-        "@self": {
-          "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
-          "register": "publication",
-          "schema": "page",
-          "version": "0.0.3"
-        }
-      },
-      {
-        "title": "Privacyverklaring",
-        "slug": "privacyverklaring",
-        "contents": [
-          {
-            "type": "RichText",
-            "order": 0,
-            "data": {
-              "content": "<h1>Privacyverklaring</h1><p>Informatie over hoe wij omgaan met uw persoonsgegevens conform de AVG.</p>"
-            }
-          }
-        ],
-        "published": true,
-        "@self": {
-          "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
-          "register": "publication",
-          "schema": "page",
-          "version": "0.0.3"
-        }
-      },
-      {
-        "title": "FAQ",
-        "slug": "faq",
-        "contents": [
-          {
-            "type": "RichText",
-            "order": 0,
-            "data": {
-              "content": "<h1>Veelgestelde Vragen</h1><p>Antwoorden op de meest gestelde vragen over de Softwarecatalogus.</p>"
-            }
-          }
-        ],
-        "published": true,
-        "@self": {
-          "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
-          "register": "publication",
-          "schema": "page",
-          "version": "0.0.3"
-        }
-      },
-      {
-        "title": "Main nav",
-        "position": 1,
-        "items": [
-          {
-            "order": 1,
-            "name": "Home",
-            "link": "/",
-            "items": []
-          },
-          {
-            "order": 2,
-            "name": "Applicaties",
-            "link": "/applications",
-            "items": []
-          },
-          {
-            "order": 3,
-            "name": "Over Ons",
-            "link": "/over-ons",
-            "items": []
-          }
-        ],
-        "@self": {
-          "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
-          "register": "publication",
-          "schema": "menu",
-          "version": "0.0.3"
-        }
-      },
-      {
-        "title": "Footer Sub",
-        "position": 2,
-        "items": [
-          {
-            "order": 1,
-            "name": "Privacy",
-            "link": "/privacyverklaring",
-            "items": []
-          },
-          {
-            "order": 2,
-            "name": "Contact",
-            "link": "/contact",
-            "items": []
-          },
-          {
-            "order": 3,
-            "name": "FAQ",
-            "link": "/faq",
-            "items": []
-          }
-        ],
-        "@self": {
-          "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
-          "register": "publication",
-          "schema": "menu",
-          "version": "0.0.3"
-        }
-      },
-      {
-        "title": "User Menu",
-        "position": 3,
-        "items": [
-          {
-            "order": 1,
-            "name": "Aanmelden",
-            "link": "/register",
-            "items": []
-          },
-          {
-            "order": 2,
-            "name": "Inloggen",
-            "link": "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/login",
-            "items": []
-          }
-        ],
-        "@self": {
-          "configuration": "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/ConductionNL/opencatalogi/blob/master/apps-extra/opencatalogi/lib/Settings/publication_register_magic.json",
-          "register": "publication",
-          "schema": "menu",
-          "version": "0.0.3"
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/test_archimate_unified.sh b/test_archimate_unified.sh
index 7eef068e..1f85da5e 100644
--- a/test_archimate_unified.sh
+++ b/test_archimate_unified.sh
@@ -5,20 +5,27 @@
 #
 # This replaces:
 # - test_optimized_api.sh (performance testing)
-# - test_amef_simple.sh (round-trip testing)  
+# - test_amef_simple.sh (round-trip testing)
 # - test_archimate_export.sh (export testing)
 # - test_archimate_import_debug.php (debugging)
 # - And eliminates redundancy with test_performance_optimization.php & test_amef_roundtrip.php
 
 set -e
 
+# Resolve script directory (for locating companion files)
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
 # Configuration
 BASE_URL="http://localhost"
-USERNAME="admin" 
+USERNAME="admin"
 PASSWORD="admin"
 GEMMA_FILE="lib/Settings/GEMMA_release.xml"
-OUTPUT_DIR="./test_results"
+CONTAINER_APP_PATH="/var/www/html/custom_apps/softwarecatalog"
+OUTPUT_DIR="$SCRIPT_DIR/test_results"
 TARGET_TIME_SECONDS=60
+XSD_CACHE_DIR="$OUTPUT_DIR/schema"
+ARCHIMATE_XSD_URL="https://www.opengroup.org/xsd/archimate/3.1/archimate3_Diagram.xsd"
+ARCHIMATE_MODEL_XSD_URL="https://www.opengroup.org/xsd/archimate/3.1/archimate3_Model.xsd"
 
 # Colors
 RED='\033[0;31m'
@@ -33,6 +40,7 @@ PERFORMANCE_TEST=false
 ROUNDTRIP_TEST=false
 DEBUG_TEST=false
 EXPORT_TEST=false
+VALIDATE_TEST=false
 ALL_TESTS=false
 
 # Parse command line arguments
@@ -54,6 +62,10 @@ while [[ $# -gt 0 ]]; do
             EXPORT_TEST=true
             shift
             ;;
+        -v|--validate)
+            VALIDATE_TEST=true
+            shift
+            ;;
         -a|--all)
             ALL_TESTS=true
             shift
@@ -65,15 +77,18 @@ while [[ $# -gt 0 ]]; do
             echo ""
             echo "Options:"
             echo "  -p, --performance    Run performance tests (optimized vs original)"
-            echo "  -r, --roundtrip      Run round-trip tests (import -> export -> compare)"
+            echo "  -r, --roundtrip      Run round-trip tests (import -> export -> XSD validate -> semantic compare)"
             echo "  -e, --export         Run export functionality tests"
+            echo "  -v, --validate       Run XSD schema validation on the original GEMMA file"
             echo "  -d, --debug          Run debug/diagnostic tests"
             echo "  -a, --all            Run all test suites"
             echo "  -h, --help           Show this help message"
             echo ""
             echo "Examples:"
             echo "  $0 --performance     # Test only performance optimizations"
-            echo "  $0 --all            # Run complete test suite"
+            echo "  $0 --roundtrip       # Full round-trip: import -> export -> validate -> compare"
+            echo "  $0 --validate        # Just validate the GEMMA file against ArchiMate XSD"
+            echo "  $0 --all             # Run complete test suite"
             echo "  $0 -p -r            # Run performance and round-trip tests"
             exit 0
             ;;
@@ -86,7 +101,7 @@ while [[ $# -gt 0 ]]; do
 done
 
 # If no specific tests requested, show help
-if [[ "$PERFORMANCE_TEST" == false && "$ROUNDTRIP_TEST" == false && "$DEBUG_TEST" == false && "$EXPORT_TEST" == false && "$ALL_TESTS" == false ]]; then
+if [[ "$PERFORMANCE_TEST" == false && "$ROUNDTRIP_TEST" == false && "$DEBUG_TEST" == false && "$EXPORT_TEST" == false && "$VALIDATE_TEST" == false && "$ALL_TESTS" == false ]]; then
     echo -e "${YELLOW}No test type specified. Use --help for options or --all to run everything.${NC}"
     exit 1
 fi
@@ -94,199 +109,585 @@ fi
 # Set all tests if --all specified
 if [[ "$ALL_TESTS" == true ]]; then
     PERFORMANCE_TEST=true
-    ROUNDTRIP_TEST=true  
+    ROUNDTRIP_TEST=true
     DEBUG_TEST=true
     EXPORT_TEST=true
+    VALIDATE_TEST=true
 fi
 
-# Create output directory
+# Create output directories
 mkdir -p "$OUTPUT_DIR"
+mkdir -p "$XSD_CACHE_DIR"
 
-echo -e "${CYAN}🚀 ARCHIMATE UNIFIED TEST SUITE${NC}"
-echo -e "${CYAN}================================${NC}"
+echo -e "${CYAN}ARCHIMATE UNIFIED TEST SUITE${NC}"
+echo -e "${CYAN}============================${NC}"
 echo -e "${BLUE}Test configuration:${NC}"
-echo -e "${BLUE}  Performance: $([ "$PERFORMANCE_TEST" == true ] && echo "✅" || echo "❌")${NC}"
-echo -e "${BLUE}  Round-trip: $([ "$ROUNDTRIP_TEST" == true ] && echo "✅" || echo "❌")${NC}"
-echo -e "${BLUE}  Export: $([ "$EXPORT_TEST" == true ] && echo "✅" || echo "❌")${NC}"
-echo -e "${BLUE}  Debug: $([ "$DEBUG_TEST" == true ] && echo "✅" || echo "❌")${NC}"
+echo -e "${BLUE}  Performance : $([ "$PERFORMANCE_TEST" == true ] && echo "YES" || echo "no")${NC}"
+echo -e "${BLUE}  Round-trip  : $([ "$ROUNDTRIP_TEST" == true ] && echo "YES" || echo "no")${NC}"
+echo -e "${BLUE}  Export      : $([ "$EXPORT_TEST" == true ] && echo "YES" || echo "no")${NC}"
+echo -e "${BLUE}  Validate    : $([ "$VALIDATE_TEST" == true ] && echo "YES" || echo "no")${NC}"
+echo -e "${BLUE}  Debug       : $([ "$DEBUG_TEST" == true ] && echo "YES" || echo "no")${NC}"
 echo ""
 
-# Shared functions
+# =============================================================================
+# SHARED HELPER FUNCTIONS
+# =============================================================================
+
 check_docker() {
-    if ! docker-compose ps | grep -q "master-nextcloud-1.*Up"; then
-        echo -e "${RED}❌ ERROR: Nextcloud container is not running${NC}"
+    if ! docker-compose ps 2>/dev/null | grep -qE "(nextcloud.*Up|nextcloud.*running)"; then
+        echo -e "${RED}ERROR: Nextcloud container is not running${NC}"
         echo "Please start docker-compose and try again"
         exit 1
     fi
 }
 
 check_gemma_file() {
-    if ! docker-compose exec -T nextcloud test -f "/var/www/html/apps-extra/softwarecatalog/$GEMMA_FILE"; then
-        echo -e "${RED}❌ ERROR: GEMMA file not found in container: $GEMMA_FILE${NC}"
+    if ! docker-compose exec -T nextcloud test -f "$CONTAINER_APP_PATH/$GEMMA_FILE"; then
+        echo -e "${RED}ERROR: GEMMA file not found in container: $GEMMA_FILE${NC}"
         exit 1
     fi
-    
-    FILE_SIZE=$(docker-compose exec -T nextcloud stat -c%s "/var/www/html/apps-extra/softwarecatalog/$GEMMA_FILE")
+
+    FILE_SIZE=$(docker-compose exec -T nextcloud stat -c%s "$CONTAINER_APP_PATH/$GEMMA_FILE" | tr -d '[:space:]')
     FILE_SIZE_MB=$(echo "scale=2; $FILE_SIZE / 1024 / 1024" | bc)
-    echo -e "${BLUE}📁 Test file: $GEMMA_FILE (${FILE_SIZE_MB} MB)${NC}"
+    echo -e "${BLUE}Test file: $GEMMA_FILE (${FILE_SIZE_MB} MB)${NC}"
+}
+
+# Extract JSON field using python3 (available on most systems)
+json_get() {
+    local field="$1"
+    python3 -c "import sys, json; print(json.load(sys.stdin).get('$field', ''))" 2>/dev/null
+}
+
+json_get_bool() {
+    local field="$1"
+    python3 -c "import sys, json; v = json.load(sys.stdin).get('$field', False); print('true' if v else 'false')" 2>/dev/null
+}
+
+# Download ArchiMate XSD schema files (cached)
+download_xsd_schema() {
+    local xsd_file="$XSD_CACHE_DIR/archimate3_Diagram.xsd"
+    local model_xsd_file="$XSD_CACHE_DIR/archimate3_Model.xsd"
+
+    # Check cache
+    if [ -f "$xsd_file" ] && [ -s "$xsd_file" ] && [ -f "$model_xsd_file" ] && [ -s "$model_xsd_file" ]; then
+        echo -e "${BLUE}  Using cached XSD schema${NC}"
+        return 0
+    fi
+
+    echo -e "${BLUE}  Downloading ArchiMate 3.1 XSD schema...${NC}"
+
+    # Download diagram XSD (extends model XSD)
+    if curl -sS --connect-timeout 10 --max-time 30 -o "$xsd_file" "$ARCHIMATE_XSD_URL" 2>/dev/null; then
+        # Verify it's actually XML (not an error page)
+        if head -5 "$xsd_file" | grep -q "schema\|xsd\|XSD"; then
+            echo -e "${GREEN}  Downloaded archimate3_Diagram.xsd${NC}"
+        else
+            echo -e "${YELLOW}  Downloaded file does not look like an XSD schema${NC}"
+            rm -f "$xsd_file"
+            return 1
+        fi
+    else
+        echo -e "${YELLOW}  Failed to download Diagram XSD${NC}"
+        return 1
+    fi
+
+    # Download model XSD (base schema, referenced by diagram XSD)
+    if curl -sS --connect-timeout 10 --max-time 30 -o "$model_xsd_file" "$ARCHIMATE_MODEL_XSD_URL" 2>/dev/null; then
+        if head -5 "$model_xsd_file" | grep -q "schema\|xsd\|XSD"; then
+            echo -e "${GREEN}  Downloaded archimate3_Model.xsd${NC}"
+        else
+            echo -e "${YELLOW}  Downloaded file does not look like an XSD schema${NC}"
+            rm -f "$model_xsd_file"
+            return 1
+        fi
+    else
+        echo -e "${YELLOW}  Failed to download Model XSD${NC}"
+        return 1
+    fi
+
+    return 0
+}
+
+# Validate an XML file against the ArchiMate XSD schema
+# Usage: validate_xsd <xml_file>
+# Returns: 0 if valid, 1 if invalid, 2 if validation could not be performed
+validate_xsd() {
+    local xml_file="$1"
+    local xsd_file="$XSD_CACHE_DIR/archimate3_Diagram.xsd"
+
+    # Check xmllint is available
+    if ! command -v xmllint &>/dev/null; then
+        echo -e "${YELLOW}  xmllint not found - install libxml2-utils for XSD validation${NC}"
+        return 2
+    fi
+
+    # Check well-formedness first
+    echo -e "${BLUE}  Checking XML well-formedness...${NC}"
+    if ! xmllint --noout "$xml_file" 2>"$OUTPUT_DIR/xmllint_wellformed.log"; then
+        echo -e "${RED}  XML is NOT well-formed${NC}"
+        cat "$OUTPUT_DIR/xmllint_wellformed.log"
+        return 1
+    fi
+    echo -e "${GREEN}  XML is well-formed${NC}"
+
+    # Attempt XSD validation
+    if [ ! -f "$xsd_file" ] || [ ! -s "$xsd_file" ]; then
+        echo -e "${YELLOW}  XSD schema not available, skipping schema validation${NC}"
+        return 2
+    fi
+
+    echo -e "${BLUE}  Validating against ArchiMate 3.1 XSD...${NC}"
+    if xmllint --noout --schema "$xsd_file" "$xml_file" 2>"$OUTPUT_DIR/xmllint_schema.log"; then
+        echo -e "${GREEN}  XSD schema validation PASSED${NC}"
+        return 0
+    else
+        echo -e "${RED}  XSD schema validation FAILED${NC}"
+        # Show first 20 lines of errors
+        head -20 "$OUTPUT_DIR/xmllint_schema.log"
+        if [ "$(wc -l < "$OUTPUT_DIR/xmllint_schema.log")" -gt 20 ]; then
+            echo -e "${YELLOW}  ... (truncated, see $OUTPUT_DIR/xmllint_schema.log for full output)${NC}"
+        fi
+        return 1
+    fi
+}
+
+# Run semantic comparison between original and exported ArchiMate files
+# Usage: run_semantic_compare <original.xml> <exported.xml>
+# Returns: 0 if all checks pass, 1 if checks fail, 2 if comparison could not run
+run_semantic_compare() {
+    local original_file="$1"
+    local exported_file="$2"
+    local compare_script="$SCRIPT_DIR/compare_archimate.py"
+
+    if [ ! -f "$compare_script" ]; then
+        echo -e "${RED}  Comparison script not found: $compare_script${NC}"
+        return 2
+    fi
+
+    if ! command -v python3 &>/dev/null; then
+        echo -e "${RED}  python3 not found - required for semantic comparison${NC}"
+        return 2
+    fi
+
+    echo -e "${BLUE}  Running semantic comparison...${NC}"
+    echo ""
+
+    # Run comparison, save report to file and show on screen
+    if python3 "$compare_script" "$original_file" "$exported_file" | tee "$OUTPUT_DIR/comparison_report.txt"; then
+        echo ""
+        echo -e "${GREEN}  Semantic comparison: ALL CHECKS PASSED${NC}"
+
+        # Also save JSON version for programmatic use
+        python3 "$compare_script" "$original_file" "$exported_file" --json > "$OUTPUT_DIR/comparison_report.json" 2>/dev/null || true
+        return 0
+    else
+        echo ""
+        echo -e "${RED}  Semantic comparison: SOME CHECKS FAILED${NC}"
+        echo -e "${BLUE}  Full report saved to: $OUTPUT_DIR/comparison_report.txt${NC}"
+
+        python3 "$compare_script" "$original_file" "$exported_file" --json > "$OUTPUT_DIR/comparison_report.json" 2>/dev/null || true
+        return 1
+    fi
 }
 
 # =============================================================================
 # PERFORMANCE TESTING (Replaces test_optimized_api.sh & test_performance_optimization.php)
 # =============================================================================
 run_performance_test() {
-    echo -e "${CYAN}🏎️  PERFORMANCE TEST SUITE${NC}"
-    echo -e "${CYAN}============================${NC}"
-    
+    echo -e "${CYAN}PERFORMANCE TEST SUITE${NC}"
+    echo -e "${CYAN}======================${NC}"
+
     # Test optimized method
     echo -e "${YELLOW}Testing OPTIMIZED method...${NC}"
-    
+
     start_time=$(date +%s.%3N)
-    
-    http_code=$(docker-compose exec -T nextcloud curl -s -w "%{http_code}" \
-        -o "$OUTPUT_DIR/optimized_result.json" \
+
+    import_result=$(docker-compose exec -T nextcloud curl -s \
         -X POST \
         -u "$USERNAME:$PASSWORD" \
-        -F "archiMateFile=@/var/www/html/apps-extra/softwarecatalog/$GEMMA_FILE" \
+        -F "archiMateFile=@$CONTAINER_APP_PATH/$GEMMA_FILE" \
         -F "useOptimized=true" \
         -F "updateExisting=true" \
         -F "preserveIds=true" \
-        "$BASE_URL/index.php/apps/softwarecatalog/api/archimate/import" 2>/dev/null || echo "000")
-    
+        "$BASE_URL/index.php/apps/softwarecatalog/api/archimate/import" 2>/dev/null || echo "{}")
+
     end_time=$(date +%s.%3N)
     duration=$(echo "scale=3; $end_time - $start_time" | bc)
-    
-    if [ "$http_code" = "200" ]; then
-        success=$(cat "$OUTPUT_DIR/optimized_result.json" | python3 -c "import sys, json; print(json.load(sys.stdin).get('success', False))" 2>/dev/null || echo "false")
-        
-        if [ "$success" = "True" ] || [ "$success" = "true" ]; then
-            echo -e "${GREEN}✅ OPTIMIZED method completed in ${duration}s${NC}"
-            
-            # Check if under target
-            target_check=$(echo "$duration < $TARGET_TIME_SECONDS" | bc)
-            if [ "$target_check" = "1" ]; then
-                echo -e "${GREEN}🎉 PERFORMANCE TARGET ACHIEVED! (< ${TARGET_TIME_SECONDS}s)${NC}"
-                return 0
-            else
-                shortfall=$(echo "scale=2; $duration - $TARGET_TIME_SECONDS" | bc)
-                echo -e "${YELLOW}⚠️  Target missed by ${shortfall}s${NC}"
-                return 1
-            fi
+
+    success=$(echo "$import_result" | json_get_bool "success")
+
+    if [ "$success" = "true" ]; then
+        echo -e "${GREEN}  OPTIMIZED method completed in ${duration}s${NC}"
+
+        # Check if under target
+        target_check=$(echo "$duration < $TARGET_TIME_SECONDS" | bc)
+        if [ "$target_check" = "1" ]; then
+            echo -e "${GREEN}  PERFORMANCE TARGET ACHIEVED (< ${TARGET_TIME_SECONDS}s)${NC}"
+            return 0
         else
-            echo -e "${RED}❌ OPTIMIZED method failed${NC}"
-            return 2
+            shortfall=$(echo "scale=2; $duration - $TARGET_TIME_SECONDS" | bc)
+            echo -e "${YELLOW}  Target missed by ${shortfall}s${NC}"
+            return 1
         fi
     else
-        echo -e "${RED}❌ HTTP error: $http_code${NC}"
+        echo -e "${RED}  OPTIMIZED method failed${NC}"
+        echo "$import_result" | python3 -m json.tool 2>/dev/null || echo "$import_result"
         return 2
     fi
 }
 
 # =============================================================================
-# ROUND-TRIP TESTING (Replaces test_amef_simple.sh & test_amef_roundtrip.php)
+# ROUND-TRIP TESTING — import -> export -> download -> XSD validate -> semantic compare
 # =============================================================================
 run_roundtrip_test() {
-    echo -e "${CYAN}🔄 ROUND-TRIP TEST SUITE${NC}"
-    echo -e "${CYAN}========================${NC}"
-    
-    echo -e "${BLUE}Step 1: Import GEMMA file${NC}"
-    
-    # Import
+    echo -e "${CYAN}ROUND-TRIP TEST SUITE${NC}"
+    echo -e "${CYAN}=====================${NC}"
+
+    local original_host_file="$SCRIPT_DIR/$GEMMA_FILE"
+    local exported_host_file="$OUTPUT_DIR/exported_roundtrip.xml"
+    local roundtrip_passed=true
+
+    # Verify original file exists on host for later comparison
+    if [ ! -f "$original_host_file" ]; then
+        echo -e "${RED}  Original file not found on host: $original_host_file${NC}"
+        echo -e "${YELLOW}  Trying to copy from container...${NC}"
+        docker-compose exec -T nextcloud cat "$CONTAINER_APP_PATH/$GEMMA_FILE" > "$OUTPUT_DIR/original_gemma.xml" 2>/dev/null
+        if [ -s "$OUTPUT_DIR/original_gemma.xml" ]; then
+            original_host_file="$OUTPUT_DIR/original_gemma.xml"
+            echo -e "${GREEN}  Copied original from container${NC}"
+        else
+            echo -e "${RED}  Could not obtain original file for comparison${NC}"
+            return 1
+        fi
+    fi
+
+    # ---- Step 1: Import ----
+    echo ""
+    echo -e "${BLUE}Step 1/5: Import GEMMA file${NC}"
+
+    start_time=$(date +%s)
+
     import_result=$(docker-compose exec -T nextcloud curl -s \
         -X POST \
         -u "$USERNAME:$PASSWORD" \
-        -F "archiMateFile=@/var/www/html/apps-extra/softwarecatalog/$GEMMA_FILE" \
+        -F "archiMateFile=@$CONTAINER_APP_PATH/$GEMMA_FILE" \
         -F "updateExisting=true" \
         -F "preserveIds=true" \
-        "$BASE_URL/index.php/apps/softwarecatalog/api/archimate/import")
-    
-    import_success=$(echo "$import_result" | python3 -c "import sys, json; print(json.load(sys.stdin).get('success', False))" 2>/dev/null || echo "false")
-    
-    if [ "$import_success" != "True" ] && [ "$import_success" != "true" ]; then
-        echo -e "${RED}❌ Import failed${NC}"
+        --max-time 600 \
+        "$BASE_URL/index.php/apps/softwarecatalog/api/archimate/import" 2>/dev/null || echo "{}")
+
+    end_time=$(date +%s)
+    import_duration=$((end_time - start_time))
+
+    import_success=$(echo "$import_result" | json_get_bool "success")
+
+    if [ "$import_success" != "true" ]; then
+        echo -e "${RED}  Import FAILED${NC}"
+        echo "$import_result" | python3 -m json.tool 2>/dev/null || echo "$import_result"
         return 1
     fi
-    
-    echo -e "${GREEN}✅ Import successful${NC}"
-    
-    echo -e "${BLUE}Step 2: Export to new file${NC}"
-    
-    # Export
+
+    echo -e "${GREEN}  Import successful (${import_duration}s)${NC}"
+    # Show import statistics
+    echo "$import_result" | python3 -c "
+import sys, json
+try:
+    data = json.load(sys.stdin)
+    stats = data.get('statistics', {})
+    for key, val in stats.items():
+        if isinstance(val, dict):
+            created = val.get('created', 0)
+            updated = val.get('updated', 0)
+            print(f'    {key}: {created} created, {updated} updated')
+except: pass
+" 2>/dev/null || true
+
+    # ---- Step 2: Export ----
+    echo ""
+    echo -e "${BLUE}Step 2/5: Export from database${NC}"
+
+    start_time=$(date +%s)
+
+    # Export endpoint returns raw XML directly on success, JSON only on error
     export_result=$(docker-compose exec -T nextcloud curl -s \
         -X POST \
         -u "$USERNAME:$PASSWORD" \
         -H "Content-Type: application/json" \
         -d '{"format":"xml","includeRelationships":true,"includeViews":true}' \
-        "$BASE_URL/index.php/apps/softwarecatalog/api/archimate/export")
-    
-    export_success=$(echo "$export_result" | python3 -c "import sys, json; print(json.load(sys.stdin).get('success', False))" 2>/dev/null || echo "false")
-    
-    if [ "$export_success" != "True" ] && [ "$export_success" != "true" ]; then
-        echo -e "${RED}❌ Export failed${NC}"
+        --max-time 600 \
+        "$BASE_URL/index.php/apps/softwarecatalog/api/archimate/export" 2>/dev/null || echo "{}")
+
+    end_time=$(date +%s)
+    export_duration=$((end_time - start_time))
+
+    # Check if the response is XML (success) or JSON (error)
+    if echo "$export_result" | head -5 | grep -q "<?xml\|<model"; then
+        # Direct XML response — save it directly as the exported file
+        echo "$export_result" > "$exported_host_file"
+        echo -e "${GREEN}  Export successful (${export_duration}s) -> direct XML response${NC}"
+    else
+        # JSON response — check for error
+        export_success=$(echo "$export_result" | json_get_bool "success")
+        if [ "$export_success" != "true" ]; then
+            echo -e "${RED}  Export FAILED${NC}"
+            echo "$export_result" | python3 -m json.tool 2>/dev/null || echo "$export_result"
+            return 1
+        fi
+
+        # JSON success with file_name (legacy path)
+        file_name=$(echo "$export_result" | json_get "file_name")
+        echo -e "${GREEN}  Export successful (${export_duration}s) -> $file_name${NC}"
+
+        # ---- Step 3: Download exported file ----
+        echo ""
+        echo -e "${BLUE}Step 3/5: Download exported file${NC}"
+
+        if [ -z "$file_name" ]; then
+            echo -e "${RED}  No file_name in export response, cannot download${NC}"
+            return 1
+        fi
+
+        docker-compose exec -T nextcloud curl -s \
+            -u "$USERNAME:$PASSWORD" \
+            --max-time 120 \
+            "$BASE_URL/index.php/apps/softwarecatalog/api/archimate/download/$file_name" \
+            > "$exported_host_file" 2>/dev/null
+    fi
+
+    if [ ! -s "$exported_host_file" ]; then
+        echo -e "${RED}  Exported file is empty or export failed${NC}"
+        return 1
+    fi
+
+    exported_size=$(stat -c%s "$exported_host_file" 2>/dev/null || stat -f%z "$exported_host_file" 2>/dev/null || echo "0")
+    exported_size_kb=$(echo "scale=1; $exported_size / 1024" | bc)
+    echo -e "${GREEN}  Exported file: $exported_host_file (${exported_size_kb} KB)${NC}"
+
+    # Quick sanity check: does it look like ArchiMate XML?
+    if ! head -5 "$exported_host_file" | grep -q "<model\|archimate"; then
+        echo -e "${RED}  Exported file does not look like ArchiMate XML${NC}"
+        echo "  First 3 lines:"
+        head -3 "$exported_host_file"
+        return 1
+    fi
+
+    # ---- Step 4: XSD Schema Validation ----
+    echo ""
+    echo -e "${BLUE}Step 4/5: XSD schema validation${NC}"
+
+    # Validate original
+    echo -e "${BLUE}  Validating original file...${NC}"
+    download_xsd_schema
+    xsd_available=$?
+
+    if [ $xsd_available -eq 0 ]; then
+        validate_xsd "$original_host_file"
+        original_xsd_result=$?
+
+        echo ""
+        echo -e "${BLUE}  Validating exported file...${NC}"
+        validate_xsd "$exported_host_file"
+        exported_xsd_result=$?
+
+        if [ $original_xsd_result -ne 0 ] && [ $original_xsd_result -ne 2 ]; then
+            echo -e "${YELLOW}  Note: Original file also fails XSD validation${NC}"
+        fi
+        if [ $exported_xsd_result -eq 1 ]; then
+            roundtrip_passed=false
+        fi
+    else
+        echo -e "${YELLOW}  XSD schema not available, checking well-formedness only...${NC}"
+        if command -v xmllint &>/dev/null; then
+            echo -e "${BLUE}  Original:${NC}"
+            if xmllint --noout "$original_host_file" 2>/dev/null; then
+                echo -e "${GREEN}    Well-formed XML${NC}"
+            else
+                echo -e "${RED}    NOT well-formed${NC}"
+            fi
+            echo -e "${BLUE}  Exported:${NC}"
+            if xmllint --noout "$exported_host_file" 2>/dev/null; then
+                echo -e "${GREEN}    Well-formed XML${NC}"
+            else
+                echo -e "${RED}    NOT well-formed${NC}"
+                roundtrip_passed=false
+            fi
+        else
+            echo -e "${YELLOW}  xmllint not available, skipping XML validation${NC}"
+        fi
+    fi
+
+    # ---- Step 5: Semantic Comparison ----
+    echo ""
+    echo -e "${BLUE}Step 5/5: Semantic comparison${NC}"
+
+    run_semantic_compare "$original_host_file" "$exported_host_file"
+    compare_result=$?
+
+    if [ $compare_result -eq 1 ]; then
+        roundtrip_passed=false
+    elif [ $compare_result -eq 2 ]; then
+        echo -e "${YELLOW}  Semantic comparison could not run${NC}"
+    fi
+
+    # ---- Summary ----
+    echo ""
+    echo -e "${CYAN}---- Round-trip Summary ----${NC}"
+    echo -e "${BLUE}  Import time  : ${import_duration}s${NC}"
+    echo -e "${BLUE}  Export time   : ${export_duration}s${NC}"
+    echo -e "${BLUE}  Original file : $original_host_file${NC}"
+    echo -e "${BLUE}  Exported file : $exported_host_file${NC}"
+    echo -e "${BLUE}  Compare report: $OUTPUT_DIR/comparison_report.txt${NC}"
+    echo -e "${BLUE}  JSON report   : $OUTPUT_DIR/comparison_report.json${NC}"
+
+    if [ "$roundtrip_passed" = true ]; then
+        echo -e "${GREEN}  ROUND-TRIP: ALL CHECKS PASSED${NC}"
+        return 0
+    else
+        echo -e "${RED}  ROUND-TRIP: SOME CHECKS FAILED${NC}"
+        return 1
+    fi
+}
+
+# =============================================================================
+# XSD VALIDATION (standalone — validates the original GEMMA file)
+# =============================================================================
+run_validate_test() {
+    echo -e "${CYAN}XSD VALIDATION TEST SUITE${NC}"
+    echo -e "${CYAN}=========================${NC}"
+
+    local host_file="$SCRIPT_DIR/$GEMMA_FILE"
+
+    # Get file on host
+    if [ ! -f "$host_file" ]; then
+        echo -e "${YELLOW}  File not on host, copying from container...${NC}"
+        host_file="$OUTPUT_DIR/original_gemma_validate.xml"
+        docker-compose exec -T nextcloud cat "$CONTAINER_APP_PATH/$GEMMA_FILE" > "$host_file" 2>/dev/null
+        if [ ! -s "$host_file" ]; then
+            echo -e "${RED}  Could not obtain file for validation${NC}"
+            return 1
+        fi
+    fi
+
+    # Download schema
+    download_xsd_schema
+    xsd_available=$?
+
+    # Validate
+    validate_xsd "$host_file"
+    result=$?
+
+    if [ $result -eq 0 ]; then
+        echo -e "${GREEN}  VALIDATION: PASSED${NC}"
+        return 0
+    elif [ $result -eq 2 ]; then
+        echo -e "${YELLOW}  VALIDATION: SKIPPED (tools or schema unavailable)${NC}"
+        return 0
+    else
+        echo -e "${RED}  VALIDATION: FAILED${NC}"
         return 1
     fi
-    
-    echo -e "${GREEN}✅ Export successful${NC}"
-    
-    echo -e "${BLUE}Step 3: Compare files${NC}"
-    # Note: File comparison would require downloading the exported file
-    # This is simplified for now
-    echo -e "${GREEN}✅ Round-trip test completed${NC}"
-    
-    return 0
 }
 
 # =============================================================================
 # EXPORT TESTING (Replaces test_archimate_export.sh)
 # =============================================================================
 run_export_test() {
-    echo -e "${CYAN}📤 EXPORT TEST SUITE${NC}"
-    echo -e "${CYAN}====================${NC}"
-    
+    echo -e "${CYAN}EXPORT TEST SUITE${NC}"
+    echo -e "${CYAN}=================${NC}"
+
     echo -e "${BLUE}Testing basic export functionality${NC}"
-    
-    export_result=$(docker-compose exec -T nextcloud curl -s -w "HTTP_CODE:%{http_code}" \
+
+    export_result=$(docker-compose exec -T nextcloud curl -s \
         -X POST \
         -u "$USERNAME:$PASSWORD" \
         -H "Content-Type: application/json" \
         -d '{"format":"xml","includeRelationships":true,"includeViews":true}' \
-        "$BASE_URL/index.php/apps/softwarecatalog/api/archimate/export")
-    
-    http_code=$(echo "$export_result" | tail -n1 | cut -d: -f2)
-    json_response=$(echo "$export_result" | head -n -1)
-    
-    if [ "$http_code" = "200" ]; then
-        success=$(echo "$json_response" | python3 -c "import sys, json; print(json.load(sys.stdin).get('success', False))" 2>/dev/null || echo "false")
-        if [ "$success" = "True" ] || [ "$success" = "true" ]; then
-            echo -e "${GREEN}✅ Export test passed${NC}"
-            return 0
+        "$BASE_URL/index.php/apps/softwarecatalog/api/archimate/export" 2>/dev/null || echo "{}")
+
+    local test_file="$OUTPUT_DIR/export_test.xml"
+
+    # Check if the response is XML (success) or JSON (error)
+    if echo "$export_result" | head -5 | grep -q "<?xml\|<model"; then
+        # Direct XML response
+        echo "$export_result" > "$test_file"
+        echo -e "${GREEN}  Export test passed (direct XML response)${NC}"
+    else
+        export_success=$(echo "$export_result" | json_get_bool "success")
+        if [ "$export_success" != "true" ]; then
+            echo -e "${RED}  Export failed${NC}"
+            echo "$export_result" | python3 -m json.tool 2>/dev/null || echo "$export_result"
+            return 1
+        fi
+
+        file_name=$(echo "$export_result" | json_get "file_name")
+        echo -e "${GREEN}  Export test passed (file: $file_name)${NC}"
+
+        if [ -n "$file_name" ]; then
+            docker-compose exec -T nextcloud curl -s \
+                -u "$USERNAME:$PASSWORD" \
+                "$BASE_URL/index.php/apps/softwarecatalog/api/archimate/download/$file_name" \
+                > "$test_file" 2>/dev/null
+        fi
+    fi
+
+    if [ -s "$test_file" ]; then
+        echo -e "${GREEN}  File obtained successfully${NC}"
+
+        # Well-formedness
+        if command -v xmllint &>/dev/null; then
+            if xmllint --noout "$test_file" 2>/dev/null; then
+                echo -e "${GREEN}  XML is well-formed${NC}"
+            else
+                echo -e "${RED}  XML is NOT well-formed${NC}"
+                rm -f "$test_file"
+                return 1
+            fi
+        fi
+
+        # Basic structure
+        if head -20 "$test_file" | grep -q "<model"; then
+            echo -e "${GREEN}  Contains <model> root element${NC}"
         else
-            echo -e "${RED}❌ Export failed: $json_response${NC}"
+            echo -e "${RED}  Missing <model> root element${NC}"
+            rm -f "$test_file"
             return 1
         fi
-    else
-        echo -e "${RED}❌ Export HTTP error: $http_code${NC}"
-        return 1
+
+        # Count sections
+        elements=$(grep -c "<element " "$test_file" 2>/dev/null || echo "0")
+        relationships=$(grep -c "<relationship " "$test_file" 2>/dev/null || echo "0")
+        views=$(grep -c "<view " "$test_file" 2>/dev/null || echo "0")
+        echo -e "${BLUE}  Elements: $elements, Relationships: $relationships, Views: $views${NC}"
+
+        rm -f "$test_file"
     fi
+
+    return 0
 }
 
 # =============================================================================
-# DEBUG/DIAGNOSTIC TESTING (Replaces test_archimate_import_debug.php)  
+# DEBUG/DIAGNOSTIC TESTING (Replaces test_archimate_import_debug.php)
 # =============================================================================
 run_debug_test() {
-    echo -e "${CYAN}🔍 DEBUG/DIAGNOSTIC TEST SUITE${NC}"
-    echo -e "${CYAN}===============================${NC}"
-    
+    echo -e "${CYAN}DEBUG/DIAGNOSTIC TEST SUITE${NC}"
+    echo -e "${CYAN}===========================${NC}"
+
     echo -e "${BLUE}Checking app status${NC}"
-    docker-compose exec -u 33 nextcloud php occ app:list | grep -E "(openregister|softwarecatalog)" || echo "Apps status check completed"
-    
+    docker-compose exec -u 33 -T nextcloud php occ app:list 2>/dev/null | grep -E "(openregister|softwarecatalog)" || echo "  Apps status check completed"
+
     echo -e "${BLUE}Checking configuration${NC}"
-    docker-compose exec -u 33 nextcloud php occ config:app:get softwarecatalog amef_register_id || echo "No AMEF register ID configured"
-    
+    docker-compose exec -u 33 -T nextcloud php occ config:app:get softwarecatalog amef_register_id 2>/dev/null || echo "  No AMEF register ID configured"
+
     echo -e "${BLUE}Checking database objects${NC}"
-    docker-compose exec nextcloud-mysql mysql -u nextcloud -pnextcloud nextcloud -e "SELECT COUNT(*) as total_objects FROM oc_openregister_objects;" 2>/dev/null || echo "Database check completed"
-    
-    echo -e "${GREEN}✅ Debug checks completed${NC}"
+    docker-compose exec -T nextcloud-mysql mysql -u nextcloud -pnextcloud nextcloud -e "SELECT COUNT(*) as total_objects FROM oc_openregister_objects;" 2>/dev/null || echo "  Database check completed"
+
+    echo -e "${BLUE}Checking host tools${NC}"
+    echo -n "  python3: " && (python3 --version 2>/dev/null || echo "not found")
+    echo -n "  xmllint: " && (xmllint --version 2>/dev/null | head -1 || echo "not found")
+    echo -n "  jq:      " && (jq --version 2>/dev/null || echo "not found")
+    echo -n "  bc:      " && (echo "1+1" | bc 2>/dev/null && echo "available" || echo "not found")
+
+    echo -e "${GREEN}  Debug checks completed${NC}"
     return 0
 }
 
@@ -302,60 +703,71 @@ check_gemma_file
 RESULTS=()
 
 # Run requested tests
+if [ "$VALIDATE_TEST" = true ]; then
+    echo ""
+    if run_validate_test; then
+        RESULTS+=("Validate:    PASSED")
+    else
+        RESULTS+=("Validate:    FAILED")
+    fi
+fi
+
 if [ "$PERFORMANCE_TEST" = true ]; then
     echo ""
     if run_performance_test; then
-        RESULTS+=("Performance: ✅ PASSED")
+        RESULTS+=("Performance: PASSED")
     else
-        RESULTS+=("Performance: ❌ FAILED")
+        RESULTS+=("Performance: FAILED")
     fi
 fi
 
 if [ "$ROUNDTRIP_TEST" = true ]; then
     echo ""
     if run_roundtrip_test; then
-        RESULTS+=("Round-trip: ✅ PASSED") 
+        RESULTS+=("Round-trip:  PASSED")
     else
-        RESULTS+=("Round-trip: ❌ FAILED")
+        RESULTS+=("Round-trip:  FAILED")
     fi
 fi
 
 if [ "$EXPORT_TEST" = true ]; then
     echo ""
     if run_export_test; then
-        RESULTS+=("Export: ✅ PASSED")
+        RESULTS+=("Export:      PASSED")
     else
-        RESULTS+=("Export: ❌ FAILED")  
+        RESULTS+=("Export:      FAILED")
     fi
 fi
 
 if [ "$DEBUG_TEST" = true ]; then
     echo ""
     if run_debug_test; then
-        RESULTS+=("Debug: ✅ PASSED")
+        RESULTS+=("Debug:       PASSED")
     else
-        RESULTS+=("Debug: ❌ FAILED")
+        RESULTS+=("Debug:       FAILED")
     fi
 fi
 
 # Final summary
 echo ""
-echo -e "${CYAN}📊 TEST SUITE SUMMARY${NC}"
-echo -e "${CYAN}=====================${NC}"
+echo -e "${CYAN}TEST SUITE SUMMARY${NC}"
+echo -e "${CYAN}==================${NC}"
 
 all_passed=true
 for result in "${RESULTS[@]}"; do
-    echo -e "${BLUE}  $result${NC}"
     if [[ "$result" == *"FAILED"* ]]; then
+        echo -e "${RED}  $result${NC}"
         all_passed=false
+    else
+        echo -e "${GREEN}  $result${NC}"
     fi
 done
 
 echo ""
 if [ "$all_passed" = true ]; then
-    echo -e "${GREEN}🎉 ALL TESTS PASSED!${NC}"
+    echo -e "${GREEN}ALL TESTS PASSED${NC}"
     exit 0
 else
-    echo -e "${YELLOW}⚠️  Some tests failed. Check output above.${NC}" 
+    echo -e "${YELLOW}Some tests failed. Check output above for details.${NC}"
     exit 1
 fi