diff --git a/docs/assets/software-catalog/software-model-entities.drawio.svg b/docs/assets/software-catalog/software-model-entities.drawio.svg
index 0105138fa0..7b8b88f224 100644
--- a/docs/assets/software-catalog/software-model-entities.drawio.svg
+++ b/docs/assets/software-catalog/software-model-entities.drawio.svg
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="751px" height="341px" viewBox="-0.5 -0.5 751 341" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-01-11T21:08:56.231Z&quot; agent=&quot;5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.27 Safari/537.36&quot; etag=&quot;LLaAGyZK8qBJ_lX9Ozl4&quot; version=&quot;14.1.9&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;owJHMEFGrEAKtmmgk64n&quot; name=&quot;Page-1&quot;&gt;3VrbcqM4EP0aV+0+2AWIi/3oOJnZrcpuMnHVzszTlgwyZgKIFfItX7+SERhJ2MEJjj2Th1hqXUCt06e7JXpgkmw+E5gt/sIBinuWEWx64LZnWaZtueyHS7aFxPPMQhCSKBCd9oJp9IKE0BDSZRSgXOpIMY5plMlCH6cp8qkkg4TgtdxtjmP5qRkMkSaY+jDWpV+jgC4K6dDy9vI/UBQuyieb7qhomUH/OSR4mYrn9SzwafdXNCewnEssNF/AAK9rInDXAxOCMS1KyWaCYq7bUm3FuE8HWqv3JiilbQas/l7Qb/7Tv2hlJODrj7un9fS/vphlBeMlKpfhxmy+mxkrhLxwixMYpaWYzV+1iHXRbanLnTYQf57BmteLiKJpBn3eumboYbIFTWJWM1lxHsXxBMeY7MaC+Ry5vs/kOSX4GdVaAm80M4zqefUVl6+PCEWbmkho4DPCCaJky7qI1nIzBFhHorre77zpCNmituuekEEBtrCaeK9wVhA6P0X/RsMGKFpFAQOsqGJCFzjEKYzv9tIbWe/7PvcYZ0LbPxClW2F9cEmxvBdoE9FvfPjAc0T1u5iNl2839cq2rKRMA/VRvP69nJFX9uN2tXLgwX3M8ZL46Ii6HEEQkISIHuknlMg11wYVfWPgOI4rQaNviocRFEMarWS6aAKCmP4RR2xZ1dy2J0OuIr5yimIxYtQeTmNC4LbWLeMdctnCy0eVffB8niOqgbJa8DtwCjScsv2jD/NGtN7DGfMSEsJgHIUpK/tszxEz7BtusxGj4bFoSKIgKMCM8ugFznbzcbSIhbPJnZuec9uIn+O2pbJD5UzEUyRCPoAPazgcdYKHvmUNHBlpYChPcsZtdC/LLladXcy27GJJ7GKcjV2sluzitGSX1kh5nwvxNNNk8M6XCcrHWXTN9ul2aJ9GZZ/Cqrph776tWas6yfms1Xo9OJtuc4qSXyU4G11bdDbSdiBAGUqD/CG9JJGaNRZloUs7HjUlEh04Z6NRtyWNgpY0KtBgG++z6MP2qlm9pwDRtNvFbJ0Zvp4VHIm2Psp7dwA663yoAy1Rd3pq4DplUtZVanB+16GH65rreEJCp43OQ3QmpeQ3NAgHbMbpl3v2/xYy3wxzNnbCZYAfhyz9Z74WLhgMBr936n8CBw0Du8n/DK0ZcN1u/I/jKqnaxf2PfVGDlw8DWobrisV7l/cznYfr7RJ9AD7WaZSk1JQHPP7ZCKQryQPsA4b6pjzdBXK83lEeYJrq8ZBXJgbnZ3N9ZzU2323xKUT+wOLY3SBO2OHTI/+p6uMVwUWJM33+k/O6mldYzsWJXU/tMoJX/CbkkK1e9RnNx4V5XZO+gAh7ZxuoUZ537VFeZQq/Wp5wBVHDG/IEz1QRdPV5gqsBSPMsE5xkOOV6Psm/8OtRlAZ8SxBZRb7IFQLmT/jORRmKoxT9vE5FTRZM79JORT8HPkQGaTDmN+c8zIthnkd+G0u2ri7lt1qastnSlFXir+1k00Y67zyQEkAC6mGTCpBCD1reoE1U3SyeeNP4kXwzPBz3NN1VvAbU6o7otLPNZoB7xwEuU9L5UXtiBLO7ozRl/2PrlHROINsK/qw3AvlVizj5yvyAwdjqMS84bmDqAoeOYiPFG5zTqibhlISrL9u7/uoFuJiMnH/uG7/iUUzpFRcqu8qU+ft3eska5KwGyKnQeIsTbFSFnlhdXBXlpYLy7REwdesEDapSj5FaqIpV99+VFSDbf7wH7v4H&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><rect x="20" y="90" width="150" height="70" fill="#ffe6cc" stroke="#d79b00" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 125px; margin-left: 21px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>Domain</b></div></div></div></foreignObject><text x="95" y="129" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Domain</text></switch></g><path d="M 402.5 250 L 402.5 166.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 402.5 161.12 L 406 168.12 L 402.5 166.37 L 399 168.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 181px; margin-left: 381px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">partOf</div></div></div></foreignObject><text x="381" y="184" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">partOf</text></switch></g><path d="M 327.5 160 L 327.5 243.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 327.5 248.88 L 324 241.88 L 327.5 243.63 L 331 241.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 181px; margin-left: 291px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">consumesApi</div></div></div></foreignObject><text x="291" y="184" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">consumesApi</text></switch></g><rect x="290" y="90" width="150" height="70" fill="#ffe6cc" stroke="#d79b00" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 125px; margin-left: 291px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>System</b></div></div></div></foreignObject><text x="365" y="129" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">System</text></switch></g><path d="M 710 205 L 730 205 L 730 55 L 716.37 55" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 711.12 55 L 718.12 51.5 L 716.37 55 L 718.12 58.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 130px; margin-left: 690px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">dependsOn</div></div></div></foreignObject><text x="690" y="133" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">dependsOn</text></switch></g><path d="M 560 55 L 500 55 L 500 107.5 L 446.37 107.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 441.12 107.5 L 448.12 104 L 446.37 107.5 L 448.12 111 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 40px; margin-left: 530px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">partOf</div></div></div></foreignObject><text x="530" y="43" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">partOf</text></switch></g><rect x="560" y="20" width="150" height="70" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 55px; margin-left: 561px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>Resource</b><br />(e.g. SQL Database, S3 bucket, ...)</div></div></div></foreignObject><text x="635" y="59" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Resource...</text></switch></g><path d="M 672.5 240 L 672.5 302.5 L 446.37 302.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 441.12 302.5 L 448.12 299 L 446.37 302.5 L 448.12 306 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 291px; margin-left: 511px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">consumesAPI</div></div></div></foreignObject><text x="511" y="294" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">consumesAPI</text></switch></g><rect x="290" y="250" width="150" height="70" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 285px; margin-left: 291px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>API</b><br />(e.g. OpenAPI, gRPC API, Avro, Dataset, ...)</div></div></div></foreignObject><text x="365" y="289" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">API...</text></switch></g><path d="M 597.5 240 L 597.5 267.5 L 446.37 267.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 441.12 267.5 L 448.12 264 L 446.37 267.5 L 448.12 271 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 251px; margin-left: 510px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">providesAPI</div></div></div></foreignObject><text x="510" y="254" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">providesAPI</text></switch></g><path d="M 560 205 L 500 205 L 500 142.5 L 446.37 142.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 441.12 142.5 L 448.12 139 L 446.37 142.5 L 448.12 146 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 190px; margin-left: 530px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">partOf</div></div></div></foreignObject><text x="530" y="193" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">partOf</text></switch></g><rect x="560" y="170" width="150" height="70" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 205px; margin-left: 561px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>Component</b><br />(e.g. backend service, data pipeline ...)</div></div></div></foreignObject><text x="635" y="209" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Component...</text></switch></g><path d="M 290 107.5 L 176.37 107.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 171.12 107.5 L 178.12 104 L 176.37 107.5 L 178.12 111 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 91px; margin-left: 230px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">partOf</div></div></div></foreignObject><text x="230" y="94" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">partOf</text></switch></g><path d="M 290 142.5 L 240 143 L 240 285 L 283.63 285" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 288.88 285 L 281.88 288.5 L 283.63 285 L 281.88 281.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 180px; margin-left: 200px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">providesApi</div></div></div></foreignObject><text x="200" y="183" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">providesApi</text></switch></g><rect x="0" y="0" width="20" height="20" fill="#ffffff" stroke="none" pointer-events="all"/><rect x="720" y="310" width="30" height="30" fill="#ffffff" stroke="none" pointer-events="all"/></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="751px" height="341px" viewBox="-0.5 -0.5 751 341" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-01-12T14:03:42.433Z&quot; agent=&quot;5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.27 Safari/537.36&quot; etag=&quot;j2Mfd1AxaJrI_fjXD5ba&quot; version=&quot;14.1.9&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;owJHMEFGrEAKtmmgk64n&quot; name=&quot;Page-1&quot;&gt;3VrbcuI4EP0aqnYeoLCEbXgkwMxuVXaSCVVzedoStjCa2JZXFrd8/UhY8p3ECSYwkweQWjfUffp0t50OnAS7TwxFq3+pi/0O6Lu7Dpx2ADAGwBJfUrJPJLZtJAKPEVdNygRz8oSVsK+ka+LiuDCRU+pzEhWFDg1D7PCCDDFGt8VpS+oXT42QhyuCuYP8qvQbcfkqkQ6Bncn/xsRb6ZMNa5SMLJDz6DG6DtV5HQA/Hv6S4QDpvdRF4xVy6TYngrMOnDBKedIKdhPsS91qtSXrPh4ZTX83wyFvsmDzecW/Ow//4U0/gN9+zh628/+7apcN8tdYX8PyxX43C9HwZGNKA0RCLRb7pyPqXnyvdXnQBpbn9cXwdkU4nkfIkaNbgR4hW/HAFz1DNJfE9yfUp+ywFi6X2HIcIY85o484N+Lao0W/n56Xv7H++ZhxvMuJlAY+YRpgzvZiihrVxlBgHanuNrO8YSrZKmd1W8mQApuXbpwpXDSUzl+j/36NAUpaxa4ArOpSxlfUoyHyZ5n0pqj3bM4tpZHS9k/M+V55H1pzWrQF3hH+XS7vmar3Q20m29NdvrPXnVAoILdIdn/o/WQnW3bo6XVHrRjTNXPwM8oyFT0g5mH+zDylQqm3JpjoiguYplUARtdQhzHsI042RbKog4Ha/p4Sca1074FdBFxKe3qL5DJqVQamMWNon5sWyQlx0b/1UXoOXS5jzCuQTC98AkphBaXCfvxuWYvVW7QQMaKAL+QTLxRtR9gcC7e+kR5LBAmP1UBAXDeBMo7JE1oc9pNoURcXm5s3HXNai5/nPavMDWkoUacU6PgIPsBwOGoFD10AemYRaXBY3OR8ZgQvk/18H3Mc/ClkP7o2th9VLODiCIdufBdekvaNPOmnIeAF2jfypJ+LAa3TvtWQ9mFD2ldoGPRP8+jj/lrxersERGPQLAq05vjVLOMZ/n6vXKMF0IHzoQ6eLdmwTJ3ktZVsnD90VBOASuh4wEqntcFDTWZa8hfueT2x4/zLrficIhGNUSzWTqQMyvJq7TzKu0hBr9f70Gr8cU08dAd18WcIFtCy2ok/plVK/i4efwYXdfiena8ujDd5vH35OGM29PiWSwcI3zdoaFLK+bxInON1gOPx/T+1QLqSzH9wxFHflPlbsJivt1MXdg2jXHDaujA4P5tXLVth84OJX0PkdyKPPSyShO093MuvtD/eMJq0JNPHvzmvl+sKYF6c2KulXcToRj5ZPear70b64HTSP2Oa1zbpK4iI3zyA5SzPvvYsD1QfB/8ZdcIVZA1vqBNso4ygq68TrJcjy4QGEQ2lnl8VX+TrFhy60iSYbYijagVXxBNpORJhn4T49w0q5WLBsC8dVOzGZBC6Y/kmTqZ5Popj4jTxZHB1JT9o6MpGQ1cuE3/OknWGNE98IKWABMsPm8oASfRQqRsqG6XvKl757uJMfDPx5szbfNnPupsnaFE2Mr/e1r6/LKHzBWcvOnUomOlEf85ZGdRYGbTgrrWqqKaAF1eFfvxZeusKjSq1wRpVlQveBqoS3eyNegKy7N8W4OwX&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><rect x="20" y="90" width="150" height="70" fill="#ffe6cc" stroke="#d79b00" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 125px; margin-left: 21px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>Domain</b></div></div></div></foreignObject><text x="95" y="129" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Domain</text></switch></g><path d="M 365 250 L 365 166.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 365 161.12 L 368.5 168.12 L 365 166.37 L 361.5 168.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 181px; margin-left: 343px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">partOf</div></div></div></foreignObject><text x="343" y="184" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">partOf</text></switch></g><rect x="290" y="90" width="150" height="70" fill="#ffe6cc" stroke="#d79b00" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 125px; margin-left: 291px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>System</b></div></div></div></foreignObject><text x="365" y="129" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">System</text></switch></g><path d="M 710 205 L 730 205 L 730 55 L 716.37 55" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 711.12 55 L 718.12 51.5 L 716.37 55 L 718.12 58.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 130px; margin-left: 690px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">dependsOn</div></div></div></foreignObject><text x="690" y="133" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">dependsOn</text></switch></g><path d="M 560 55 L 500 55 L 500 107.5 L 446.37 107.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 441.12 107.5 L 448.12 104 L 446.37 107.5 L 448.12 111 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 40px; margin-left: 530px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">partOf</div></div></div></foreignObject><text x="530" y="43" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">partOf</text></switch></g><rect x="560" y="20" width="150" height="70" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 55px; margin-left: 561px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>Resource</b><br />(e.g. SQL Database, S3 bucket, ...)</div></div></div></foreignObject><text x="635" y="59" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Resource...</text></switch></g><path d="M 672.5 240 L 672.5 302.5 L 446.37 302.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 441.12 302.5 L 448.12 299 L 446.37 302.5 L 448.12 306 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 291px; margin-left: 511px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">consumesAPI</div></div></div></foreignObject><text x="511" y="294" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">consumesAPI</text></switch></g><rect x="290" y="250" width="150" height="70" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 285px; margin-left: 291px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>API</b><br />(e.g. OpenAPI, gRPC API, Avro, Dataset, ...)</div></div></div></foreignObject><text x="365" y="289" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">API...</text></switch></g><path d="M 597.5 240 L 597.5 267.5 L 446.37 267.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 441.12 267.5 L 448.12 264 L 446.37 267.5 L 448.12 271 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 251px; margin-left: 510px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">providesAPI</div></div></div></foreignObject><text x="510" y="254" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">providesAPI</text></switch></g><path d="M 560 205 L 500 205 L 500 142.5 L 446.37 142.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 441.12 142.5 L 448.12 139 L 446.37 142.5 L 448.12 146 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 190px; margin-left: 530px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">partOf</div></div></div></foreignObject><text x="530" y="193" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">partOf</text></switch></g><rect x="560" y="170" width="150" height="70" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 205px; margin-left: 561px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; "><b>Component</b><br />(e.g. backend service, data pipeline ...)</div></div></div></foreignObject><text x="635" y="209" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Component...</text></switch></g><path d="M 290 107.5 L 176.37 107.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 171.12 107.5 L 178.12 104 L 176.37 107.5 L 178.12 111 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 91px; margin-left: 230px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; "><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">partOf</div></div></div></foreignObject><text x="230" y="94" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">partOf</text></switch></g><rect x="0" y="0" width="20" height="20" fill="#ffffff" stroke="none" pointer-events="all"/><rect x="720" y="310" width="30" height="30" fill="#ffffff" stroke="none" pointer-events="all"/></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md
index 750cbcfe1a..725f358b92 100644
--- a/docs/features/software-catalog/descriptor-format.md
+++ b/docs/features/software-catalog/descriptor-format.md
@@ -994,32 +994,6 @@ to, e.g. `artists`. This field is optional.
 | --------------------------------------- | ------------------------------------------ | ----------------------------------------------------------------------------- |
 | [`Domain`](#kind-domain) (default)      | Same as this entity, typically `default`   | [`partOf`, and reverse `hasPart`](well-known-relations.md#partof-and-haspart) |
 
-### `spec.providesApis` [optional]
-
-An array of [entity references](#string-references) to the APIs that are
-provided by the system, e.g. `artist-api`. This field is optional.
-
-APIs can be exposed by the system, providing consumers a higher level
-abstraction on providers of APIs without needing to have a detailed view in the
-involved components.
-
-| [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                                  |
-| --------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------------------------- |
-| [`API`](#kind-api) (default)            | Same as this entity, typically `default`   | [`providesApi`, and reverse `apiProvidedBy`](well-known-relations.md#providesapi-and-apiprovidedby) |
-
-### `spec.consumesApis` [optional]
-
-An array of [entity references](#string-references) to the APIs that are
-consumed by the system, e.g. `artist-api`. This field is optional.
-
-APIs can be consumed by the system, providing providers a higher level
-abstraction on consumers of their APIs without needing to have a detailed view
-in the involved components. This field is optional.
-
-| [`kind`](#apiversion-and-kind-required) | Default [`namespace`](#namespace-optional) | Generated [relation](well-known-relations.md) type                                                  |
-| --------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------------------------- |
-| [`API`](#kind-api) (default)            | Same as this entity, typically `default`   | [`consumesApi`, and reverse `apiConsumedBy`](well-known-relations.md#consumesapi-and-apiconsumedby) |
-
 ## Kind: Domain
 
 Describes the following entity kind:
diff --git a/docs/features/software-catalog/well-known-relations.md b/docs/features/software-catalog/well-known-relations.md
index daebd32701..af2e7367f2 100644
--- a/docs/features/software-catalog/well-known-relations.md
+++ b/docs/features/software-catalog/well-known-relations.md
@@ -48,11 +48,10 @@ where present.
 ### `providesApi` and `apiProvidedBy`
 
 A relation with an [API](descriptor-format.md#kind-api) entity, typically from a
-[Component](descriptor-format.md#kind-component) or
-[System](descriptor-format.md#kind-system).
+[Component](descriptor-format.md#kind-component).
 
-These relations express that a component or system exposes an API - meaning that
-it hosts callable endpoints from which you can consume that API.
+These relations express that a component exposes an API - meaning that it hosts
+callable endpoints from which you can consume that API.
 
 This relation is commonly generated based on `spec.providesApis` of the
 component or system in question.
@@ -60,11 +59,10 @@ component or system in question.
 ### `consumesApi` and `apiConsumedBy`
 
 A relation with an [API](descriptor-format.md#kind-api) entity, typically from a
-[Component](descriptor-format.md#kind-component) or
-[System](descriptor-format.md#kind-system).
+[Component](descriptor-format.md#kind-component).
 
-These relations express that a component or system consumes an API - meaning
-that it depends on endpoints of the API.
+These relations express that a component consumes an API - meaning that it
+depends on endpoints of the API.
 
 This relation is commonly generated based on `spec.consumesApis` of the
 component or system in question.