diff --git a/compare_archimate.php b/compare_archimate.php
index 0dea58e2..15237fe5 100644
--- a/compare_archimate.php
+++ b/compare_archimate.php
@@ -173,68 +173,70 @@ private function compareElements(\SimpleXMLElement $original, \SimpleXMLElement
     {
         echo "\n--- Comparing Elements ---\n";
         
-        $originalElements = $original->xpath('//*[local-name()="element"]');
-        $exportedElements = $exported->xpath('//*[local-name()="element"]');
+        $originalElements = $this->indexByAttribute($original->xpath('//*[local-name()="elements"]/*[local-name()="element"]'), 'identifier');
+        $exportedElements = $this->indexByAttribute($exported->xpath('//*[local-name()="elements"]/*[local-name()="element"]'), 'identifier');
         
         $this->stats['elements_compared'] = count($originalElements);
         
-        echo sprintf("Original elements found: %d\n", count($originalElements));
-        echo sprintf("Exported elements found: %d\n", count($exportedElements));
+        echo "Original elements found: " . count($originalElements) . "\n";
+        echo "Exported elements found: " . count($exportedElements) . "\n";
         
-        // Check if exported elements have identifiers
-        $exportedHasIdentifiers = false;
-        $exportedHasXsiType = false;
+        // Check for extra elements in export
+        $extraElements = array_diff_key($exportedElements, $originalElements);
+        if (!empty($extraElements)) {
+            echo "⚠️  WARNING: Found " . count($extraElements) . " extra elements in export!\n";
+            foreach (array_slice($extraElements, 0, 5) as $id => $element) {
+                $this->addDifference('elements', $id, 'MISSING', 'EXTRA_IN_EXPORT');
+            }
+            if (count($extraElements) > 5) {
+                echo "... and " . (count($extraElements) - 5) . " more extra elements\n";
+            }
+        }
         
-        if (!empty($exportedElements)) {
-            $firstExported = $exportedElements[0];
-            $exportedHasIdentifiers = !empty((string)$firstExported['identifier']);
-            $exportedHasXsiType = !empty((string)$firstExported->attributes('xsi', true)['type']);
-            
-            echo sprintf("Exported elements have identifier attribute: %s\n", 
-                $exportedHasIdentifiers ? 'YES' : 'NO');
-            echo sprintf("Exported elements have xsi:type attribute: %s\n", 
-                $exportedHasXsiType ? 'YES' : 'NO');
+        // Check for missing elements in export
+        $missingElements = array_diff_key($originalElements, $exportedElements);
+        if (!empty($missingElements)) {
+            echo "⚠️  WARNING: Found " . count($missingElements) . " missing elements in export!\n";
+            foreach (array_slice($missingElements, 0, 5) as $id => $element) {
+                $this->addDifference('elements', $id, 'EXISTS', 'MISSING_IN_EXPORT');
+            }
+            if (count($missingElements) > 5) {
+                echo "... and " . (count($missingElements) - 5) . " more missing elements\n";
+            }
         }
         
-        // If exported elements don't have identifiers, we can't do detailed comparison
-        if (!$exportedHasIdentifiers && !empty($originalElements)) {
-            echo "❌ CRITICAL: Exported elements missing identifier attributes!\n";
-            $this->addDifference('elements', 'ALL', 'HAS_IDENTIFIERS', 'MISSING_IDENTIFIERS');
-            
-            // Show sample of what's missing
-            $sampleOriginal = $originalElements[0];
-            echo sprintf("Expected: <element identifier=\"%s\" xsi:type=\"%s\">\n",
-                (string)$sampleOriginal['identifier'],
-                (string)$sampleOriginal->attributes('xsi', true)['type']
-            );
-            echo sprintf("Actual: <element> (no attributes)\n");
-            return;
+        // Check if exported elements have required attributes
+        $hasIdentifier = true;
+        $hasXsiType = true;
+        foreach (array_slice($exportedElements, 0, 10) as $element) {
+            if (!isset($element->attributes()['identifier'])) {
+                $hasIdentifier = false;
+            }
+            // Check for xsi:type in the xsi namespace
+            $xsiAttributes = $element->attributes('xsi', true);
+            if (!isset($xsiAttributes['type'])) {
+                $hasXsiType = false;
+            }
         }
         
-        // Do detailed comparison if identifiers exist
-        $originalIndexed = $this->indexByAttribute($originalElements, 'identifier');
-        $exportedIndexed = $this->indexByAttribute($exportedElements, 'identifier');
+        echo "Exported elements have identifier attribute: " . ($hasIdentifier ? 'YES' : 'NO') . "\n";
+        echo "Exported elements have xsi:type attribute: " . ($hasXsiType ? 'YES' : 'NO') . "\n";
         
-        foreach ($originalIndexed as $id => $originalElement) {
-            if (!isset($exportedIndexed[$id])) {
-                $this->addDifference('elements', $id, 'EXISTS', 'MISSING');
-                continue;
+        // Compare common elements
+        $commonElements = array_intersect_key($originalElements, $exportedElements);
+        $comparedCount = 0;
+        foreach ($commonElements as $id => $originalElement) {
+            if ($comparedCount >= 100) { // Limit comparison to first 100 elements for performance
+                break;
             }
             
-            $exportedElement = $exportedIndexed[$id];
-            
-            // Compare xsi:type
-            $originalType = (string)$originalElement->attributes('xsi', true)['type'];
-            $exportedType = (string)$exportedElement->attributes('xsi', true)['type'];
-            if ($originalType !== $exportedType) {
-                $this->addDifference('elements', $id . '/xsi:type', $originalType, $exportedType);
-            }
+            $exportedElement = $exportedElements[$id];
             
             // Compare name
-            if ((string)$originalElement->name !== (string)$exportedElement->name) {
-                $this->addDifference('elements', $id . '/name', 
-                    (string)$originalElement->name, 
-                    (string)$exportedElement->name);
+            $originalName = (string)$originalElement->name;
+            $exportedName = (string)$exportedElement->name;
+            if ($originalName !== $exportedName) {
+                $this->addDifference('elements', $id . '/name', $originalName, $exportedName);
             }
             
             // Compare documentation
@@ -246,56 +248,64 @@ private function compareElements(\SimpleXMLElement $original, \SimpleXMLElement
             
             // Compare properties
             $this->compareProperties($originalElement, $exportedElement, 'elements', $id);
+            
+            $comparedCount++;
         }
         
-        // Check for extra elements in export
-        foreach ($exportedElements as $id => $exportedElement) {
-            if (!isset($originalElements[$id])) {
-                $this->addDifference('elements', $id, 'MISSING', 'EXISTS');
-            }
+        if (count($commonElements) > 100) {
+            echo "Note: Only compared first 100 elements for performance\n";
         }
         
-        echo "Elements comparison completed: " . count($originalElements) . " elements\n";
+        echo "Elements comparison completed: " . $comparedCount . " elements\n";
     }
     
     private function compareRelationships(\SimpleXMLElement $original, \SimpleXMLElement $exported): void
     {
         echo "\n--- Comparing Relationships ---\n";
         
-        $originalRels = $this->indexByAttribute($original->xpath('//*[local-name()="relationship"]'), 'identifier');
-        $exportedRels = $this->indexByAttribute($exported->xpath('//*[local-name()="relationship"]'), 'identifier');
+        $originalRels = $this->indexByAttribute($original->xpath('//*[local-name()="relationships"]/*[local-name()="relationship"]'), 'identifier');
+        $exportedRels = $this->indexByAttribute($exported->xpath('//*[local-name()="relationships"]/*[local-name()="relationship"]'), 'identifier');
         
         $this->stats['relationships_compared'] = count($originalRels);
         
-        foreach ($originalRels as $id => $originalRel) {
-            if (!isset($exportedRels[$id])) {
-                $this->addDifference('relationships', $id, 'EXISTS', 'MISSING');
-                continue;
+        echo "Original relationships found: " . count($originalRels) . "\n";
+        echo "Exported relationships found: " . count($exportedRels) . "\n";
+        
+        // Check for extra relationships in export
+        $extraRels = array_diff_key($exportedRels, $originalRels);
+        if (!empty($extraRels)) {
+            echo "⚠️  WARNING: Found " . count($extraRels) . " extra relationships in export!\n";
+            foreach (array_slice($extraRels, 0, 5) as $id => $rel) {
+                $this->addDifference('relationships', $id, 'MISSING', 'EXTRA_IN_EXPORT');
             }
-            
-            $exportedRel = $exportedRels[$id];
-            
-            // Compare xsi:type
-            $originalType = (string)$originalRel->attributes('xsi', true)['type'];
-            $exportedType = (string)$exportedRel->attributes('xsi', true)['type'];
-            if ($originalType !== $exportedType) {
-                $this->addDifference('relationships', $id . '/xsi:type', $originalType, $exportedType);
+            if (count($extraRels) > 5) {
+                echo "... and " . (count($extraRels) - 5) . " more extra relationships\n";
             }
-            
-            // Compare source and target
-            $originalSource = (string)$originalRel->attributes()['source'];
-            $exportedSource = (string)$exportedRel->attributes()['source'];
-            if ($originalSource !== $exportedSource) {
-                $this->addDifference('relationships', $id . '/source', $originalSource, $exportedSource);
+        }
+        
+        // Check for missing relationships in export
+        $missingRels = array_diff_key($originalRels, $exportedRels);
+        if (!empty($missingRels)) {
+            echo "⚠️  WARNING: Found " . count($missingRels) . " missing relationships in export!\n";
+            foreach (array_slice($missingRels, 0, 5) as $id => $rel) {
+                $this->addDifference('relationships', $id, 'EXISTS', 'MISSING_IN_EXPORT');
             }
-            
-            $originalTarget = (string)$originalRel->attributes()['target'];
-            $exportedTarget = (string)$exportedRel->attributes()['target'];
-            if ($originalTarget !== $exportedTarget) {
-                $this->addDifference('relationships', $id . '/target', $originalTarget, $exportedTarget);
+            if (count($missingRels) > 5) {
+                echo "... and " . (count($missingRels) - 5) . " more missing relationships\n";
+            }
+        }
+        
+        // Compare common relationships (limit to first 100 for performance)
+        $commonRels = array_intersect_key($originalRels, $exportedRels);
+        $comparedCount = 0;
+        foreach ($commonRels as $id => $originalRel) {
+            if ($comparedCount >= 100) {
+                break;
             }
             
-            // Compare name (if present)
+            $exportedRel = $exportedRels[$id];
+            
+            // Compare name
             $originalName = (string)$originalRel->name;
             $exportedName = (string)$exportedRel->name;
             if ($originalName !== $exportedName) {
@@ -311,9 +321,15 @@ private function compareRelationships(\SimpleXMLElement $original, \SimpleXMLEle
             
             // Compare properties
             $this->compareProperties($originalRel, $exportedRel, 'relationships', $id);
+            
+            $comparedCount++;
+        }
+        
+        if (count($commonRels) > 100) {
+            echo "Note: Only compared first 100 relationships for performance\n";
         }
         
-        echo "Relationships comparison completed: " . count($originalRels) . " relationships\n";
+        echo "Relationships comparison completed: " . $comparedCount . " relationships\n";
     }
     
     private function compareOrganizations(\SimpleXMLElement $original, \SimpleXMLElement $exported): void
@@ -351,6 +367,33 @@ private function comparePropertyDefinitions(\SimpleXMLElement $original, \Simple
         
         $this->stats['property_definitions_compared'] = count($originalProps);
         
+        echo "Original property definitions found: " . count($originalProps) . "\n";
+        echo "Exported property definitions found: " . count($exportedProps) . "\n";
+        
+        // Check for extra property definitions in export
+        $extraProps = array_diff_key($exportedProps, $originalProps);
+        if (!empty($extraProps)) {
+            echo "⚠️  WARNING: Found " . count($extraProps) . " extra property definitions in export!\n";
+            foreach (array_slice($extraProps, 0, 5) as $id => $prop) {
+                $this->addDifference('property_definitions', $id, 'MISSING', 'EXTRA_IN_EXPORT');
+            }
+            if (count($extraProps) > 5) {
+                echo "... and " . (count($extraProps) - 5) . " more extra property definitions\n";
+            }
+        }
+        
+        // Check for missing property definitions in export
+        $missingProps = array_diff_key($originalProps, $exportedProps);
+        if (!empty($missingProps)) {
+            echo "⚠️  WARNING: Found " . count($missingProps) . " missing property definitions in export!\n";
+            foreach (array_slice($missingProps, 0, 5) as $id => $prop) {
+                $this->addDifference('property_definitions', $id, 'EXISTS', 'MISSING_IN_EXPORT');
+            }
+            if (count($missingProps) > 5) {
+                echo "... and " . (count($missingProps) - 5) . " more missing property definitions\n";
+            }
+        }
+        
         foreach ($originalProps as $id => $originalProp) {
             if (!isset($exportedProps[$id])) {
                 $this->addDifference('property_definitions', $id, 'EXISTS', 'MISSING');
@@ -409,35 +452,66 @@ private function compareViews(\SimpleXMLElement $original, \SimpleXMLElement $ex
     {
         echo "\n--- Comparing Views ---\n";
         
-        $originalViews = $this->indexByAttribute($original->xpath('//*[local-name()="view"]'), 'identifier');
-        $exportedViews = $this->indexByAttribute($exported->xpath('//*[local-name()="view"]'), 'identifier');
+        $originalViews = $this->indexByAttribute($original->xpath('//*[local-name()="views"]//*[local-name()="view"]'), 'identifier');
+        $exportedViews = $this->indexByAttribute($exported->xpath('//*[local-name()="views"]//*[local-name()="view"]'), 'identifier');
         
         $this->stats['views_compared'] = count($originalViews);
         
-        foreach ($originalViews as $id => $originalView) {
-            if (!isset($exportedViews[$id])) {
-                $this->addDifference('views', $id, 'EXISTS', 'MISSING');
-                continue;
+        echo "Original views found: " . count($originalViews) . "\n";
+        echo "Exported views found: " . count($exportedViews) . "\n";
+        
+        // Check for extra views in export
+        $extraViews = array_diff_key($exportedViews, $originalViews);
+        if (!empty($extraViews)) {
+            echo "⚠️  WARNING: Found " . count($extraViews) . " extra views in export!\n";
+            foreach (array_slice($extraViews, 0, 5) as $id => $view) {
+                $this->addDifference('views', $id, 'MISSING', 'EXTRA_IN_EXPORT');
+            }
+            if (count($extraViews) > 5) {
+                echo "... and " . (count($extraViews) - 5) . " more extra views\n";
+            }
+        }
+        
+        // Check for missing views in export
+        $missingViews = array_diff_key($originalViews, $exportedViews);
+        if (!empty($missingViews)) {
+            echo "⚠️  WARNING: Found " . count($missingViews) . " missing views in export!\n";
+            foreach (array_slice($missingViews, 0, 5) as $id => $view) {
+                $this->addDifference('views', $id, 'EXISTS', 'MISSING_IN_EXPORT');
+            }
+            if (count($missingViews) > 5) {
+                echo "... and " . (count($missingViews) - 5) . " more missing views\n";
+            }
+        }
+        
+        // Compare common views (limit to first 50 for performance)
+        $commonViews = array_intersect_key($originalViews, $exportedViews);
+        $comparedCount = 0;
+        foreach ($commonViews as $id => $originalView) {
+            if ($comparedCount >= 50) {
+                break;
             }
             
             $exportedView = $exportedViews[$id];
             
-            // Compare xsi:type
-            $originalType = (string)$originalView->attributes('xsi', true)['type'];
-            $exportedType = (string)$exportedView->attributes('xsi', true)['type'];
-            if ($originalType !== $exportedType) {
-                $this->addDifference('views', $id . '/xsi:type', $originalType, $exportedType);
-            }
-            
             // Compare name
-            if ((string)$originalView->name !== (string)$exportedView->name) {
-                $this->addDifference('views', $id . '/name', 
-                    (string)$originalView->name, 
-                    (string)$exportedView->name);
+            $originalName = (string)$originalView->name;
+            $exportedName = (string)$exportedView->name;
+            if ($originalName !== $exportedName) {
+                $this->addDifference('views', $id . '/name', $originalName, $exportedName);
             }
+            
+            // Compare properties
+            $this->compareProperties($originalView, $exportedView, 'views', $id);
+            
+            $comparedCount++;
+        }
+        
+        if (count($commonViews) > 50) {
+            echo "Note: Only compared first 50 views for performance\n";
         }
         
-        echo "Views comparison completed: " . count($originalViews) . " views\n";
+        echo "Views comparison completed: " . $comparedCount . " views\n";
     }
     
     private function compareProperties(\SimpleXMLElement $originalElement, \SimpleXMLElement $exportedElement, string $section, string $id): void
diff --git a/lib/Service/ArchiMateExportService.php b/lib/Service/ArchiMateExportService.php
index dd4fe48b..461a1dc1 100644
--- a/lib/Service/ArchiMateExportService.php
+++ b/lib/Service/ArchiMateExportService.php
@@ -677,7 +677,8 @@ private function addObjectDirectlyToXml(\SimpleXMLElement $folder, array $object
             if ($sectionName === 'views') {
                 $this->addViewDataToXmlNode($objectNode, $xmlData);
             } else {
-            $this->addCleanDataToXmlNode($objectNode, $xmlData);
+                // Pass section information to help with attribute handling
+                $this->addCleanDataToXmlNode($objectNode, $xmlData, $sectionName);
             }
         }
     }
@@ -890,7 +891,7 @@ private function cleanObjectDataForXml(array $object): array
     /**
      * Add clean data to XML node with proper ArchiMate structure
      */
-    private function addCleanDataToXmlNode(\SimpleXMLElement $node, array $data): void
+    private function addCleanDataToXmlNode(\SimpleXMLElement $node, array $data, ?string $sectionName = null): void
     {
         // Extract attributes from various possible locations
         $attributes = [];
@@ -905,8 +906,18 @@ private function addCleanDataToXmlNode(\SimpleXMLElement $node, array $data): vo
             foreach ($data['_attributes'] as $attrKey => $attrValue) {
                 // Clean up attribute keys (remove colons, etc.)
                 $cleanKey = str_replace(':', '', $attrKey);
-                if ($cleanKey === 'type' && !isset($attributes['xsi:type'])) {
-                    $attributes['xsi:type'] = (string)$attrValue;
+                
+                // Check if this is a property definition to handle 'type' attribute correctly
+                $isPropertyDefinition = ($sectionName === 'property_definitions');
+                
+                if ($cleanKey === 'type') {
+                    if ($isPropertyDefinition) {
+                        // For property definitions, 'type' should remain as 'type' attribute
+                        $attributes['type'] = (string)$attrValue;
+                    } else {
+                        // For other elements, 'type' becomes 'xsi:type'
+                        $attributes['xsi:type'] = (string)$attrValue;
+                    }
                 } elseif (in_array($cleanKey, ['identifier', 'source', 'target', 'accessType'])) {
                     $attributes[$cleanKey] = (string)$attrValue;
                 }
@@ -916,18 +927,17 @@ private function addCleanDataToXmlNode(\SimpleXMLElement $node, array $data): vo
         // 3. Look for xsi:type in various forms (including double underscore from import service)
         foreach (['xsi:type', 'xsi_type', '_xsi:type', '_xsi__type', '_type'] as $typeKey) {
             if (isset($data[$typeKey])) {
-                // For property definitions, _type should be 'type' attribute, not 'xsi:type'
-                // Detect property definitions by checking if we have a section field or if this is in property_definitions
-                $isPropertyDefinition = (isset($data['section']) && $data['section'] === 'property_definitions') || 
-                                       (isset($data['_section']) && $data['_section'] === 'property_definitions') ||
-                                       ($typeKey === '_type' && !isset($attributes['xsi:type']));
+                // Check if this is a property definition to handle type attributes correctly
+                $isPropertyDefinition = ($sectionName === 'property_definitions');
                 
-                if ($isPropertyDefinition && $typeKey === '_type' && !isset($attributes['type'])) {
+                if ($typeKey === '_type' && $isPropertyDefinition && !isset($attributes['type'])) {
+                    // For property definitions, _type becomes 'type' attribute
                     $attributes['type'] = (string)$data[$typeKey];
                     break;
-                } elseif (!$isPropertyDefinition && !isset($attributes['xsi:type'])) {
-                $attributes['xsi:type'] = (string)$data[$typeKey];
-                break;
+                } elseif (in_array($typeKey, ['xsi:type', 'xsi_type', '_xsi:type', '_xsi__type']) && !isset($attributes['xsi:type'])) {
+                    // For other elements, these become 'xsi:type' attribute
+                    $attributes['xsi:type'] = (string)$data[$typeKey];
+                    break;
                 }
             }
         }
@@ -935,11 +945,20 @@ private function addCleanDataToXmlNode(\SimpleXMLElement $node, array $data): vo
         // 4. Look for other attributes in various forms  
         foreach (['source', 'target', 'accessType', 'type'] as $attrName) {
             if (isset($data[$attrName]) && !isset($attributes[$attrName])) {
-                // For 'type', only use if we don't have xsi:type
-                if ($attrName === 'type' && isset($attributes['xsi:type'])) {
-                    continue;
+                // Check if this is a property definition to handle 'type' attribute correctly
+                $isPropertyDefinition = ($sectionName === 'property_definitions');
+                
+                if ($attrName === 'type') {
+                    if ($isPropertyDefinition) {
+                        // For property definitions, 'type' should remain as 'type' attribute
+                        $attributes['type'] = (string)$data[$attrName];
+                    } elseif (!isset($attributes['xsi:type'])) {
+                        // For other elements, 'type' becomes 'xsi:type' if not already set
+                        $attributes['xsi:type'] = (string)$data[$attrName];
+                    }
+                } else {
+                    $attributes[$attrName] = (string)$data[$attrName];
                 }
-                $attributes[$attrName] = (string)$data[$attrName];
             }
         }
         
@@ -967,7 +986,7 @@ private function addCleanDataToXmlNode(\SimpleXMLElement $node, array $data): vo
                 // Handle xml:lang in various forms (including double underscore from import service)
                 foreach (['xml:lang', '_xml:lang', '_xml__lang', 'xml_lang'] as $langKey) {
                     if (isset($value[$langKey])) {
-                        $nameNode->addAttribute('xml:lang', $value[$langKey]);
+                        $nameNode->addAttribute('xml:lang', $value[$langKey], 'http://www.w3.org/XML/1998/namespace');
                         break;
                     }
                 }
@@ -979,7 +998,7 @@ private function addCleanDataToXmlNode(\SimpleXMLElement $node, array $data): vo
                 // Handle xml:lang in various forms (including double underscore from import service)
                 foreach (['xml:lang', '_xml:lang', '_xml__lang', 'xml_lang'] as $langKey) {
                     if (isset($value[$langKey])) {
-                        $docNode->addAttribute('xml:lang', $value[$langKey]);
+                        $docNode->addAttribute('xml:lang', $value[$langKey], 'http://www.w3.org/XML/1998/namespace');
                         break;
                     }
                 }
@@ -993,7 +1012,7 @@ private function addCleanDataToXmlNode(\SimpleXMLElement $node, array $data): vo
                 // Handle xml:lang in various forms (including double underscore from import service)
                 foreach (['xml:lang', '_xml:lang', '_xml__lang', 'xml_lang'] as $langKey) {
                     if (isset($value[$langKey])) {
-                        $valueNode->addAttribute('xml:lang', $value[$langKey]);
+                        $valueNode->addAttribute('xml:lang', $value[$langKey], 'http://www.w3.org/XML/1998/namespace');
                         break;
                     }
                 }
@@ -1069,7 +1088,7 @@ private function addPropertiesToXml(\SimpleXMLElement $node, array $properties):
                     // Add xml:lang if present in various forms (including double underscore from import service)
                     foreach (['xml:lang', '_xml:lang', '_xml__lang', 'xml_lang'] as $langKey) {
                         if (isset($property['value'][$langKey])) {
-                            $valueNode->addAttribute('xml:lang', $property['value'][$langKey]);
+                            $valueNode->addAttribute('xml:lang', $property['value'][$langKey], 'http://www.w3.org/XML/1998/namespace');
                             break;
                         }
                     }
@@ -1111,7 +1130,7 @@ private function addModelMetadataToXml(\SimpleXMLElement $xml, array $modelMetad
             if (is_array($modelMetadata['name']) && isset($modelMetadata['name']['_value'])) {
                 $nameNode[0] = (string)$modelMetadata['name']['_value'];
                 if (isset($modelMetadata['name']['xml:lang'])) {
-                    $nameNode->addAttribute('xml:lang', $modelMetadata['name']['xml:lang']);
+                    $nameNode->addAttribute('xml:lang', $modelMetadata['name']['xml:lang'], 'http://www.w3.org/XML/1998/namespace');
                 }
             } elseif (is_string($modelMetadata['name'])) {
                 $nameNode[0] = $modelMetadata['name'];
@@ -1124,7 +1143,7 @@ private function addModelMetadataToXml(\SimpleXMLElement $xml, array $modelMetad
             if (is_array($modelMetadata['documentation']) && isset($modelMetadata['documentation']['_value'])) {
                 $docNode[0] = (string)$modelMetadata['documentation']['_value'];
                 if (isset($modelMetadata['documentation']['xml:lang'])) {
-                    $docNode->addAttribute('xml:lang', $modelMetadata['documentation']['xml:lang']);
+                    $docNode->addAttribute('xml:lang', $modelMetadata['documentation']['xml:lang'], 'http://www.w3.org/XML/1998/namespace');
                 }
             } elseif (is_string($modelMetadata['documentation'])) {
                 $docNode[0] = $modelMetadata['documentation'];
diff --git a/lib/Settings/softwarecatalogus_register.json b/lib/Settings/softwarecatalogus_register.json
index a68c9b1c..ebd6a4f7 100644
--- a/lib/Settings/softwarecatalogus_register.json
+++ b/lib/Settings/softwarecatalogus_register.json
@@ -147,7 +147,10 @@
                 "groups": null,
                 "authorization": null,
                 "deleted": null,
-                "configuration": null
+                "configuration": {
+                    "objectNameField": "naam",
+                    "objectDescriptionField": "beschrijving"
+                }
             },
             "voorziening": {
                 "uri": null,
@@ -156,7 +159,7 @@
                 "description": "Een generieke voorziening (software product)",
                 "version": "0.0.80",
                 "summary": "",
-                "icon": null,
+                "icon": "ApplicationCog",
                 "required": [
                     "naam"
                 ],
@@ -1114,7 +1117,8 @@
                 },
                 "deleted": null,
                 "configuration": {
-                    "objectDescriptionField": ""
+                    "objectNameField": "naam",
+                    "objectDescriptionField": "beschrijving"
                 }
             },
             "contactpersoon": {
@@ -1124,7 +1128,7 @@
                 "description": "Contactgegevens van een persoon",
                 "version": "0.0.17",
                 "summary": "",
-                "icon": null,
+                "icon": "AccountMultiple",
                 "required": [
                     "organisatie",
                     "e-mailadres"
@@ -1349,7 +1353,7 @@
                 "description": "Een organisatie die voorzieningen aanbiedt",
                 "version": "0.0.90",
                 "summary": "",
-                "icon": null,
+                "icon": "OfficeBuildingOutline",
                 "required": [
                     "naam",
                     "type",
@@ -1837,7 +1841,7 @@
                 "deleted": null,
                 "configuration": {
                     "objectNameField": "naam",
-                    "objectDescriptionField": "beschrijvingKort"
+                    "objectDescriptionField": "type"
                 }
             },
             "voorzieninggebruik": {
@@ -2311,8 +2315,8 @@
                 "authorization": null,
                 "deleted": null,
                 "configuration": {
-                    "objectNameField": "",
-                    "objectDescriptionField": ""
+                    "objectNameField": "organisatie",
+                    "objectDescriptionField": "status"
                 }
             },
             "contract": {
@@ -2322,7 +2326,7 @@
                 "description": "Een formele overeenkomst voor het inzetten van een VoorzieningAanbod op een VoorzieningGebruik",
                 "version": "0.0.4",
                 "summary": "",
-                "icon": null,
+                "icon": "FileDocumentEdit",
                 "required": [
                     "voorzieningAanbod",
                     "voorzieningGebruik",
@@ -2529,7 +2533,7 @@
                 "description": "Een specifieke standaard waaraan een voorziening kan voldoen",
                 "version": "0.0.3",
                 "summary": "",
-                "icon": null,
+                "icon": "FileDocumentCheck",
                 "required": [
                     "naam"
                 ],
@@ -2622,7 +2626,7 @@
                 "description": "Beoordeling van een voorziening",
                 "version": "0.0.3",
                 "summary": "",
-                "icon": null,
+                "icon": "Star",
                 "required": [
                     "voorziening",
                     "score"
@@ -2815,7 +2819,10 @@
                 "groups": null,
                 "authorization": null,
                 "deleted": null,
-                "configuration": null
+                "configuration": {
+                    "objectNameField": "type",
+                    "objectDescriptionField": "beschrijvingKort"
+                }
             },
             "beoordeeling": {
                 "uri": null,
@@ -5052,7 +5059,7 @@
                 "description": "Schema voor compliancy en standaard ondersteuning",
                 "version": "0.0.1",
                 "summary": "",
-                "icon": null,
+                "icon": "CheckCircle",
                 "required": [],
                 "properties": {
                     "ondersteuntStandaardversie": {
@@ -5092,7 +5099,10 @@
                 "groups": null,
                 "authorization": null,
                 "deleted": null,
-                "configuration": null
+                "configuration": {
+                    "objectNameField": "ondersteuntStandaardversie",
+                    "objectDescriptionField": "moduleIsCompliant"
+                }
             },
             "moduleGebruik": {
                 "uri": null,
@@ -5174,7 +5184,7 @@
                 "description": "Schema voor module versies",
                 "version": "0.0.1",
                 "summary": "",
-                "icon": null,
+                "icon": "ViewModule",
                 "required": [],
                 "properties": {
                     "module": {
@@ -5286,7 +5296,10 @@
                 "groups": null,
                 "authorization": null,
                 "deleted": null,
-                "configuration": null
+                "configuration": {
+                    "objectNameField": "module",
+                    "objectDescriptionField": "beschrijvingKort"
+                }
             }
         },
         "objects": []
diff --git a/src/components/GenericObjectTable.vue b/src/components/GenericObjectTable.vue
index aea79b0e..cc1e4b4d 100644
--- a/src/components/GenericObjectTable.vue
+++ b/src/components/GenericObjectTable.vue
@@ -59,6 +59,20 @@ import { objectStore, navigationStore } from '../store/store.js'
 						</NcActionButton>
 					</NcActions>
 
+					<!-- Filters -->
+					<div v-if="filters.length > 0" class="viewFilters">
+						<div v-for="filter in filters" :key="filter.key" class="filterItem">
+							<label :for="`filter-${filter.key}`" class="filterLabel">{{ filter.label }}:</label>
+							<NcSelect
+								:id="`filter-${filter.key}`"
+								class="filterSelect"
+								:value="getActiveFilterOption(filter)"
+								:options="filter.options"
+								:clearable="false"
+								@option:selected="setFilter(filter.key, $event)" />
+						</div>
+					</div>
+
 					<!-- View Mode Switch -->
 					<div class="viewModeSwitchContainer">
 						<NcCheckboxRadioSwitch
@@ -156,49 +170,109 @@ import { objectStore, navigationStore } from '../store/store.js'
 			<div v-else>
 				<template v-if="viewMode === 'cards'">
 					<div class="cardGrid">
-						<div v-for="item in paginatedObjects" :key="getObjectId(item)" class="card">
-							<div class="cardHeader">
-								<h2 v-tooltip.bottom="getObjectSummary(item)">
-									<component :is="cardIcon" :size="20" />
-									{{ getObjectTitle(item) }}
-								</h2>
-								<NcActions :primary="true" menu-name="Actions">
-									<template #icon>
-										<DotsHorizontal :size="20" />
-									</template>
-									<NcActionButton
-										v-for="action in objectActions"
-										:key="action.id"
-										close-after-click
-										:disabled="action.condition && !action.condition(item)"
-										@click="executeObjectAction(action, item)">
+						<!-- Custom Card Component -->
+						<template v-if="customCardComponent">
+							<component :is="customCardComponent"
+								v-for="item in paginatedObjects"
+								:key="getObjectId(item)"
+								:item="item"
+								:object-actions="objectActions"
+								:card-icon="cardIcon" />
+						</template>
+
+						<!-- Default Generic Cards -->
+						<template v-else>
+							<div v-for="item in paginatedObjects"
+								:key="getObjectId(item)"
+								class="card">
+								<div class="cardHeader">
+									<h2 v-tooltip.bottom="getObjectSummary(item)">
+										<component :is="cardIcon" :size="20" />
+										{{ getObjectTitle(item) }}
+									</h2>
+									<NcActions :primary="true" menu-name="Actions">
 										<template #icon>
-											<component :is="action.icon" :size="20" />
+											<DotsHorizontal :size="20" />
 										</template>
-										{{ action.label }}
-									</NcActionButton>
-								</NcActions>
+										<NcActionButton
+											v-for="action in objectActions"
+											:key="action.id"
+											close-after-click
+											:disabled="action.condition && !action.condition(item)"
+											@click="executeObjectAction(action, item)">
+											<template #icon>
+												<component :is="action.icon" :size="20" />
+											</template>
+											{{ action.label }}
+										</NcActionButton>
+									</NcActions>
+								</div>
+								<!-- Card Content -->
+								<div v-if="cardDisplayMode === 'description'" class="cardDescription">
+									<p v-if="getObjectSummary(item)" class="summaryText">
+										{{ getObjectSummary(item) }}
+									</p>
+									<p v-else class="noSummaryText">
+										{{ t('opencatalogi', 'No description available') }}
+									</p>
+
+									<!-- Show key properties in a compact format -->
+									<div v-if="getKeyProperties(item).length > 0" class="keyProperties">
+										<span v-for="property in getKeyProperties(item)"
+											:key="property.key"
+											class="keyProperty">
+											<strong>{{ property.label }}:</strong> {{ property.value }}
+										</span>
+									</div>
+								</div>
+
+								<div v-else-if="cardDisplayMode === 'properties'" class="cardProperties">
+									<!-- Card Statistics Table -->
+									<table class="statisticsTable">
+										<thead>
+											<tr>
+												<th>{{ t('opencatalogi', 'Property') }}</th>
+												<th>{{ t('opencatalogi', 'Value') }}</th>
+												<th>{{ t('opencatalogi', 'Status') }}</th>
+											</tr>
+										</thead>
+										<tbody>
+											<tr v-for="property in getCardProperties(item)" :key="property.key">
+												<td>{{ property.label }}</td>
+												<td class="truncatedText">
+													{{ property.value }}
+												</td>
+												<td>{{ property.status }}</td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+
+								<div v-else-if="cardDisplayMode === 'mixed'" class="cardMixed">
+									<!-- Description first -->
+									<div class="cardDescription">
+										<p v-if="getObjectSummary(item)" class="summaryText">
+											{{ getObjectSummary(item) }}
+										</p>
+										<p v-else class="noSummaryText">
+											{{ t('opencatalogi', 'No description available') }}
+										</p>
+									</div>
+
+									<!-- Compact properties table -->
+									<table v-if="getCardProperties(item).length > 0" class="statisticsTable compact">
+										<tbody>
+											<tr v-for="property in getCardProperties(item).slice(0, 3)" :key="property.key">
+												<td><strong>{{ property.label }}</strong></td>
+												<td class="truncatedText">
+													{{ property.value }}
+												</td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
 							</div>
-							<!-- Card Statistics Table -->
-							<table class="statisticsTable">
-								<thead>
-									<tr>
-										<th>{{ t('opencatalogi', 'Property') }}</th>
-										<th>{{ t('opencatalogi', 'Value') }}</th>
-										<th>{{ t('opencatalogi', 'Status') }}</th>
-									</tr>
-								</thead>
-								<tbody>
-									<tr v-for="property in getCardProperties(item)" :key="property.key">
-										<td>{{ property.label }}</td>
-										<td class="truncatedText">
-											{{ property.value }}
-										</td>
-										<td>{{ property.status }}</td>
-									</tr>
-								</tbody>
-							</table>
-						</div>
+						</template>
 					</div>
 				</template>
 				<template v-else>
@@ -357,6 +431,7 @@ import {
 	NcActionCaption,
 	NcCheckboxRadioSwitch,
 	NcButton,
+	NcSelect,
 } from '@nextcloud/vue'
 import { VueDraggable } from 'vue-draggable-plus'
 
@@ -378,6 +453,7 @@ export default {
 		NcActionCaption,
 		NcCheckboxRadioSwitch,
 		NcButton,
+		NcSelect,
 		VueDraggable,
 		DotsHorizontal,
 		FormatListChecks,
@@ -512,25 +588,81 @@ export default {
 			type: String,
 			default: null,
 		},
+		/**
+		 * Display mode for cards: 'properties' shows property table, 'description' shows description, 'mixed' shows both
+		 */
+		cardDisplayMode: {
+			type: String,
+			default: 'properties',
+			validator: value => ['properties', 'description', 'mixed'].includes(value),
+		},
+		/**
+		 * Custom card component to use instead of the default card
+		 */
+		customCardComponent: {
+			type: [String, Object],
+			default: null,
+		},
+		/**
+		 * Available filters for this object type
+		 */
+		filters: {
+			type: Array,
+			default: () => [],
+		},
 	},
 
 	data() {
 		return {
 			viewMode: 'cards',
 			localSelectedObjects: [],
+			activeFilters: {},
 		}
 	},
 
 	computed: {
 		filteredObjects() {
-			return objectStore.getCollection(this.objectType)?.results || []
+			let objects = objectStore.getCollection(this.objectType)?.results || []
+
+			// Apply active filters
+			Object.keys(this.activeFilters).forEach(filterKey => {
+				const filterValue = this.activeFilters[filterKey]
+				if (filterValue && filterValue !== 'all') {
+					objects = objects.filter(obj => obj[filterKey] === filterValue)
+				}
+			})
+
+			return objects
 		},
 		currentPagination() {
 			const pagination = objectStore.getPagination(this.objectType)
+			console.info(`GenericObjectTable: Pagination for ${this.objectType}:`, {
+				pagination,
+				filteredObjectsLength: this.filteredObjects.length,
+			})
 			return pagination
 		},
 		paginatedObjects() {
-			return this.filteredObjects
+			// Check if we should use server-side pagination
+			// Server-side pagination is when we have proper pagination metadata AND
+			// the total from server matches the actual results length (indicating server handled pagination)
+			const hasServerPagination = this.currentPagination?.page && 
+				this.currentPagination?.limit && 
+				this.currentPagination?.total &&
+				this.filteredObjects.length <= this.currentPagination.limit
+
+			if (hasServerPagination) {
+				// Server has already paginated the results
+				return this.filteredObjects
+			}
+			
+			// Client-side pagination - split the full result set into pages
+			const pageSize = this.currentPagination?.limit || 20
+			const currentPage = this.currentPagination?.page || 1
+			const startIndex = (currentPage - 1) * pageSize
+			const endIndex = startIndex + pageSize
+			
+			return this.filteredObjects.slice(startIndex, endIndex)
 		},
 		selectedObjects() {
 			// Use store-managed selected objects if available, otherwise use local state
@@ -670,11 +802,26 @@ export default {
 		},
 
 		getObjectTitle(item) {
-			return item?.title || item?.name || item?.['@self']?.name || this.getObjectId(item) || 'Unknown'
+			// For organizations, prioritize naam field which is the proper Dutch name field
+			if (this.objectType === 'organisatie' && item?.naam) {
+				return item.naam
+			}
+
+			// For other objects or fallback, use the @self.name (which we fixed) or other fallbacks
+			return item?.title || item?.name || item?.naam || item?.['@self']?.name || this.getObjectId(item) || 'Unknown'
 		},
 
 		getObjectSummary(item) {
-			return item?.summary || item?.description || ''
+			// For organizations, create a meaningful description from available fields
+			if (this.objectType === 'organisatie') {
+				if (item?.beschrijvingKort) return item.beschrijvingKort
+				if (item?.beschrijvingLang) return item.beschrijvingLang
+				if (item?.type && item?.naam) return `${item.type} organisatie`
+				if (item?.type) return item.type
+			}
+
+			// For other object types, use standard fields
+			return item?.summary || item?.description || item?.beschrijvingKort || item?.beschrijvingLang || ''
 		},
 
 		getColumnValue(item, column) {
@@ -701,6 +848,15 @@ export default {
 			})).filter(prop => prop.value !== 'N/A')
 		},
 
+		getKeyProperties(item) {
+			// Show only the first few most important properties in a compact format
+			return this.orderedEnabledColumns.slice(0, 3).map(column => ({
+				key: column.key || column.id,
+				label: column.label,
+				value: this.getColumnValue(item, column),
+			})).filter(prop => prop.value !== 'N/A' && prop.value !== null && prop.value !== undefined)
+		},
+
 		getActionDisabled(action) {
 			if (typeof action.disabled === 'function') {
 				return action.disabled()
@@ -773,6 +929,25 @@ export default {
 			}
 		},
 
+		/**
+		 * Get the active filter option for a given filter
+		 * @param {object} filter - The filter configuration
+		 * @return {object} The currently active filter option
+		 */
+		getActiveFilterOption(filter) {
+			const activeValue = this.activeFilters[filter.key] || 'all'
+			return filter.options.find(option => option.value === activeValue) || filter.options[0]
+		},
+
+		/**
+		 * Set a filter value
+		 * @param {string} filterKey - The filter key
+		 * @param {object} option - The selected filter option
+		 */
+		setFilter(filterKey, option) {
+			this.$set(this.activeFilters, filterKey, option.value)
+		},
+
 		refreshObjects() {
 			if (this.refreshFunction) {
 				this.refreshFunction()
@@ -827,6 +1002,7 @@ export default {
 	align-items: center;
 	margin-bottom: 20px;
 	gap: 16px;
+	flex-wrap: wrap;
 }
 
 .viewInfo {
@@ -878,6 +1054,54 @@ export default {
 	min-width: 0;
 }
 
+.cardDescription {
+	margin-top: 12px;
+}
+
+.summaryText {
+	font-size: 14px;
+	line-height: 1.4;
+	color: var(--color-main-text);
+	margin: 0 0 12px 0;
+}
+
+.noSummaryText {
+	font-size: 14px;
+	color: var(--color-text-lighter);
+	font-style: italic;
+	margin: 0 0 12px 0;
+}
+
+.keyProperties {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+	padding-top: 8px;
+	border-top: 1px solid var(--color-border-dark);
+}
+
+.keyProperty {
+	font-size: 12px;
+	color: var(--color-main-text);
+}
+
+.keyProperty strong {
+	color: var(--color-text-lighter);
+	font-weight: 600;
+}
+
+.cardProperties {
+	margin-top: 12px;
+}
+
+.cardMixed {
+	margin-top: 12px;
+}
+
+.cardMixed .cardDescription {
+	margin-bottom: 12px;
+}
+
 .statisticsTable {
 	width: 100%;
 	border-collapse: collapse;
@@ -897,6 +1121,101 @@ export default {
 	font-size: 12px;
 }
 
+.statisticsTable.compact {
+	font-size: 12px;
+}
+
+.statisticsTable.compact td {
+	padding: 4px 8px;
+}
+
+.truncatedText {
+	max-width: 200px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+/* Filter Styles */
+.viewFilters {
+	display: flex;
+	align-items: center;
+	gap: 16px;
+	flex-wrap: wrap;
+}
+
+.filterItem {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+}
+
+.filterLabel {
+	font-size: 14px;
+	font-weight: 500;
+	color: var(--color-text-lighter);
+	white-space: nowrap;
+}
+
+.filterSelect {
+	min-width: 120px;
+}
+
+/* Pagination Styles */
+.viewPagination {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-top: 24px;
+	padding: 16px;
+	background: var(--color-main-background);
+	border: 1px solid var(--color-border);
+	border-radius: var(--border-radius);
+	gap: 16px;
+	flex-wrap: wrap;
+}
+
+.viewPaginationInfo {
+	display: flex;
+	align-items: center;
+	color: var(--color-text-lighter);
+	font-size: 14px;
+}
+
+.viewPaginationNav {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	flex-wrap: wrap;
+}
+
+.viewPaginationNumbers {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+}
+
+.viewPaginationEllipsis {
+	padding: 6px 8px;
+	color: var(--color-text-lighter);
+}
+
+.viewPaginationPageSize {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+}
+
+.viewPaginationPageSize label {
+	font-size: 14px;
+	color: var(--color-text-lighter);
+	white-space: nowrap;
+}
+
+.pagination-page-size-select {
+	min-width: 80px;
+}
+
 .viewTableContainer {
 	overflow-x: auto;
 	border: 1px solid var(--color-border);
diff --git a/src/components/PaginationComponent.vue b/src/components/PaginationComponent.vue
index 526b586d..a3fe4f92 100644
--- a/src/components/PaginationComponent.vue
+++ b/src/components/PaginationComponent.vue
@@ -240,5 +240,77 @@ export default {
 </script>
 
 <style scoped>
-/* All pagination styles are in main.css - no component-specific styles needed */
+/* Pagination Styles */
+.viewPagination {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-top: 24px;
+	padding: 16px;
+	background: var(--color-main-background);
+	border: 1px solid var(--color-border);
+	border-radius: var(--border-radius);
+	gap: 16px;
+	flex-wrap: wrap;
+}
+
+.viewPaginationInfo {
+	display: flex;
+	align-items: center;
+	color: var(--color-text-lighter);
+	font-size: 14px;
+}
+
+.viewPaginationNav {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	flex-wrap: wrap;
+}
+
+.viewPaginationNumbers {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+}
+
+.viewPaginationEllipsis {
+	padding: 6px 8px;
+	color: var(--color-text-lighter);
+}
+
+.viewPaginationPageSize {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+}
+
+.viewPaginationPageSize label {
+	font-size: 14px;
+	color: var(--color-text-lighter);
+	white-space: nowrap;
+}
+
+.pagination-page-size-select {
+	min-width: 80px;
+}
+
+/* Responsive adjustments */
+@media (max-width: 768px) {
+	.viewPagination {
+		flex-direction: column;
+		align-items: stretch;
+		gap: 12px;
+	}
+	
+	.viewPaginationNav {
+		justify-content: center;
+		flex-wrap: wrap;
+	}
+	
+	.viewPaginationNumbers {
+		justify-content: center;
+		flex-wrap: wrap;
+	}
+}
 </style>
diff --git a/src/components/cards/OrganisatieCard.vue b/src/components/cards/OrganisatieCard.vue
new file mode 100644
index 00000000..26902347
--- /dev/null
+++ b/src/components/cards/OrganisatieCard.vue
@@ -0,0 +1,337 @@
+/**
+ * OrganisatieCard.vue
+ * Custom card component for displaying organisatie objects
+ * @category Components
+ * @package softwarecatalog
+ * @author Ruben Linde
+ * @copyright 2024
+ * @license AGPL-3.0-or-later
+ * @version 1.0.0
+ * @link https://github.com/opencatalogi/softwarecatalog
+ */
+
+<template>
+	<div class="organisatieCard">
+		<div class="cardHeader">
+			<h2 v-tooltip.bottom="getOrganisatieSummary(item)">
+				<component :is="cardIcon" :size="20" />
+				{{ getOrganisatieTitle(item) }}
+			</h2>
+			<NcActions :primary="true" menu-name="Actions">
+				<template #icon>
+					<DotsHorizontal :size="20" />
+				</template>
+				<NcActionButton
+					v-for="action in objectActions"
+					:key="action.id"
+					close-after-click
+					:disabled="action.condition && !action.condition(item)"
+					@click="executeObjectAction(action, item)">
+					<template #icon>
+						<component :is="action.icon" :size="20" />
+					</template>
+					{{ action.label }}
+				</NcActionButton>
+			</NcActions>
+		</div>
+
+		<!-- Custom Organisation Content -->
+		<div class="organisatieContent">
+			<!-- Organisation Type Badge -->
+			<div class="organisatieBadges">
+				<span v-if="item.type" class="typeBadge" :class="`type-${item.type.toLowerCase()}`">
+					{{ item.type }}
+				</span>
+				<span v-if="item.status" class="statusBadge" :class="`status-${item.status.toLowerCase()}`">
+					{{ item.status }}
+				</span>
+			</div>
+
+			<!-- Organisation Description -->
+			<div class="organisatieDescription">
+				<p v-if="item.beschrijvingKort" class="beschrijvingKort">
+					{{ item.beschrijvingKort }}
+				</p>
+				<p v-else-if="item.beschrijvingLang" class="beschrijvingLang">
+					{{ truncateText(item.beschrijvingLang, 150) }}
+				</p>
+				<p v-else class="noDescription">
+					{{ t('softwarecatalog', 'Geen beschrijving beschikbaar') }}
+				</p>
+			</div>
+
+			<!-- Organisation Details -->
+			<div class="organisatieDetails">
+				<div v-if="item.website" class="detailItem">
+					<Globe :size="16" />
+					<a :href="formatWebsiteUrl(item.website)" target="_blank" rel="noopener">
+						{{ item.website }}
+					</a>
+				</div>
+				<div v-if="item['e-mailadres']" class="detailItem">
+					<Email :size="16" />
+					<a :href="`mailto:${item['e-mailadres']}`">
+						{{ item['e-mailadres'] }}
+					</a>
+				</div>
+				<div v-if="item.telefoonnummer" class="detailItem">
+					<Phone :size="16" />
+					<span>{{ item.telefoonnummer }}</span>
+				</div>
+				<div v-if="item.kvkNummer" class="detailItem">
+					<Certificate :size="16" />
+					<span>KvK: {{ item.kvkNummer }}</span>
+				</div>
+			</div>
+
+			<!-- Contactpersonen Count -->
+			<div v-if="item.contactpersonen && item.contactpersonen.length > 0" class="contactCount">
+				<AccountMultiple :size="16" />
+				<span>{{ item.contactpersonen.length }} contactpersonen</span>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import { NcActions, NcActionButton } from '@nextcloud/vue'
+import DotsHorizontal from 'vue-material-design-icons/DotsHorizontal.vue'
+import Globe from 'vue-material-design-icons/Web.vue'
+import Email from 'vue-material-design-icons/Email.vue'
+import Phone from 'vue-material-design-icons/Phone.vue'
+import Certificate from 'vue-material-design-icons/Certificate.vue'
+import AccountMultiple from 'vue-material-design-icons/AccountMultiple.vue'
+
+export default {
+	name: 'OrganisatieCard',
+	components: {
+		NcActions,
+		NcActionButton,
+		DotsHorizontal,
+		Globe,
+		Email,
+		Phone,
+		Certificate,
+		AccountMultiple,
+	},
+	props: {
+		/**
+		 * The organisation item data
+		 */
+		item: {
+			type: Object,
+			required: true,
+		},
+		/**
+		 * Available actions for this organisation
+		 */
+		objectActions: {
+			type: Array,
+			default: () => [],
+		},
+		/**
+		 * Icon component for the card
+		 */
+		cardIcon: {
+			type: [String, Object],
+			required: true,
+		},
+	},
+	methods: {
+		/**
+		 * Get the display title for the organisation
+		 * @param {object} item - The organisation object
+		 * @return {string} The title to display
+		 */
+		getOrganisatieTitle(item) {
+			return item?.naam || item?.name || item?.['@self']?.name || 'Unknown Organisation'
+		},
+
+		/**
+		 * Get the summary/tooltip text for the organisation
+		 * @param {object} item - The organisation object
+		 * @return {string} The summary text
+		 */
+		getOrganisatieSummary(item) {
+			if (item?.beschrijvingKort) return item.beschrijvingKort
+			if (item?.beschrijvingLang) return item.beschrijvingLang
+			if (item?.type && item?.naam) return `${item.type} organisatie`
+			if (item?.type) return item.type
+			return ''
+		},
+
+		/**
+		 * Execute an object action
+		 * @param {object} action - The action to execute
+		 * @param {object} item - The item to execute the action on
+		 */
+		executeObjectAction(action, item) {
+			if (action.handler) {
+				action.handler(item)
+			}
+		},
+
+		/**
+		 * Format website URL to ensure it has protocol
+		 * @param {string} url - The website URL
+		 * @return {string} Formatted URL with protocol
+		 */
+		formatWebsiteUrl(url) {
+			if (!url) return '#'
+			if (url.startsWith('http://') || url.startsWith('https://')) {
+				return url
+			}
+			return `https://${url}`
+		},
+
+		/**
+		 * Truncate text to specified length
+		 * @param {string} text - Text to truncate
+		 * @param {number} maxLength - Maximum length
+		 * @return {string} Truncated text
+		 */
+		truncateText(text, maxLength = 150) {
+			if (!text || text.length <= maxLength) return text
+			return text.substring(0, maxLength).trim() + '...'
+		},
+	},
+}
+</script>
+
+<style scoped>
+.organisatieCard {
+	border: 1px solid var(--color-border);
+	border-radius: var(--border-radius-large);
+	padding: 16px;
+	background: var(--color-main-background);
+	transition: box-shadow 0.2s ease;
+}
+
+.organisatieCard:hover {
+	box-shadow: 0 2px 8px var(--color-box-shadow);
+}
+
+.cardHeader {
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+	margin-bottom: 12px;
+}
+
+.cardHeader h2 {
+	margin: 0;
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	font-size: 16px;
+	font-weight: 600;
+	flex: 1;
+	min-width: 0;
+	color: var(--color-main-text);
+}
+
+.organisatieContent {
+	display: flex;
+	flex-direction: column;
+	gap: 12px;
+}
+
+.organisatieBadges {
+	display: flex;
+	gap: 8px;
+	flex-wrap: wrap;
+}
+
+.typeBadge, .statusBadge {
+	padding: 4px 8px;
+	border-radius: var(--border-radius-pill);
+	font-size: 12px;
+	font-weight: 600;
+	text-transform: capitalize;
+}
+
+.typeBadge {
+	background: var(--color-primary-light);
+	color: var(--color-primary-element-text);
+}
+
+.typeBadge.type-gemeente {
+	background: #e3f2fd;
+	color: #1565c0;
+}
+
+.typeBadge.type-leverancier {
+	background: #f3e5f5;
+	color: #7b1fa2;
+}
+
+.typeBadge.type-samenwerking {
+	background: #e8f5e8;
+	color: #2e7d32;
+}
+
+.statusBadge {
+	background: var(--color-background-dark);
+	color: var(--color-text-lighter);
+}
+
+.statusBadge.status-actief {
+	background: #e8f5e8;
+	color: #2e7d32;
+}
+
+.statusBadge.status-concept {
+	background: #fff3e0;
+	color: #f57c00;
+}
+
+.organisatieDescription {
+	line-height: 1.4;
+}
+
+.beschrijvingKort, .beschrijvingLang {
+	margin: 0;
+	color: var(--color-main-text);
+	font-size: 14px;
+}
+
+.noDescription {
+	margin: 0;
+	color: var(--color-text-lighter);
+	font-style: italic;
+	font-size: 14px;
+}
+
+.organisatieDetails {
+	display: flex;
+	flex-direction: column;
+	gap: 6px;
+}
+
+.detailItem {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	font-size: 13px;
+	color: var(--color-main-text);
+}
+
+.detailItem a {
+	color: var(--color-primary);
+	text-decoration: none;
+}
+
+.detailItem a:hover {
+	text-decoration: underline;
+}
+
+.contactCount {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+	font-size: 13px;
+	color: var(--color-text-lighter);
+	padding-top: 8px;
+	border-top: 1px solid var(--color-border-dark);
+}
+</style>
diff --git a/src/main.js b/src/main.js
index 11977c19..b5f6029e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,7 +2,10 @@ import Vue from 'vue'
 import { PiniaVuePlugin } from 'pinia'
 import pinia from './pinia.js'
 import App from './App.vue'
+import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
+
 Vue.mixin({ methods: { t, n } })
+Vue.directive('tooltip', Tooltip)
 
 Vue.use(PiniaVuePlugin)
 
diff --git a/src/navigation/MainMenu.vue b/src/navigation/MainMenu.vue
index b638b1f1..5a31c49d 100644
--- a/src/navigation/MainMenu.vue
+++ b/src/navigation/MainMenu.vue
@@ -1,62 +1,330 @@
-<script setup>
-import { navigationStore } from '../store/store.js'
-</script>
-
 <template>
 	<NcAppNavigation>
 		<NcAppNavigationList>
-			<NcAppNavigationItem :active="navigationStore.selected === 'dashboard'" name="Dashboard" @click="navigationStore.setSelected('dashboard')">
+			<!-- Dashboard -->
+			<NcAppNavigationItem
+				:active="navigationStore.selected === 'dashboard'"
+				name="Dashboard"
+				@click="navigationStore.setSelected('dashboard')">
 				<template #icon>
-					<Finance :size="20" />
+					<ViewDashboard :size="20" />
 				</template>
 			</NcAppNavigationItem>
-			<NcAppNavigationItem :active="navigationStore.selected === 'organisaties'" name="Organisaties" @click="navigationStore.setSelected('organisaties')">
+
+			<!-- Dynamic menu items based on available schemas -->
+			<NcAppNavigationItem
+				v-for="menuItem in dynamicMenuItems"
+				:key="menuItem.slug"
+				:active="navigationStore.selected === menuItem.routeName"
+				:name="menuItem.title"
+				@click="navigationStore.setSelected(menuItem.routeName)">
 				<template #icon>
-					<AccountGroup :size="20" />
+					<component :is="menuItem.icon" :size="20" />
 				</template>
 			</NcAppNavigationItem>
 		</NcAppNavigationList>
-		<NcAppNavigationSettings>
-			<NcAppNavigationItem :active="navigationStore.selected === 'dashboard'" name="Dashboard" @click="navigationStore.setSelected('dashboard')">
-				<template #icon>
-					<Finance :size="20" />
-				</template>
-			</NcAppNavigationItem>
-			<NcAppNavigationItem :active="navigationStore.selected === 'organisaties'" name="Organisaties" @click="navigationStore.setSelected('organisaties')">
-				<template #icon>
-					<AccountGroup :size="20" />
-				</template>
-			</NcAppNavigationItem>
-		</NcAppNavigationSettings>
 	</NcAppNavigation>
 </template>
 <script>
-
 import {
 	NcAppNavigation,
 	NcAppNavigationList,
-	NcAppNavigationSettings,
 	NcAppNavigationItem,
 } from '@nextcloud/vue'
+import { navigationStore, objectStore } from '../store/store.js'
 
 // Icons
-import Finance from 'vue-material-design-icons/Finance.vue'
-import AccountGroup from 'vue-material-design-icons/AccountGroup.vue'
+import ViewDashboard from 'vue-material-design-icons/ViewDashboard.vue'
+import OfficeBuildingOutline from 'vue-material-design-icons/OfficeBuildingOutline.vue'
+import AccountMultiple from 'vue-material-design-icons/AccountMultiple.vue'
+import ApplicationCog from 'vue-material-design-icons/ApplicationCog.vue'
+import FileDocumentEdit from 'vue-material-design-icons/FileDocumentEdit.vue'
+import CheckCircle from 'vue-material-design-icons/CheckCircle.vue'
+import ViewModule from 'vue-material-design-icons/ViewModule.vue'
+import FileDocumentCheck from 'vue-material-design-icons/FileDocumentCheck.vue'
+import Star from 'vue-material-design-icons/Star.vue'
 
+/**
+ * @class MainMenu
+ * @module Navigation
+ * @package
+ * @author Claude AI
+ * @copyright 2023 Conduction
+ * @license EUPL-1.2
+ * @version 1.0.0
+ * @see https://github.com/OpenCatalogi/opencatalogi
+ *
+ * Dynamic navigation menu that generates menu items based on available schemas.
+ */
 export default {
 	name: 'MainMenu',
 	components: {
-		// components
 		NcAppNavigation,
 		NcAppNavigationList,
 		NcAppNavigationItem,
-		// icons
-		Finance,
-		AccountGroup,
+		// Icons
+		ViewDashboard,
+		OfficeBuildingOutline,
+		AccountMultiple,
+		ApplicationCog,
+		FileDocumentEdit,
+		CheckCircle,
+		ViewModule,
+		FileDocumentCheck,
+		Star,
+	},
+
+	data() {
+		return {
+			navigationStore,
+			objectStore, // Make objectStore reactive
+		}
+	},
+
+	computed: {
+		/**
+		 * Generate dynamic menu items from voorzieningen register schemas
+		 * @return {Array} Array of menu item configurations
+		 */
+		dynamicMenuItems() {
+			if (!this.objectStore.settings?.availableRegisters) {
+				console.warn('MainMenu: No available registers found', this.objectStore.settings)
+				return []
+			}
+
+			// Find the voorzieningen register
+			const voorzieningenRegister = this.objectStore.settings.availableRegisters.find(
+				register => register.slug === 'voorzieningen'
+			)
+
+			if (!voorzieningenRegister?.schemas) {
+				console.warn('MainMenu: No voorzieningen register found or no schemas available')
+				return []
+			}
+
+			const menuItems = []
+			
+			console.info('MainMenu: Building dynamic menu items from voorzieningen register', {
+				registerTitle: voorzieningenRegister.title,
+				schemaCount: voorzieningenRegister.schemas.length,
+			})
+
+			// Create menu items for each schema in the voorzieningen register
+			voorzieningenRegister.schemas.forEach(schema => {
+				console.info(`MainMenu: Processing schema ${schema.slug}`, {
+					title: schema.title,
+					description: schema.description,
+					shouldInclude: this.shouldIncludeSchemaInMenu(schema),
+				})
+
+				if (this.shouldIncludeSchemaInMenu(schema)) {
+					const menuItem = {
+						slug: schema.slug,
+						title: schema.title,
+						routeName: this.getRouteNameFromSchema(schema),
+						icon: this.getIconComponentFromSchema(schema),
+						order: this.getMenuOrderFromSchema(schema),
+					}
+					console.info(`MainMenu: Adding menu item for ${schema.slug}`, menuItem)
+					menuItems.push(menuItem)
+				}
+			})
+
+			// Sort menu items by predefined order
+			return menuItems.sort((a, b) => a.order - b.order)
+		},
+	},
+
+	watch: {
+		// Watch for changes in objectStore.settings to trigger menu updates
+		'objectStore.settings': {
+			handler(newSettings) {
+				console.info('MainMenu: Settings changed, menu should update', newSettings)
+				this.$forceUpdate()
+			},
+			deep: true,
+		},
+	},
+
+	async mounted() {
+		// Ensure settings are loaded for dynamic menu generation
+		if (!this.objectStore.settings && !this.objectStore.isLoading('settings')) {
+			try {
+				await this.objectStore.fetchSettings()
+			} catch (error) {
+				console.error('Failed to load settings for menu generation:', error)
+			}
+		}
 	},
+
 	methods: {
-		openLink(url, type = '') {
-			window.open(url, type)
+		/**
+		 * Check if schema should be included in the menu
+		 * @param {object} schema - Schema object from voorzieningen register
+		 * @return {boolean} True if should be included in menu
+		 */
+		shouldIncludeSchemaInMenu(schema) {
+			// Include all schemas from voorzieningen register that have a configuration with icon
+			// or are in our list of important schemas
+			const alwaysIncludeSchemas = [
+				'organisatie',
+				'contactpersoon',
+				'voorziening',
+				'contract',
+				'standaard',
+				'review',
+				'compliancy',
+				'moduleversie',
+				'voorzieningaanbod',
+				'voorzieningmodule',
+				'kwetsbaarheid',
+				'beoordeeling',
+				'verklaring',
+				'koppeling',
+			]
+
+			// Include if it's in our always-include list or if it has a configuration with icon
+			return alwaysIncludeSchemas.includes(schema.slug) || 
+				(schema.configuration && this.hasIconForSchema(schema.slug))
+		},
+
+		/**
+		 * Check if schema has an icon defined in the schema configurations
+		 * @param {string} schemaSlug - Schema slug
+		 * @return {boolean} True if schema has an icon
+		 */
+		hasIconForSchema(schemaSlug) {
+			// Check if we have schema configurations with icon data
+			const schemaConfigs = this.objectStore.settings?.schemaConfigurations
+			if (schemaConfigs) {
+				for (const register of Object.keys(schemaConfigs)) {
+					const registerData = schemaConfigs[register]
+					if (registerData?.schemas?.[schemaSlug]?.icon) {
+						return true
+					}
+				}
+			}
+			return false
+		},
+
+		/**
+		 * Get route name for schema object
+		 * @param {object} schema - Schema object from voorzieningen register
+		 * @return {string} Route name
+		 */
+		getRouteNameFromSchema(schema) {
+			// Convert schema slug to plural form for route names
+			const pluralMap = {
+				organisatie: 'organisaties',
+				contactpersoon: 'contactpersonen',
+				voorziening: 'voorzieningen',
+				voorzieningaanbod: 'voorzieningaanbods',
+				voorzieningversie: 'voorzieningversies',
+				voorzieningmodule: 'voorzieningmodules',
+				contract: 'contracten',
+				standaard: 'standaarden',
+				review: 'reviews',
+				compliancy: 'compliancies',
+				moduleversie: 'moduleversies',
+				kwetsbaarheid: 'kwetsbaarheden',
+				beoordeeling: 'beoordelingen',
+				verklaring: 'verklaringen',
+				koppeling: 'koppelingen',
+				koppelinggebruik: 'koppelinggebruiks',
+				modulegebruik: 'modulegebruiks',
+				property: 'properties',
+			}
+			return pluralMap[schema.slug] || `${schema.slug}s`
+		},
+
+		/**
+		 * Get menu order for schema object
+		 * @param {object} schema - Schema object from voorzieningen register
+		 * @return {number} Menu order
+		 */
+		getMenuOrderFromSchema(schema) {
+			// Define the order of menu items based on importance
+			const orderMap = {
+				organisatie: 1,
+				contactpersoon: 2,
+				voorziening: 3,
+				voorzieningaanbod: 4,
+				voorzieningmodule: 5,
+				moduleversie: 6,
+				contract: 7,
+				standaard: 8,
+				compliancy: 9,
+				review: 10,
+				kwetsbaarheid: 11,
+				beoordeeling: 12,
+				verklaring: 13,
+				koppeling: 14,
+				koppelinggebruik: 15,
+				modulegebruik: 16,
+				property: 17,
+			}
+			return orderMap[schema.slug] || 999
+		},
+
+		/**
+		 * Get icon component for schema object
+		 * @param {object} schema - Schema object from voorzieningen register
+		 * @return {object} Vue icon component
+		 */
+		getIconComponentFromSchema(schema) {
+			// First check if we have icon in schema configurations
+			const schemaConfigs = this.objectStore.settings?.schemaConfigurations
+			if (schemaConfigs) {
+				for (const register of Object.keys(schemaConfigs)) {
+					const registerData = schemaConfigs[register]
+					if (registerData?.schemas?.[schema.slug]?.icon) {
+						return this.getIconComponent(registerData.schemas[schema.slug].icon)
+					}
+				}
+			}
+
+			// Fallback to predefined icon mapping based on schema slug
+			const iconMap = {
+				organisatie: 'OfficeBuildingOutline',
+				contactpersoon: 'AccountMultiple',
+				voorziening: 'ApplicationCog',
+				voorzieningaanbod: 'ApplicationCog',
+				voorzieningmodule: 'ViewModule',
+				moduleversie: 'ViewModule',
+				contract: 'FileDocumentEdit',
+				standaard: 'FileDocumentCheck',
+				compliancy: 'CheckCircle',
+				review: 'Star',
+				kwetsbaarheid: 'CheckCircle',
+				beoordeeling: 'Star',
+				verklaring: 'FileDocumentCheck',
+				koppeling: 'ViewModule',
+				koppelinggebruik: 'ViewModule',
+				modulegebruik: 'ViewModule',
+				property: 'ApplicationCog',
+			}
+
+			const iconName = iconMap[schema.slug] || 'OfficeBuildingOutline'
+			return this.getIconComponent(iconName)
+		},
+
+		/**
+		 * Get icon component for icon name
+		 * @param {string} iconName - Icon name from schema
+		 * @return {object} Vue icon component
+		 */
+		getIconComponent(iconName) {
+			const iconMap = {
+				OfficeBuildingOutline,
+				AccountMultiple,
+				ApplicationCog,
+				FileDocumentEdit,
+				CheckCircle,
+				ViewModule,
+				FileDocumentCheck,
+				Star,
+			}
+			return iconMap[iconName] || OfficeBuildingOutline
 		},
 	},
 }
diff --git a/src/store/modules/object.js b/src/store/modules/object.js
index 7c2d4c31..7b3af381 100644
--- a/src/store/modules/object.js
+++ b/src/store/modules/object.js
@@ -588,9 +588,10 @@ export const useObjectStore = defineStore('object', {
 		 * @param {string} slug - The schema slug to use as type identifier
 		 * @param {string} schema - The schema ID
 		 * @param {string} register - The register ID
+		 * @param {boolean} fetchCollection - Whether to fetch the collection immediately
 		 * @return {Promise<void>}
 		 */
-		async registerObjectType(slug, schema, register) {
+		async registerObjectType(slug, schema, register, fetchCollection = false) {
 			if (this.objectTypeRegistry[slug]) {
 				console.info(`Object type ${slug} already registered`)
 				return
@@ -610,8 +611,10 @@ export const useObjectStore = defineStore('object', {
 				}
 			}
 
-			// Fetch the initial collection
-			await this.fetchCollection(slug)
+			// Optionally fetch the initial collection
+			if (fetchCollection) {
+				await this.fetchCollection(slug)
+			}
 		},
 
 		/**
@@ -666,13 +669,33 @@ export const useObjectStore = defineStore('object', {
 				throw new Error('Settings not loaded')
 			}
 
-			const config = this.settings.configuration
-			const source = config[`${objectType}_source`]
-			const schema = config[`${objectType}_schema`]
-			const register = config[`${objectType}_register`]
+			// Check for voorzieningen-specific configuration first (our primary use case)
+			if (objectType === 'organisatie') {
+				const voorzieningenConfig = this.settings.voorzieningen || {}
+				if (voorzieningenConfig.register && voorzieningenConfig.organisatie_schema) {
+					return {
+						source: 'openregister',
+						schema: voorzieningenConfig.organisatie_schema,
+						register: voorzieningenConfig.register,
+					}
+				}
+			}
+
+			// Check legacy settings format in configuration object
+			const config = this.settings.configuration || {}
+
+			// Try voorzieningen-prefixed configuration first
+			let source = config[`voorzieningen_${objectType}_source`] || config[`${objectType}_source`]
+			const schema = config[`voorzieningen_${objectType}_schema`] || config[`${objectType}_schema`]
+			const register = config[`voorzieningen_${objectType}_register`] || config[`${objectType}_register`] || config.voorzieningen_register
+
+			// Default to openregister as source
+			if (!source) {
+				source = 'openregister'
+			}
 
-			if (!source || !schema || !register) {
-				throw new Error(`Invalid configuration for object type: ${objectType}`)
+			if (!schema || !register) {
+				throw new Error(`Invalid configuration for object type: ${objectType}. Schema: ${schema}, Register: ${register}`)
 			}
 
 			return { source, schema, register }
@@ -695,7 +718,8 @@ export const useObjectStore = defineStore('object', {
 			} else {
 				config = this.getSchemaConfig(type)
 			}
-			const baseUrl = '/index.php/apps/softwarecatalog/api/objects'
+			// Use OpenRegister API directly - objects are stored in OpenRegister, not SoftwareCatalog
+			const baseUrl = '/index.php/apps/openregister/api/objects'
 
 			// Ensure register and schema are strings (extract id if they're objects)
 			const registerId = typeof config.register === 'object' ? config.register?.id || config.register?.uuid : config.register
@@ -912,15 +936,77 @@ export const useObjectStore = defineStore('object', {
 		 */
 		async fetchSettings() {
 			try {
-				const response = await fetch('/index.php/apps/softwarecatalog/api/settings')
-				if (!response.ok) throw new Error('Failed to fetch settings')
-				this.settings = await response.json()
+				// Fetch main settings
+				const settingsResponse = await fetch('/index.php/apps/softwarecatalog/api/settings')
+				if (!settingsResponse.ok) throw new Error('Failed to fetch settings')
+				this.settings = await settingsResponse.json()
+
+				// Fetch voorzieningen-specific configuration for better performance
+				try {
+					const voorzieningenResponse = await fetch('/index.php/apps/softwarecatalog/api/voorzieningen/config')
+					if (voorzieningenResponse.ok) {
+						const voorzieningenData = await voorzieningenResponse.json()
+						if (voorzieningenData.success && voorzieningenData.config) {
+							this.settings.voorzieningen = voorzieningenData.config
+						}
+					}
+				} catch (error) {
+					console.warn('Failed to fetch voorzieningen config:', error)
+				}
+
+				// After loading settings, initialize voorzieningen object types
+				await this.initializeVoorzieningenObjectTypes()
 			} catch (error) {
 				console.error('Error fetching settings:', error)
 				throw error
 			}
 		},
 
+		/**
+		 * Initialize voorzieningen object types from settings
+		 * @return {Promise<void>}
+		 */
+		async initializeVoorzieningenObjectTypes() {
+			try {
+				console.info('ObjectStore: Initializing voorzieningen object types from settings')
+				
+				if (!this.settings?.availableRegisters) {
+					console.warn('ObjectStore: No available registers found for voorzieningen initialization')
+					return
+				}
+
+				// Find the voorzieningen register
+				const voorzieningenRegister = this.settings.availableRegisters.find(
+					register => register.slug === 'voorzieningen'
+				)
+
+				if (!voorzieningenRegister?.schemas) {
+					console.warn('ObjectStore: No voorzieningen register found or no schemas available')
+					return
+				}
+
+				let registeredCount = 0
+
+				// Register each schema from the voorzieningen register
+				for (const schema of voorzieningenRegister.schemas) {
+					console.info(`ObjectStore: Registering voorzieningen object type: ${schema.slug}`, {
+						title: schema.title,
+						description: schema.description,
+						id: schema.id,
+						uuid: schema.uuid,
+					})
+
+					// Register the object type using schema ID and voorzieningen register ID
+					await this.registerObjectType(schema.slug, schema.id, voorzieningenRegister.id)
+					registeredCount++
+				}
+
+				console.info(`ObjectStore: Registered ${registeredCount} voorzieningen object types from register`)
+			} catch (error) {
+				console.warn('Failed to initialize voorzieningen object types:', error)
+			}
+		},
+
 		/**
 		 * Create new object
 		 * @param {string} type - Object type
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index ad3b267c..3f9f99b3 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -616,9 +616,9 @@ export const useSettingsStore = defineStore('settings', {
 					this.voorzieningenSchemas = reg.schemas || []
 				}
 			}
-            // AMEF register (singular key only; fallback kept for robustness)
-            if (this.amefRawConfig && (this.amefRawConfig.register || this.amefRawConfig.register_id)) {
-                const regId = (this.amefRawConfig.register || this.amefRawConfig.register_id).toString()
+			// AMEF register (singular key only; fallback kept for robustness)
+			if (this.amefRawConfig && (this.amefRawConfig.register || this.amefRawConfig.register_id)) {
+				const regId = (this.amefRawConfig.register || this.amefRawConfig.register_id).toString()
 				const reg = this.settings.availableRegisters.find(r => r.id.toString() === regId)
 				if (reg) {
 					this.amefRegister = {
@@ -634,11 +634,11 @@ export const useSettingsStore = defineStore('settings', {
 		 * Populate schema selections using the focused endpoint configs
 		 */
 		populateSchemaSelectionsFromFocused() {
-            const findOption = (schemaId, options) => {
-                if (!schemaId || !options || !Array.isArray(options)) return null
-                const id = schemaId.toString()
-                return options.find(o => o && o.value && o.value.toString() === id) || null
-            }
+			const findOption = (schemaId, options) => {
+				if (!schemaId || !options || !Array.isArray(options)) return null
+				const id = schemaId.toString()
+				return options.find(o => o && o.value && o.value.toString() === id) || null
+			}
 
 			// Voorzieningen schemas
 			const vc = this.voorzieningenRawConfig || {}
@@ -662,44 +662,44 @@ export const useSettingsStore = defineStore('settings', {
 				['module_versie_schema', 'voorzieningen_module_versie'],
 				['sector_schema', 'voorzieningen_sector'],
 			]
-            vMap.forEach(([cfgKey, uiKey]) => {
-                if (vc[cfgKey]) {
-                    const opt = findOption(vc[cfgKey], this.voorzieningenSchemaOptions)
-                    if (opt) {
-                        this.configuration[uiKey].schema = opt
-                    }
-                }
-            })
-
-            // AMEF schemas (singular keys)
-            const ac = this.amefRawConfig || {}
-            if (ac.organization_schema || ac.organizations_schema) {
-                const opt = findOption((ac.organization_schema || ac.organizations_schema), this.amefSchemaOptions)
-                if (opt) this.configuration.amef_organization.schema = opt
-            }
-            if (ac.element_schema || ac.elements_schema) {
-                const opt = findOption((ac.element_schema || ac.elements_schema), this.amefSchemaOptions)
-                if (opt) this.configuration.amef_elements.schema = opt
+			vMap.forEach(([cfgKey, uiKey]) => {
+				if (vc[cfgKey]) {
+					const opt = findOption(vc[cfgKey], this.voorzieningenSchemaOptions)
+					if (opt) {
+						this.configuration[uiKey].schema = opt
+					}
+				}
+			})
+
+			// AMEF schemas (singular keys)
+			const ac = this.amefRawConfig || {}
+			if (ac.organization_schema || ac.organizations_schema) {
+				const opt = findOption((ac.organization_schema || ac.organizations_schema), this.amefSchemaOptions)
+				if (opt) this.configuration.amef_organization.schema = opt
 			}
-            if (ac.relation_schema || ac.relationships_schema) {
-                const opt = findOption((ac.relation_schema || ac.relationships_schema), this.amefSchemaOptions)
-                if (opt) this.configuration.amef_relationships.schema = opt
+			if (ac.element_schema || ac.elements_schema) {
+				const opt = findOption((ac.element_schema || ac.elements_schema), this.amefSchemaOptions)
+				if (opt) this.configuration.amef_elements.schema = opt
 			}
-            if (ac.view_schema || ac.views_schema) {
-                const opt = findOption((ac.view_schema || ac.views_schema), this.amefSchemaOptions)
-                if (opt) this.configuration.amef_views.schema = opt
+			if (ac.relation_schema || ac.relationships_schema) {
+				const opt = findOption((ac.relation_schema || ac.relationships_schema), this.amefSchemaOptions)
+				if (opt) this.configuration.amef_relationships.schema = opt
 			}
-            if (ac.model_schema || ac.models_schema) {
-                const opt = findOption((ac.model_schema || ac.models_schema), this.amefSchemaOptions)
-                if (opt) this.configuration.amef_models.schema = opt
+			if (ac.view_schema || ac.views_schema) {
+				const opt = findOption((ac.view_schema || ac.views_schema), this.amefSchemaOptions)
+				if (opt) this.configuration.amef_views.schema = opt
 			}
-            if (ac.property_schema || ac.properties_schema) {
-                const opt = findOption((ac.property_schema || ac.properties_schema), this.amefSchemaOptions)
-                if (opt) this.configuration.amef_properties.schema = opt
+			if (ac.model_schema || ac.models_schema) {
+				const opt = findOption((ac.model_schema || ac.models_schema), this.amefSchemaOptions)
+				if (opt) this.configuration.amef_models.schema = opt
 			}
-            if (ac['property-definition_schema'] || ac.property_definitions_schema) {
-                const opt = findOption((ac['property-definition_schema'] || ac.property_definitions_schema), this.amefSchemaOptions)
-                if (opt) this.configuration.amef_property_definitions.schema = opt
+			if (ac.property_schema || ac.properties_schema) {
+				const opt = findOption((ac.property_schema || ac.properties_schema), this.amefSchemaOptions)
+				if (opt) this.configuration.amef_properties.schema = opt
+			}
+			if (ac['property-definition_schema'] || ac.property_definitions_schema) {
+				const opt = findOption((ac['property-definition_schema'] || ac.property_definitions_schema), this.amefSchemaOptions)
+				if (opt) this.configuration.amef_property_definitions.schema = opt
 			}
 		},
 
@@ -979,18 +979,18 @@ export const useSettingsStore = defineStore('settings', {
 					'amef_property_definitions',
 				]
 				// Map UI keys to API keys
-                const amefMap = {
-                    amef_organization: 'organization_schema',
-                    amef_elements: 'element_schema',
-                    amef_relationships: 'relation_schema',
-                    amef_views: 'view_schema',
-                    amef_models: 'model_schema',
-                    amef_properties: 'property_schema',
-                    amef_property_definitions: 'property-definition_schema',
-                }
-                if (this.amefRegister?.value) {
-                    amefConfig.register = this.amefRegister.value
-                }
+				const amefMap = {
+					amef_organization: 'organization_schema',
+					amef_elements: 'element_schema',
+					amef_relationships: 'relation_schema',
+					amef_views: 'view_schema',
+					amef_models: 'model_schema',
+					amef_properties: 'property_schema',
+					amef_property_definitions: 'property-definition_schema',
+				}
+				if (this.amefRegister?.value) {
+					amefConfig.register = this.amefRegister.value
+				}
 				amefKeys.forEach(configKey => {
 					const config = this.configuration[configKey]
 					if (config && config.schema) {
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
new file mode 100644
index 00000000..048dff4f
--- /dev/null
+++ b/src/views/Dashboard.vue
@@ -0,0 +1,509 @@
+<template>
+	<div class="dashboard">
+		<!-- Header -->
+		<div class="dashboardHeader">
+			<h1 class="dashboardTitle">
+				<ViewDashboard :size="32" />
+				{{ t('softwarecatalog', 'Dashboard') }}
+			</h1>
+			<p class="dashboardDescription">
+				{{ t('softwarecatalog', 'Overview of your software catalog and configurations') }}
+			</p>
+		</div>
+
+		<div v-if="!loading" class="dashboardContent">
+			<!-- Object Statistics Table -->
+			<div class="objectStatistics">
+				<h2 class="sectionTitle">{{ t('softwarecatalog', 'Object Statistics') }}</h2>
+				<p class="sectionDescription">{{ t('softwarecatalog', 'Overview of objects stored in configured registers') }}</p>
+				
+				<div class="statisticsTableContainer">
+					<div class="statisticsTableHeader">
+						<span class="lastUpdated">{{ t('softwarecatalog', 'Last updated: {date}', { date: formatDate(new Date()) }) }}</span>
+					</div>
+					
+					<table class="objectStatisticsTable">
+						<thead>
+							<tr>
+								<th>{{ t('softwarecatalog', 'Register') }}</th>
+								<th>{{ t('softwarecatalog', 'Object Type') }}</th>
+								<th>{{ t('softwarecatalog', 'Count') }}</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="stat in objectStatistics" :key="`${stat.register}-${stat.objectType}`">
+								<td>{{ stat.register }}</td>
+								<td>{{ stat.objectType }}</td>
+								<td class="countCell">{{ stat.count.toLocaleString() }}</td>
+							</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
+
+			<!-- Quick Actions -->
+			<div class="quickActions">
+				<h2 class="sectionTitle">
+					{{ t('softwarecatalog', 'Quick Actions') }}
+				</h2>
+				<div class="quickActionsGrid">
+					<NcButton
+						v-for="action in quickActions"
+						:key="action.key"
+						type="secondary"
+						@click="action.handler">
+						<template #icon>
+							<component :is="action.icon" :size="20" />
+						</template>
+						{{ action.label }}
+					</NcButton>
+				</div>
+			</div>
+		</div>
+
+		<!-- Loading State -->
+		<div v-else class="dashboardLoading">
+			<NcLoadingIcon :size="64" />
+			<p>{{ t('softwarecatalog', 'Loading dashboard...') }}</p>
+		</div>
+	</div>
+</template>
+
+<script>
+import { NcButton, NcLoadingIcon } from '@nextcloud/vue'
+import { objectStore, navigationStore } from '../store/store.js'
+
+// Icons
+import ViewDashboard from 'vue-material-design-icons/ViewDashboard.vue'
+import OfficeBuildingOutline from 'vue-material-design-icons/OfficeBuildingOutline.vue'
+import AccountMultiple from 'vue-material-design-icons/AccountMultiple.vue'
+import ApplicationCog from 'vue-material-design-icons/ApplicationCog.vue'
+import FileDocumentEdit from 'vue-material-design-icons/FileDocumentEdit.vue'
+import Cog from 'vue-material-design-icons/Cog.vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
+import Refresh from 'vue-material-design-icons/Refresh.vue'
+import DatabaseOutline from 'vue-material-design-icons/DatabaseOutline.vue'
+
+/**
+ * @class Dashboard
+ * @module Views
+ * @package
+ * @author Claude AI
+ * @copyright 2023 Conduction
+ * @license EUPL-1.2
+ * @version 1.0.0
+ * @see https://github.com/OpenCatalogi/opencatalogi
+ *
+ * Dashboard view showing overview statistics and configuration status.
+ */
+export default {
+	name: 'Dashboard',
+	components: {
+		NcButton,
+		NcLoadingIcon,
+		// Icons
+		ViewDashboard,
+		OfficeBuildingOutline,
+		AccountMultiple,
+		ApplicationCog,
+		FileDocumentEdit,
+		Cog,
+		Plus,
+		Refresh,
+		DatabaseOutline,
+	},
+
+	data() {
+		return {
+			loading: true,
+		}
+	},
+
+		computed: {
+		/**
+		 * Get object statistics for the table display
+		 * @return {Array} Array of object statistics
+		 */
+		objectStatistics() {
+			const stats = []
+
+			// Find the voorzieningen register from settings
+			if (!objectStore.settings?.availableRegisters) {
+				return stats
+			}
+
+			const voorzieningenRegister = objectStore.settings.availableRegisters.find(
+				register => register.slug === 'voorzieningen'
+			)
+
+			if (!voorzieningenRegister?.schemas) {
+				return stats
+			}
+
+			// Create statistics for each schema in the voorzieningen register
+			voorzieningenRegister.schemas.forEach(schema => {
+				const collection = objectStore.getCollection(schema.slug)
+				const count = collection?.results?.length || 0
+				const pagination = objectStore.getPagination(schema.slug)
+				const total = pagination?.total || count
+
+				stats.push({
+					register: voorzieningenRegister.title,
+					objectType: schema.title,
+					count: total,
+				})
+			})
+
+			// Sort by object type name for consistent display
+			return stats.sort((a, b) => a.objectType.localeCompare(b.objectType))
+		},
+
+
+
+		/**
+		 * Get quick actions for the dashboard
+		 * @return {Array} Array of quick actions
+		 */
+		quickActions() {
+			return [
+				{
+					key: 'refresh_data',
+					label: 'Refresh All Data',
+					icon: Refresh,
+					handler: this.refreshAllData,
+				},
+				{
+					key: 'add_organisation',
+					label: 'Add Organisation',
+					icon: Plus,
+					handler: () => navigationStore.setSelected('organisaties'),
+				},
+				{
+					key: 'configure',
+					label: 'Settings',
+					icon: Cog,
+					handler: () => {
+						const settingsUrl = `${window.location.protocol}//${window.location.host}/index.php/settings/admin/softwarecatalog`
+						window.open(settingsUrl, '_blank')
+					},
+				},
+			]
+		},
+
+
+	},
+
+	async mounted() {
+		await this.loadDashboardData()
+	},
+
+	methods: {
+		/**
+		 * Load dashboard data
+		 * @return {Promise<void>}
+		 */
+		async loadDashboardData() {
+			this.loading = true
+			try {
+				// Ensure settings are loaded (avoid duplicate calls)
+				if (!objectStore.settings && !objectStore.isLoading('settings')) {
+					await objectStore.fetchSettings()
+				}
+
+				// Load data for all registered object types
+				const registeredTypes = Object.keys(objectStore.objectTypeRegistry || {})
+				await Promise.all(
+					registeredTypes.map(async (objectType) => {
+						try {
+							await objectStore.fetchCollection(objectType, { _limit: 1 }) // Just get pagination info
+						} catch (error) {
+							console.warn(`Failed to fetch ${objectType} collection:`, error)
+						}
+					}),
+				)
+			} catch (error) {
+				console.error('Failed to load dashboard data:', error)
+			} finally {
+				this.loading = false
+			}
+		},
+
+		/**
+		 * Get schema configuration for object type
+		 * @param {string} objectType - Object type slug
+		 * @return {object | null} Schema configuration
+		 */
+		getSchemaConfig(objectType) {
+			if (!objectStore.settings?.schemaConfigurations) {
+				return null
+			}
+
+			// Look for schema in all registers
+			const schemas = objectStore.settings.schemaConfigurations
+			for (const register of Object.keys(schemas)) {
+				const schemaData = schemas[register]?.schemas?.[objectType]
+				if (schemaData) {
+					return schemaData
+				}
+			}
+			return null
+		},
+
+		/**
+		 * Get icon component for icon name
+		 * @param {string} iconName - Icon name from schema
+		 * @return {object} Vue icon component
+		 */
+		getIconComponent(iconName) {
+			const iconMap = {
+				OfficeBuildingOutline,
+				AccountMultiple,
+				ApplicationCog,
+				FileDocumentEdit,
+				ViewDashboard,
+				Cog,
+				DatabaseOutline,
+			}
+			return iconMap[iconName] || OfficeBuildingOutline
+		},
+
+		/**
+		 * Navigate to configuration page - opens admin settings in new tab
+		 * @param {string} route - Route to navigate to (legacy parameter)
+		 * @return {void}
+		 */
+		navigateToConfiguration(route) {
+			const settingsUrl = `${window.location.protocol}//${window.location.host}/index.php/settings/admin/softwarecatalog`
+			window.open(settingsUrl, '_blank')
+		},
+
+		/**
+		 * Format object type name for display
+		 * @param {string} objectType - The object type slug
+		 * @return {string} Formatted object type name
+		 */
+		formatObjectTypeName(objectType) {
+			// Convert camelCase/kebab-case to proper case
+			return objectType
+				.replace(/([a-z])([A-Z])/g, '$1 $2')
+				.replace(/[-_]/g, ' ')
+				.split(' ')
+				.map(word => word.charAt(0).toUpperCase() + word.slice(1))
+				.join(' ')
+		},
+
+		/**
+		 * Format date for display
+		 * @param {Date} date - Date to format
+		 * @return {string} Formatted date string
+		 */
+		formatDate(date) {
+			return date.toLocaleDateString('en-GB', {
+				day: '2-digit',
+				month: '2-digit',
+				year: 'numeric',
+				hour: '2-digit',
+				minute: '2-digit',
+			}).replace(',', ',')
+		},
+
+		/**
+		 * Refresh all data - force reload settings and all collections
+		 * @return {Promise<void>}
+		 */
+		async refreshAllData() {
+			console.info('Dashboard: Refreshing all data...')
+			this.loading = true
+			
+			try {
+				// Force reload settings (even if already loaded)
+				console.info('Dashboard: Force reloading settings...')
+				await objectStore.fetchSettings(true) // Force refresh
+				
+				// Wait for object types to be registered
+				await new Promise(resolve => setTimeout(resolve, 500))
+				
+				// Refresh all registered object collections
+				const registeredTypes = Object.keys(objectStore.objectTypeRegistry || {})
+				console.info('Dashboard: Refreshing collections for:', registeredTypes)
+				
+				if (registeredTypes.length > 0) {
+					await Promise.all(
+						registeredTypes.map(async (objectType) => {
+							try {
+								console.info(`Dashboard: Refreshing ${objectType} collection...`)
+								await objectStore.fetchCollection(objectType, { _limit: 1 }) // Just get pagination info
+							} catch (error) {
+								console.warn(`Failed to refresh ${objectType} collection:`, error)
+							}
+						})
+					)
+				} else {
+					console.warn('Dashboard: No object types registered after settings refresh')
+				}
+				
+				console.info('Dashboard: All data refreshed successfully')
+			} catch (error) {
+				console.error('Dashboard: Failed to refresh all data:', error)
+			} finally {
+				this.loading = false
+			}
+		},
+	},
+}
+</script>
+
+<style scoped>
+.dashboard {
+	padding: 24px;
+	max-width: 1200px;
+	margin: 0 auto;
+}
+
+.dashboardHeader {
+	margin-bottom: 32px;
+}
+
+.dashboardTitle {
+	display: flex;
+	align-items: center;
+	gap: 12px;
+	margin: 0 0 8px 0;
+	font-size: 28px;
+	font-weight: 600;
+}
+
+.dashboardDescription {
+	margin: 0;
+	color: var(--color-text-lighter);
+	font-size: 16px;
+}
+
+.dashboardContent {
+	display: flex;
+	flex-direction: column;
+	gap: 32px;
+}
+
+/* Removed old statistics card styles - replaced with table */
+
+.sectionTitle {
+	margin: 0 0 16px 0;
+	font-size: 20px;
+	font-weight: 600;
+}
+
+.configurationCards {
+	display: grid;
+	grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+	gap: 16px;
+}
+
+.configurationCard {
+	padding: 20px;
+	background: var(--color-main-background);
+	border: 1px solid var(--color-border);
+	border-radius: var(--border-radius-large);
+}
+
+.configurationCardHeader {
+	display: flex;
+	align-items: center;
+	gap: 12px;
+	margin-bottom: 12px;
+}
+
+.configurationCardHeader h3 {
+	flex: 1;
+	margin: 0;
+	font-size: 16px;
+	font-weight: 500;
+}
+
+.configurationCardDescription {
+	margin: 0 0 16px 0;
+	color: var(--color-text-lighter);
+}
+
+.quickActionsGrid {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 16px;
+}
+
+.dashboardLoading {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	gap: 16px;
+	min-height: 400px;
+	color: var(--color-text-lighter);
+}
+
+
+
+/* Object Statistics Table */
+.objectStatistics {
+	margin-bottom: 32px;
+}
+
+.sectionDescription {
+	margin: 0 0 16px 0;
+	color: var(--color-text-lighter);
+}
+
+.statisticsTableContainer {
+	background: var(--color-main-background);
+	border: 1px solid var(--color-border);
+	border-radius: var(--border-radius-large);
+	overflow: hidden;
+}
+
+.statisticsTableHeader {
+	padding: 16px;
+	border-bottom: 1px solid var(--color-border);
+	display: flex;
+	justify-content: flex-end;
+	background: var(--color-background-dark);
+}
+
+.lastUpdated {
+	font-size: 12px;
+	color: var(--color-text-lighter);
+}
+
+.objectStatisticsTable {
+	width: 100%;
+	border-collapse: collapse;
+}
+
+.objectStatisticsTable th {
+	text-align: left;
+	padding: 16px;
+	background: var(--color-background-hover);
+	font-weight: 600;
+	color: var(--color-text-darker);
+	border-bottom: 1px solid var(--color-border);
+}
+
+.objectStatisticsTable td {
+	padding: 16px;
+	border-bottom: 1px solid var(--color-border-dark);
+}
+
+.objectStatisticsTable tbody tr:hover {
+	background: var(--color-background-hover);
+}
+
+.objectStatisticsTable tbody tr:last-child td {
+	border-bottom: none;
+}
+
+.countCell {
+	font-weight: 600;
+	text-align: right;
+}
+
+
+</style>
diff --git a/src/views/ObjectIndex.vue b/src/views/ObjectIndex.vue
new file mode 100644
index 00000000..36d87d19
--- /dev/null
+++ b/src/views/ObjectIndex.vue
@@ -0,0 +1,351 @@
+<template>
+	<GenericObjectTable
+		:object-type="objectType"
+		:object-type-plural="objectTypePlural"
+		:title="objectTitle"
+		:description="objectDescription"
+		:empty-icon="objectIcon"
+		:card-icon="objectIcon"
+		:properties="objectProperties"
+		:object-actions="objectActions"
+		:mass-actions="objectMassActions"
+		:actions="defaultActions"
+		:add-action="addAction"
+		:help-url="helpUrl"
+		:card-display-mode="cardDisplayMode"
+		:custom-card-component="customCardComponent"
+		:filters="objectFilters"
+		@mounted="onMounted" />
+</template>
+
+<script>
+import GenericObjectTable from '../components/GenericObjectTable.vue'
+import { objectStore } from '../store/store.js'
+
+// Default icons - these will be overridden by schema icons when available
+import OfficeBuildingOutline from 'vue-material-design-icons/OfficeBuildingOutline.vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
+import Eye from 'vue-material-design-icons/Eye.vue'
+import Pencil from 'vue-material-design-icons/Pencil.vue'
+import Delete from 'vue-material-design-icons/Delete.vue'
+import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue'
+
+/**
+ * @class ObjectIndex
+ * @module Views
+ * @package
+ * @author Claude AI
+ * @copyright 2023 Conduction
+ * @license EUPL-1.2
+ * @version 1.0.0
+ * @see https://github.com/OpenCatalogi/opencatalogi
+ *
+ * Dynamic ObjectIndex component that can display any object type
+ * based on schema configuration from settings.
+ */
+export default {
+	name: 'ObjectIndex',
+	components: {
+		GenericObjectTable,
+	},
+	props: {
+		/**
+		 * Object type slug from schema
+		 * @type {string}
+		 */
+		objectType: {
+			type: String,
+			required: true,
+		},
+		/**
+		 * Custom card component override
+		 * @type {object | null}
+		 */
+		customCardComponent: {
+			type: [String, Object],
+			default: null,
+		},
+		/**
+		 * Card display mode override
+		 * @type {string}
+		 */
+		cardDisplayMode: {
+			type: String,
+			default: 'mixed',
+		},
+	},
+
+	data() {
+		return {}
+	},
+
+	computed: {
+		/**
+		 * Get schema configuration from settings
+		 * @return {object|null} Schema configuration
+		 */
+		schemaConfig() {
+			if (!objectStore.settings?.schemaConfigurations) {
+				return null
+			}
+
+			// Look for schema in all registers
+			const schemas = objectStore.settings.schemaConfigurations
+			for (const register of Object.keys(schemas)) {
+				const schemaData = schemas[register]?.schemas?.[this.objectType]
+				if (schemaData) {
+					return schemaData
+				}
+			}
+			return null
+		},
+
+		/**
+		 * Get object type plural form
+		 * @return {string} Pluralized object type name
+		 */
+		objectTypePlural() {
+			if (this.schemaConfig?.title) {
+				// Simple pluralization - add 's' or 'en' for Dutch
+				const title = this.schemaConfig.title.toLowerCase()
+				if (title.endsWith('e')) {
+					return this.schemaConfig.title + 'n'
+				}
+				return this.schemaConfig.title + 's'
+			}
+			return this.objectType + 's'
+		},
+
+		/**
+		 * Get object title from schema
+		 * @return {string} Object title
+		 */
+		objectTitle() {
+			return this.schemaConfig?.title || this.objectType
+		},
+
+		/**
+		 * Get object description from schema
+		 * @return {string} Object description
+		 */
+		objectDescription() {
+			return this.schemaConfig?.description || `Manage your ${this.objectTypePlural.toLowerCase()} and their configurations`
+		},
+
+		/**
+		 * Get object icon from schema
+		 * @return {object} Vue icon component
+		 */
+		objectIcon() {
+			const iconName = this.schemaConfig?.icon
+			if (iconName) {
+				// Dynamic import would be ideal, but for now use a mapping
+				const iconMap = this.getIconMap()
+				return iconMap[iconName] || OfficeBuildingOutline
+			}
+			return OfficeBuildingOutline
+		},
+
+		/**
+		 * Generate object properties for table display
+		 * @return {Array} Array of property configurations
+		 */
+		objectProperties() {
+			if (!this.schemaConfig?.properties) {
+				return []
+			}
+
+			// Generate properties from schema
+			const properties = []
+			const schemaProps = this.schemaConfig.properties
+
+			// Get first 6 most important properties (visible, ordered)
+			const visibleProps = Object.keys(schemaProps)
+				.filter(key => schemaProps[key].visible !== false)
+				.sort((a, b) => {
+					const orderA = schemaProps[a].order || 999
+					const orderB = schemaProps[b].order || 999
+					return orderA - orderB
+				})
+				.slice(0, 6)
+
+			visibleProps.forEach(propKey => {
+				const prop = schemaProps[propKey]
+				properties.push({
+					key: propKey,
+					label: prop.title || propKey,
+					sortable: true,
+					searchable: true,
+				})
+			})
+
+			return properties
+		},
+
+		/**
+		 * Generate object filters based on schema
+		 * @return {Array} Array of filter configurations
+		 */
+		objectFilters() {
+			const filters = []
+
+			// Add status filter if status field exists
+			if (this.schemaConfig?.properties?.status) {
+				const statusProp = this.schemaConfig.properties.status
+				if (statusProp.enum && statusProp.enum.length > 0) {
+					filters.push({
+						key: 'status',
+						label: 'Status',
+						options: [
+							{ value: 'all', label: 'Alle statussen' },
+							...statusProp.enum.map(status => ({
+								value: status,
+								label: status,
+							})),
+						],
+					})
+				}
+			}
+
+			return filters
+		},
+
+		/**
+		 * Object-specific actions
+		 * @return {Array} Array of object actions
+		 */
+		objectActions() {
+			return [
+				{
+					id: 'view',
+					label: 'View',
+					icon: Eye,
+					handler: (item) => {
+						console.info('View item:', item)
+						// TODO: Navigate to detail page
+					},
+				},
+				{
+					id: 'edit',
+					label: 'Edit',
+					icon: Pencil,
+					handler: (item) => {
+						console.info('Edit item:', item)
+						// TODO: Navigate to edit page
+					},
+				},
+				{
+					id: 'delete',
+					label: 'Delete',
+					icon: Delete,
+					handler: (item) => {
+						console.info('Delete item:', item)
+						// TODO: Implement delete functionality
+					},
+				},
+			]
+		},
+
+		/**
+		 * Mass actions for bulk operations
+		 * @return {Array} Array of mass actions
+		 */
+		objectMassActions() {
+			return [
+				{
+					id: 'delete',
+					label: 'Delete Selected',
+					icon: Delete,
+					handler: (selectedItems) => {
+						console.info('Delete items:', selectedItems)
+						// TODO: Implement bulk delete
+					},
+				},
+			]
+		},
+
+		/**
+		 * Default page actions
+		 * @return {Array} Array of default actions
+		 */
+		defaultActions() {
+			return [
+				{
+					id: 'help',
+					label: 'Help',
+					icon: HelpCircleOutline,
+					handler: () => {
+						if (this.helpUrl) {
+							window.open(this.helpUrl, '_blank')
+						}
+					},
+				},
+			]
+		},
+
+		/**
+		 * Add action configuration
+		 * @return {object} Add action configuration
+		 */
+		addAction() {
+			return {
+				id: 'add',
+				label: `Add ${this.objectTitle}`,
+				icon: Plus,
+				handler: () => {
+					objectStore.clearActiveObject(this.objectType)
+					console.info(`Add new ${this.objectType}`)
+					// TODO: Navigate to create page
+				},
+			}
+		},
+
+		/**
+		 * Help URL for this object type
+		 * @return {string|null} Help URL
+		 */
+		helpUrl() {
+			return `https://conduction.gitbook.io/softwarecatalog-nextcloud/beheerders/${this.objectType}`
+		},
+	},
+
+	methods: {
+		/**
+		 * Handle component mounted event
+		 * @return {Promise<void>}
+		 */
+		async onMounted() {
+			// Ensure settings are loaded and object types are registered
+			if (!objectStore.settings) {
+				await objectStore.fetchSettings()
+			}
+
+			// Fetch the collection for this object type
+			try {
+				await objectStore.fetchCollection(this.objectType)
+			} catch (error) {
+				console.error(`Failed to fetch ${this.objectType} collection:`, error)
+			}
+		},
+
+		/**
+		 * Get icon mapping for dynamic icon loading
+		 * @return {object} Icon name to component mapping
+		 */
+		getIconMap() {
+			// This would ideally be dynamically imported, but for now we use a static map
+			// In a future version, we could implement dynamic icon loading
+			return {
+				OfficeBuildingOutline,
+				AccountMultiple: require('vue-material-design-icons/AccountMultiple.vue').default,
+				ApplicationCog: require('vue-material-design-icons/ApplicationCog.vue').default,
+				FileDocumentEdit: require('vue-material-design-icons/FileDocumentEdit.vue').default,
+				CheckCircle: require('vue-material-design-icons/CheckCircle.vue').default,
+				ViewModule: require('vue-material-design-icons/ViewModule.vue').default,
+				FileDocumentCheck: require('vue-material-design-icons/FileDocumentCheck.vue').default,
+				Star: require('vue-material-design-icons/Star.vue').default,
+			}
+		},
+	},
+}
+</script>
diff --git a/src/views/Views.vue b/src/views/Views.vue
index 9c671397..28acc8ab 100644
--- a/src/views/Views.vue
+++ b/src/views/Views.vue
@@ -1,28 +1,141 @@
-<script setup>
-import { navigationStore } from '../store/store.js'
-</script>
-
 <template>
-	<!-- Placeholder div for all of the views-->
 	<NcAppContent>
 		<template #default>
+			<!-- Dashboard -->
 			<Dashboard v-if="navigationStore.selected === 'dashboard'" />
+
+			<!-- Custom Override Pages (maintain existing specialized pages) -->
 			<OrganisatieIndex v-if="navigationStore.selected === 'organisaties'" />
+
+			<!-- Dynamic Object Index Pages -->
+			<ObjectIndex
+				v-else-if="isDynamicObjectRoute(navigationStore.selected)"
+				:object-type="getObjectTypeFromRoute(navigationStore.selected)"
+				:custom-card-component="getCustomCardComponent(navigationStore.selected)"
+				:card-display-mode="getCardDisplayMode(navigationStore.selected)" />
+
+			<!-- Settings (if you have a settings page) -->
+			<div v-else-if="navigationStore.selected === 'settings'" class="settingsPlaceholder">
+				<h2>Settings</h2>
+				<p>Settings page would go here</p>
+			</div>
+
+			<!-- Default/fallback -->
+			<div v-else class="defaultView">
+				<!-- Clean default view -->
+			</div>
 		</template>
 	</NcAppContent>
 </template>
 
 <script>
 import { NcAppContent } from '@nextcloud/vue'
-import Dashboard from './dashboard/DashboardIndex.vue'
+import { navigationStore, objectStore } from '../store/store.js'
+
+import Dashboard from './Dashboard.vue'
+import ObjectIndex from './ObjectIndex.vue'
 import OrganisatieIndex from './organisaties/OrganisatieIndex.vue'
+import OrganisatieCard from '../components/cards/OrganisatieCard.vue'
 
+/**
+ * @class Views
+ * @module Views
+ * @package
+ * @author Claude AI
+ * @copyright 2023 Conduction
+ * @license EUPL-1.2
+ * @version 1.0.0
+ * @see https://github.com/OpenCatalogi/opencatalogi
+ *
+ * Main view router component that handles dynamic and custom page routing.
+ */
 export default {
 	name: 'Views',
 	components: {
+		NcAppContent,
 		Dashboard,
+		ObjectIndex,
 		OrganisatieIndex,
-		NcAppContent,
+	},
+
+	data() {
+		return {
+			navigationStore,
+		}
+	},
+
+	methods: {
+		/**
+		 * Check if the current route is a dynamic object route
+		 * @param {string} route - Current route
+		 * @return {boolean} True if dynamic object route
+		 */
+		isDynamicObjectRoute(route) {
+			// Skip custom override routes
+			const customRoutes = ['dashboard', 'organisaties', 'settings']
+			if (customRoutes.includes(route)) {
+				return false
+			}
+
+			// Check if there's a registered object type for this route
+			const objectType = this.getObjectTypeFromRoute(route)
+			return !!(objectType && objectStore.objectTypeRegistry?.[objectType])
+		},
+
+		/**
+		 * Get object type from route name
+		 * @param {string} route - Route name (plural)
+		 * @return {string|null} Object type (singular)
+		 */
+		getObjectTypeFromRoute(route) {
+			// Map plural route names to singular object types
+			const routeMap = {
+				contactpersonen: 'contactpersoon',
+				voorzieningen: 'voorziening',
+				contracten: 'contract',
+				standaarden: 'standaard',
+				reviews: 'review',
+				complianties: 'compliancy',
+				moduleversies: 'moduleversie',
+			}
+
+			return routeMap[route] || null
+		},
+
+		/**
+		 * Get custom card component for route (if any)
+		 * @param {string} route - Route name
+		 * @return {object | null} Custom card component
+		 */
+		getCustomCardComponent(route) {
+			// Map routes to custom card components
+			const customCards = {
+				organisaties: OrganisatieCard,
+				// Add more custom cards as needed
+			}
+
+			return customCards[route] || null
+		},
+
+		/**
+		 * Get card display mode for route
+		 * @param {string} route - Route name
+		 * @return {string} Card display mode
+		 */
+		getCardDisplayMode(route) {
+			// Map routes to preferred display modes
+			const displayModes = {
+				contactpersonen: 'properties',
+				voorzieningen: 'mixed',
+				contracten: 'properties',
+				standaarden: 'description',
+				reviews: 'mixed',
+				complianties: 'properties',
+				moduleversies: 'properties',
+			}
+
+			return displayModes[route] || 'mixed'
+		},
 	},
 }
 </script>
diff --git a/src/views/contactpersonen/ContactpersoonIndex.vue b/src/views/contactpersonen/ContactpersoonIndex.vue
new file mode 100644
index 00000000..8f7ee2ea
--- /dev/null
+++ b/src/views/contactpersonen/ContactpersoonIndex.vue
@@ -0,0 +1,243 @@
+/**
+ * ContactpersoonIndex.vue
+ * Component for displaying and managing contactpersonen using GenericObjectTable
+ * @category Views
+ * @package softwarecatalog
+ * @author Ruben Linde
+ * @copyright 2024
+ * @license AGPL-3.0-or-later
+ * @version 1.0.0
+ * @link https://github.com/opencatalogi/softwarecatalog
+ */
+
+<script setup>
+import { navigationStore, objectStore } from '../../store/store.js'
+</script>
+
+<template>
+	<GenericObjectTable
+		object-type="contactpersoon"
+		object-type-plural="contactpersonen"
+		:title="t('softwarecatalog', 'Contactpersonen')"
+		:description="t('softwarecatalog', 'Manage your contactpersonen and their information')"
+		:empty-icon="AccountMultiple"
+		:card-icon="AccountMultiple"
+		:properties="contactpersoonProperties"
+		:object-actions="contactpersoonObjectActions"
+		:mass-actions="contactpersoonMassActions"
+		:actions="contactpersoonActions"
+		:add-action="addContactpersoonAction"
+		:help-url="'https://conduction.gitbook.io/softwarecatalog-nextcloud/beheerders/contactpersonen'"
+		card-display-mode="properties"
+		@mounted="onMounted" />
+</template>
+
+<script>
+import GenericObjectTable from '../../components/GenericObjectTable.vue'
+import AccountMultiple from 'vue-material-design-icons/AccountMultiple.vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
+import Refresh from 'vue-material-design-icons/Refresh.vue'
+import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue'
+import Eye from 'vue-material-design-icons/Eye.vue'
+import Pencil from 'vue-material-design-icons/Pencil.vue'
+import ContentCopy from 'vue-material-design-icons/ContentCopy.vue'
+import TrashCanOutline from 'vue-material-design-icons/TrashCanOutline.vue'
+import Delete from 'vue-material-design-icons/Delete.vue'
+import PublishIcon from 'vue-material-design-icons/Publish.vue'
+import PublishOffIcon from 'vue-material-design-icons/PublishOff.vue'
+
+export default {
+	name: 'ContactpersoonIndex',
+	components: {
+		GenericObjectTable,
+	},
+	data() {
+		return {
+			contactpersoonProperties: [
+				{
+					id: 'voornaam',
+					label: 'Voornaam',
+					key: 'voornaam',
+					sortable: true,
+					searchable: true,
+				},
+				{
+					id: 'achternaam',
+					label: 'Achternaam',
+					key: 'achternaam',
+					sortable: true,
+					searchable: true,
+				},
+				{
+					id: 'e-mailadres',
+					label: 'E-mailadres',
+					key: 'e-mailadres',
+					sortable: true,
+					searchable: true,
+				},
+				{
+					id: 'telefoonnummer',
+					label: 'Telefoonnummer',
+					key: 'telefoonnummer',
+					sortable: true,
+					searchable: true,
+				},
+				{
+					id: 'functie',
+					label: 'Functie',
+					key: 'functie',
+					sortable: true,
+					searchable: true,
+				},
+				{
+					id: 'organisatie',
+					label: 'Organisatie',
+					key: 'organisatie.value',
+					sortable: false,
+					searchable: true,
+				},
+			],
+			contactpersoonObjectActions: [
+				{
+					id: 'view',
+					label: 'View',
+					icon: Eye,
+					handler: (contactpersoon) => {
+						objectStore.setActiveObject('contactpersoon', contactpersoon)
+						navigationStore.setModal('viewContactpersoon')
+					},
+				},
+				{
+					id: 'edit',
+					label: 'Edit',
+					icon: Pencil,
+					handler: (contactpersoon) => {
+						objectStore.setActiveObject('contactpersoon', contactpersoon)
+						navigationStore.setModal('contactpersoon')
+					},
+				},
+				{
+					id: 'copy',
+					label: 'Copy',
+					icon: ContentCopy,
+					handler: (contactpersoon) => {
+						objectStore.setActiveObject('contactpersoon', contactpersoon)
+						navigationStore.setDialog('copyObject', {
+							objectType: 'contactpersoon',
+							dialogTitle: 'Contactpersoon',
+						})
+					},
+				},
+				{
+					id: 'delete',
+					label: 'Delete',
+					icon: TrashCanOutline,
+					handler: (contactpersoon) => {
+						objectStore.setActiveObject('contactpersoon', contactpersoon)
+						navigationStore.setDialog('deleteObject', {
+							objectType: 'contactpersoon',
+							dialogTitle: 'Contactpersoon',
+						})
+					},
+				},
+			],
+			contactpersoonMassActions: [
+				{
+					id: 'massDelete',
+					label: 'Delete Selected',
+					icon: Delete,
+					handler: () => {
+						navigationStore.setDialog('massDeleteObjects', {
+							objectType: 'contactpersoon',
+							dialogTitle: 'Contactpersonen',
+						})
+					},
+				},
+				{
+					id: 'massPublish',
+					label: 'Publish Selected',
+					icon: PublishIcon,
+					handler: () => {
+						navigationStore.setDialog('massPublishObjects', {
+							objectType: 'contactpersoon',
+							dialogTitle: 'Contactpersonen',
+						})
+					},
+				},
+				{
+					id: 'massDepublish',
+					label: 'Depublish Selected',
+					icon: PublishOffIcon,
+					handler: () => {
+						navigationStore.setDialog('massDepublishObjects', {
+							objectType: 'contactpersoon',
+							dialogTitle: 'Contactpersonen',
+						})
+					},
+				},
+			],
+			contactpersoonActions: [
+				{
+					id: 'add',
+					label: 'Add Contactpersoon',
+					icon: Plus,
+					primary: true,
+					handler: () => {
+						objectStore.clearActiveObject('contactpersoon')
+						navigationStore.setModal('contactpersoon')
+					},
+				},
+				{
+					id: 'refresh',
+					label: 'Refresh',
+					icon: Refresh,
+					handler: () => {
+						objectStore.fetchCollection('contactpersoon')
+					},
+					disabled: () => objectStore.isLoading('contactpersoon'),
+				},
+				{
+					id: 'help',
+					label: 'Help',
+					icon: HelpCircleOutline,
+					handler: () => {
+						window.open('https://conduction.gitbook.io/softwarecatalog-nextcloud/beheerders/contactpersonen', '_blank')
+					},
+				},
+			],
+			addContactpersoonAction: {
+				id: 'add',
+				label: 'Add Contactpersoon',
+				icon: Plus,
+				handler: () => {
+					objectStore.clearActiveObject('contactpersoon')
+					navigationStore.setModal('contactpersoon')
+				},
+			},
+		}
+	},
+	methods: {
+		/**
+		 * Handle component mount - initialize settings and fetch contactpersonen
+		 * @return {Promise<void>}
+		 */
+		async onMounted() {
+			console.info('ContactpersoonIndex mounted, initializing...')
+			try {
+				// Ensure settings are loaded first (this will also register object types)
+				if (!objectStore.settings) {
+					console.info('Loading settings before fetching contactpersonen...')
+					await objectStore.fetchSettings()
+				}
+
+				// Fetch contactpersonen collection
+				console.info('Fetching contactpersonen...')
+				await objectStore.fetchCollection('contactpersoon')
+			} catch (error) {
+				console.error('Error initializing ContactpersoonIndex:', error)
+				// Show error to user if needed
+			}
+		},
+	},
+}
+</script>
diff --git a/src/views/contracten/ContractIndex.vue b/src/views/contracten/ContractIndex.vue
new file mode 100644
index 00000000..8dd17110
--- /dev/null
+++ b/src/views/contracten/ContractIndex.vue
@@ -0,0 +1,250 @@
+/**
+ * ContractIndex.vue
+ * Component for displaying and managing contracten using GenericObjectTable
+ * @category Views
+ * @package softwarecatalog
+ * @author Ruben Linde
+ * @copyright 2024
+ * @license AGPL-3.0-or-later
+ * @version 1.0.0
+ * @link https://github.com/opencatalogi/softwarecatalog
+ */
+
+<script setup>
+import { navigationStore, objectStore } from '../../store/store.js'
+</script>
+
+<template>
+	<GenericObjectTable
+		object-type="contract"
+		object-type-plural="contracten"
+		:title="t('softwarecatalog', 'Contracten')"
+		:description="t('softwarecatalog', 'Manage your contracten and their specifications')"
+		:empty-icon="FileDocumentEdit"
+		:card-icon="FileDocumentEdit"
+		:properties="contractProperties"
+		:object-actions="contractObjectActions"
+		:mass-actions="contractMassActions"
+		:actions="contractActions"
+		:add-action="addContractAction"
+		:help-url="'https://conduction.gitbook.io/softwarecatalog-nextcloud/beheerders/contracten'"
+		card-display-mode="properties"
+		@mounted="onMounted" />
+</template>
+
+<script>
+import GenericObjectTable from '../../components/GenericObjectTable.vue'
+import FileDocumentEdit from 'vue-material-design-icons/FileDocumentEdit.vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
+import Refresh from 'vue-material-design-icons/Refresh.vue'
+import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue'
+import Eye from 'vue-material-design-icons/Eye.vue'
+import Pencil from 'vue-material-design-icons/Pencil.vue'
+import ContentCopy from 'vue-material-design-icons/ContentCopy.vue'
+import TrashCanOutline from 'vue-material-design-icons/TrashCanOutline.vue'
+import Delete from 'vue-material-design-icons/Delete.vue'
+import PublishIcon from 'vue-material-design-icons/Publish.vue'
+import PublishOffIcon from 'vue-material-design-icons/PublishOff.vue'
+
+export default {
+	name: 'ContractIndex',
+	components: {
+		GenericObjectTable,
+	},
+	data() {
+		return {
+			contractProperties: [
+				{
+					id: 'contractNummer',
+					label: 'Contractnummer',
+					key: 'contractNummer',
+					sortable: true,
+					searchable: true,
+				},
+				{
+					id: 'contractType',
+					label: 'Contracttype',
+					key: 'contractType',
+					sortable: true,
+					searchable: true,
+				},
+				{
+					id: 'status',
+					label: 'Status',
+					key: 'status',
+					sortable: true,
+					searchable: true,
+				},
+				{
+					id: 'startDatum',
+					label: 'Startdatum',
+					key: 'startDatum',
+					sortable: true,
+					searchable: false,
+				},
+				{
+					id: 'eindDatum',
+					label: 'Einddatum',
+					key: 'eindDatum',
+					sortable: true,
+					searchable: false,
+				},
+				{
+					id: 'voorzieningAanbod',
+					label: 'Voorziening aanbod',
+					key: 'voorzieningAanbod',
+					sortable: false,
+					searchable: true,
+				},
+				{
+					id: 'voorzieningGebruik',
+					label: 'Voorziening gebruik',
+					key: 'voorzieningGebruik',
+					sortable: false,
+					searchable: true,
+				},
+			],
+			contractObjectActions: [
+				{
+					id: 'view',
+					label: 'View',
+					icon: Eye,
+					handler: (contract) => {
+						objectStore.setActiveObject('contract', contract)
+						navigationStore.setModal('viewContract')
+					},
+				},
+				{
+					id: 'edit',
+					label: 'Edit',
+					icon: Pencil,
+					handler: (contract) => {
+						objectStore.setActiveObject('contract', contract)
+						navigationStore.setModal('contract')
+					},
+				},
+				{
+					id: 'copy',
+					label: 'Copy',
+					icon: ContentCopy,
+					handler: (contract) => {
+						objectStore.setActiveObject('contract', contract)
+						navigationStore.setDialog('copyObject', {
+							objectType: 'contract',
+							dialogTitle: 'Contract',
+						})
+					},
+				},
+				{
+					id: 'delete',
+					label: 'Delete',
+					icon: TrashCanOutline,
+					handler: (contract) => {
+						objectStore.setActiveObject('contract', contract)
+						navigationStore.setDialog('deleteObject', {
+							objectType: 'contract',
+							dialogTitle: 'Contract',
+						})
+					},
+				},
+			],
+			contractMassActions: [
+				{
+					id: 'massDelete',
+					label: 'Delete Selected',
+					icon: Delete,
+					handler: () => {
+						navigationStore.setDialog('massDeleteObjects', {
+							objectType: 'contract',
+							dialogTitle: 'Contracten',
+						})
+					},
+				},
+				{
+					id: 'massPublish',
+					label: 'Publish Selected',
+					icon: PublishIcon,
+					handler: () => {
+						navigationStore.setDialog('massPublishObjects', {
+							objectType: 'contract',
+							dialogTitle: 'Contracten',
+						})
+					},
+				},
+				{
+					id: 'massDepublish',
+					label: 'Depublish Selected',
+					icon: PublishOffIcon,
+					handler: () => {
+						navigationStore.setDialog('massDepublishObjects', {
+							objectType: 'contract',
+							dialogTitle: 'Contracten',
+						})
+					},
+				},
+			],
+			contractActions: [
+				{
+					id: 'add',
+					label: 'Add Contract',
+					icon: Plus,
+					primary: true,
+					handler: () => {
+						objectStore.clearActiveObject('contract')
+						navigationStore.setModal('contract')
+					},
+				},
+				{
+					id: 'refresh',
+					label: 'Refresh',
+					icon: Refresh,
+					handler: () => {
+						objectStore.fetchCollection('contract')
+					},
+					disabled: () => objectStore.isLoading('contract'),
+				},
+				{
+					id: 'help',
+					label: 'Help',
+					icon: HelpCircleOutline,
+					handler: () => {
+						window.open('https://conduction.gitbook.io/softwarecatalog-nextcloud/beheerders/contracten', '_blank')
+					},
+				},
+			],
+			addContractAction: {
+				id: 'add',
+				label: 'Add Contract',
+				icon: Plus,
+				handler: () => {
+					objectStore.clearActiveObject('contract')
+					navigationStore.setModal('contract')
+				},
+			},
+		}
+	},
+	methods: {
+		/**
+		 * Handle component mount - initialize settings and fetch contracten
+		 * @return {Promise<void>}
+		 */
+		async onMounted() {
+			console.info('ContractIndex mounted, initializing...')
+			try {
+				// Ensure settings are loaded first (this will also register object types)
+				if (!objectStore.settings) {
+					console.info('Loading settings before fetching contracten...')
+					await objectStore.fetchSettings()
+				}
+
+				// Fetch contracten collection
+				console.info('Fetching contracten...')
+				await objectStore.fetchCollection('contract')
+			} catch (error) {
+				console.error('Error initializing ContractIndex:', error)
+				// Show error to user if needed
+			}
+		},
+	},
+}
+</script>
diff --git a/src/views/organisaties/OrganisatieIndex.vue b/src/views/organisaties/OrganisatieIndex.vue
index 5d87f922..c5ab0c9d 100644
--- a/src/views/organisaties/OrganisatieIndex.vue
+++ b/src/views/organisaties/OrganisatieIndex.vue
@@ -12,6 +12,7 @@
 
 <script setup>
 import { navigationStore, objectStore } from '../../store/store.js'
+import OrganisatieCard from '../../components/cards/OrganisatieCard.vue'
 </script>
 
 <template>
@@ -28,6 +29,9 @@ import { navigationStore, objectStore } from '../../store/store.js'
 		:actions="organisatieActions"
 		:add-action="addOrganisatieAction"
 		:help-url="'https://conduction.gitbook.io/softwarecatalog-nextcloud/beheerders/organisaties'"
+		card-display-mode="description"
+		:custom-card-component="OrganisatieCard"
+		:filters="organisatieFilters"
 		@mounted="onMounted" />
 </template>
 
@@ -49,14 +53,16 @@ export default {
 	name: 'OrganisatieIndex',
 	components: {
 		GenericObjectTable,
+		// eslint-disable-next-line vue/no-unused-components
+		OrganisatieCard,
 	},
 	data() {
 		return {
 			organisatieProperties: [
 				{
-					id: 'name',
-					label: 'Name',
-					key: 'name',
+					id: 'naam',
+					label: 'Naam',
+					key: 'naam',
 					sortable: true,
 					searchable: true,
 				},
@@ -68,9 +74,16 @@ export default {
 					searchable: true,
 				},
 				{
-					id: 'summary',
-					label: 'Summary',
-					key: 'summary',
+					id: 'type',
+					label: 'Type',
+					key: 'type',
+					sortable: true,
+					searchable: true,
+				},
+				{
+					id: 'beschrijvingKort',
+					label: 'Korte beschrijving',
+					key: 'beschrijvingKort',
 					sortable: false,
 					searchable: true,
 				},
@@ -95,13 +108,6 @@ export default {
 					sortable: true,
 					searchable: true,
 				},
-				{
-					id: 'updatedAt',
-					label: 'Last Updated',
-					key: 'updatedAt',
-					sortable: true,
-					searchable: false,
-				},
 			],
 			organisatieObjectActions: [
 				{
@@ -211,6 +217,17 @@ export default {
 					},
 				},
 			],
+			organisatieFilters: [
+				{
+					key: 'status',
+					label: 'Status',
+					options: [
+						{ value: 'all', label: 'Alle statussen' },
+						{ value: 'Actief', label: 'Actief' },
+						{ value: 'concept', label: 'Concept' },
+					],
+				},
+			],
 			addOrganisatieAction: {
 				id: 'add',
 				label: 'Add Organisatie',
@@ -223,9 +240,26 @@ export default {
 		}
 	},
 	methods: {
-		onMounted() {
-			console.info('OrganisatieIndex mounted, fetching organisaties...')
-			objectStore.fetchCollection('organisatie')
+		/**
+		 * Handle component mount - initialize settings and fetch organisaties
+		 * @return {Promise<void>}
+		 */
+		async onMounted() {
+			console.info('OrganisatieIndex mounted, initializing...')
+			try {
+				// Ensure settings are loaded first (this will also register object types)
+				if (!objectStore.settings) {
+					console.info('Loading settings before fetching organisaties...')
+					await objectStore.fetchSettings()
+				}
+
+				// Fetch organisaties collection
+				console.info('Fetching organisaties...')
+				await objectStore.fetchCollection('organisatie')
+			} catch (error) {
+				console.error('Error initializing OrganisatieIndex:', error)
+				// Show error to user if needed
+			}
 		},
 	},
 }
diff --git a/src/views/voorzieningen/VoorzieningIndex.vue b/src/views/voorzieningen/VoorzieningIndex.vue
new file mode 100644
index 00000000..34e54113
--- /dev/null
+++ b/src/views/voorzieningen/VoorzieningIndex.vue
@@ -0,0 +1,243 @@
+/**
+ * VoorzieningIndex.vue
+ * Component for displaying and managing voorzieningen using GenericObjectTable
+ * @category Views
+ * @package softwarecatalog
+ * @author Ruben Linde
+ * @copyright 2024
+ * @license AGPL-3.0-or-later
+ * @version 1.0.0
+ * @link https://github.com/opencatalogi/softwarecatalog
+ */
+
+<script setup>
+import { navigationStore, objectStore } from '../../store/store.js'
+</script>
+
+<template>
+	<GenericObjectTable
+		object-type="voorziening"
+		object-type-plural="voorzieningen"
+		:title="t('softwarecatalog', 'Voorzieningen')"
+		:description="t('softwarecatalog', 'Manage your voorzieningen and their specifications')"
+		:empty-icon="ApplicationCog"
+		:card-icon="ApplicationCog"
+		:properties="voorzieningProperties"
+		:object-actions="voorzieningObjectActions"
+		:mass-actions="voorzieningMassActions"
+		:actions="voorzieningActions"
+		:add-action="addVoorzieningAction"
+		:help-url="'https://conduction.gitbook.io/softwarecatalog-nextcloud/beheerders/voorzieningen'"
+		card-display-mode="mixed"
+		@mounted="onMounted" />
+</template>
+
+<script>
+import GenericObjectTable from '../../components/GenericObjectTable.vue'
+import ApplicationCog from 'vue-material-design-icons/ApplicationCog.vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
+import Refresh from 'vue-material-design-icons/Refresh.vue'
+import HelpCircleOutline from 'vue-material-design-icons/HelpCircleOutline.vue'
+import Eye from 'vue-material-design-icons/Eye.vue'
+import Pencil from 'vue-material-design-icons/Pencil.vue'
+import ContentCopy from 'vue-material-design-icons/ContentCopy.vue'
+import TrashCanOutline from 'vue-material-design-icons/TrashCanOutline.vue'
+import Delete from 'vue-material-design-icons/Delete.vue'
+import PublishIcon from 'vue-material-design-icons/Publish.vue'
+import PublishOffIcon from 'vue-material-design-icons/PublishOff.vue'
+
+export default {
+	name: 'VoorzieningIndex',
+	components: {
+		GenericObjectTable,
+	},
+	data() {
+		return {
+			voorzieningProperties: [
+				{
+					id: 'naam',
+					label: 'Naam',
+					key: 'naam',
+					sortable: true,
+					searchable: true,
+				},
+				{
+					id: 'website',
+					label: 'Website',
+					key: 'website',
+					sortable: true,
+					searchable: true,
+				},
+				{
+					id: 'beschrijvingKort',
+					label: 'Korte beschrijving',
+					key: 'beschrijvingKort',
+					sortable: false,
+					searchable: true,
+				},
+				{
+					id: 'type',
+					label: 'Type',
+					key: 'type',
+					sortable: true,
+					searchable: true,
+				},
+				{
+					id: 'status',
+					label: 'Status',
+					key: 'status',
+					sortable: true,
+					searchable: true,
+				},
+				{
+					id: 'organisatieIsEigenaarVan',
+					label: 'Eigenaar organisatie',
+					key: 'organisatieIsEigenaarVan',
+					sortable: false,
+					searchable: true,
+				},
+			],
+			voorzieningObjectActions: [
+				{
+					id: 'view',
+					label: 'View',
+					icon: Eye,
+					handler: (voorziening) => {
+						objectStore.setActiveObject('voorziening', voorziening)
+						navigationStore.setModal('viewVoorziening')
+					},
+				},
+				{
+					id: 'edit',
+					label: 'Edit',
+					icon: Pencil,
+					handler: (voorziening) => {
+						objectStore.setActiveObject('voorziening', voorziening)
+						navigationStore.setModal('voorziening')
+					},
+				},
+				{
+					id: 'copy',
+					label: 'Copy',
+					icon: ContentCopy,
+					handler: (voorziening) => {
+						objectStore.setActiveObject('voorziening', voorziening)
+						navigationStore.setDialog('copyObject', {
+							objectType: 'voorziening',
+							dialogTitle: 'Voorziening',
+						})
+					},
+				},
+				{
+					id: 'delete',
+					label: 'Delete',
+					icon: TrashCanOutline,
+					handler: (voorziening) => {
+						objectStore.setActiveObject('voorziening', voorziening)
+						navigationStore.setDialog('deleteObject', {
+							objectType: 'voorziening',
+							dialogTitle: 'Voorziening',
+						})
+					},
+				},
+			],
+			voorzieningMassActions: [
+				{
+					id: 'massDelete',
+					label: 'Delete Selected',
+					icon: Delete,
+					handler: () => {
+						navigationStore.setDialog('massDeleteObjects', {
+							objectType: 'voorziening',
+							dialogTitle: 'Voorzieningen',
+						})
+					},
+				},
+				{
+					id: 'massPublish',
+					label: 'Publish Selected',
+					icon: PublishIcon,
+					handler: () => {
+						navigationStore.setDialog('massPublishObjects', {
+							objectType: 'voorziening',
+							dialogTitle: 'Voorzieningen',
+						})
+					},
+				},
+				{
+					id: 'massDepublish',
+					label: 'Depublish Selected',
+					icon: PublishOffIcon,
+					handler: () => {
+						navigationStore.setDialog('massDepublishObjects', {
+							objectType: 'voorziening',
+							dialogTitle: 'Voorzieningen',
+						})
+					},
+				},
+			],
+			voorzieningActions: [
+				{
+					id: 'add',
+					label: 'Add Voorziening',
+					icon: Plus,
+					primary: true,
+					handler: () => {
+						objectStore.clearActiveObject('voorziening')
+						navigationStore.setModal('voorziening')
+					},
+				},
+				{
+					id: 'refresh',
+					label: 'Refresh',
+					icon: Refresh,
+					handler: () => {
+						objectStore.fetchCollection('voorziening')
+					},
+					disabled: () => objectStore.isLoading('voorziening'),
+				},
+				{
+					id: 'help',
+					label: 'Help',
+					icon: HelpCircleOutline,
+					handler: () => {
+						window.open('https://conduction.gitbook.io/softwarecatalog-nextcloud/beheerders/voorzieningen', '_blank')
+					},
+				},
+			],
+			addVoorzieningAction: {
+				id: 'add',
+				label: 'Add Voorziening',
+				icon: Plus,
+				handler: () => {
+					objectStore.clearActiveObject('voorziening')
+					navigationStore.setModal('voorziening')
+				},
+			},
+		}
+	},
+	methods: {
+		/**
+		 * Handle component mount - initialize settings and fetch voorzieningen
+		 * @return {Promise<void>}
+		 */
+		async onMounted() {
+			console.info('VoorzieningIndex mounted, initializing...')
+			try {
+				// Ensure settings are loaded first (this will also register object types)
+				if (!objectStore.settings) {
+					console.info('Loading settings before fetching voorzieningen...')
+					await objectStore.fetchSettings()
+				}
+
+				// Fetch voorzieningen collection
+				console.info('Fetching voorzieningen...')
+				await objectStore.fetchCollection('voorziening')
+			} catch (error) {
+				console.error('Error initializing VoorzieningIndex:', error)
+				// Show error to user if needed
+			}
+		},
+	},
+}
+</script>