diff --git a/docs/assets/software-catalog/software-model-core-entities.drawio.svg b/docs/assets/software-catalog/software-model-core-entities.drawio.svg
old mode 100644
new mode 100755
index 2260e5502e..1a8f63f9b2
--- a/docs/assets/software-catalog/software-model-core-entities.drawio.svg
+++ b/docs/assets/software-catalog/software-model-core-entities.drawio.svg
@@ -1,3 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Do not edit this file with editors other than diagrams.net -->
 <!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="731px" height="111px" viewBox="-0.5 -0.5 731 111" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-01-11T21:07:41.524Z&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;1ks_tgauFp-X9LQCA8Fb&quot; version=&quot;14.1.9&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;owJHMEFGrEAKtmmgk64n&quot; name=&quot;Page-1&quot;&gt;1Vhbc6IwFP41zuw+6HApoI/e2t1pu3X1od2nToQIaYGwIaLur98TCELE2traaeuDJicnF77zne8EW+YwWl8wlATX1MNhy9C8dcsctQxDPzNs+BGWTWFxHL0w+Ix40qkyzMg/LI2atC6Jh1PFkVMacpKoRpfGMXa5YkOM0ZXqtqChumuCfNwwzFwUNq23xONBYe0aTmX/gYkflDvrdq8YmSP30Wd0Gcv9WoZ5nn+K4QiVa8kHTQPk0VXNZI5b5pBRyotWtB7iUGBbwlbMO39idHtuhmP+kgnZr4DfudN7nGmRefswnq5mf9u6fJgMhUsJiIcTHHvpTSyPzTclVNgD5GSXMh5Qn8YoHFfWQQ4HFhtq0Kt8rihNwKiD8QFzvpE0QEtOwRTwKJSj8Cxscyfn550/otOxyu5oXR8cbcremvC7cg1o12ZBr5okOuWcJoAS05QumYsPoCYpzxHzMT/gZxZ+ArfaBjI8F5hGGJ4BHGTq6Fbhz3CIOMlUgiLJc387bbvShBJ4gsqFLhYpnEshQ+kj89Yq009u3dPUXQoI5KRqHWjUDl6ZcqodQTuzwbqWYYcA5WAODV80pliGQQ7APtuxrTMrLd9wx+/AirPfV/A9QhzNUQpzh8Jmimxduo8CE2HodDrfG+RWqbsKCMezBOU0WIHyqTRdkDAc0pCyfK7pWbjrnYE95Yw+4tpI15ibtn2IbBlmHK8P0qOMma3GrBSWVSVbuiVtQU2yHO1pBimBPTaK+tmHSIRMdU1Jdedwrm91RVd1xXlOWN5fJKwXisRrVUGyx9jJeL27Q4vioI2U7zOGNjW3RDikL9/HMXd4Vix4UjkphbOmJ3BdSJcRTvuTn3tJeoXmcJFRiIVC4sfQdiHUGPJ3IFKTwE2hLwci4nkFh3FK/qF5vp4gicQEFrcGLWu0lzYHM6ghAtv7jtxFuTPsE4e21jFs01Kgf2M5KVcub3hy1bbudCx1kWbBOVVkm4FtFIo8wsfUiBu43+STRC3wpxPxs+33M0aLligi6RcvGcZnqxhGI54Jo5l4A3gqUT+kmhivqybG16kmkiBwZr2nqgbk93tdQ0+lCvbzqjCkUUJjAfNR2iBe6uDtR0QEs4y48grpgRaIwJEEhyTGX1gQeh+nCP1r8965vM2ShfbgLu3kcnJN2/qeUL4FVRW9GCjwRuDqyOwBRn8vYJpK+cmAkaPOTo3RtT2UOg1w0K3+Lim0pPpPyhz/Bw==&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><path d="M 440 55 L 553.63 55" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 558.88 55 L 551.88 58.5 L 553.63 55 L 551.88 51.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: 40px; margin-left: 500px;"><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="500" y="43" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">dependsOn</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 290 72.5 L 210 72.5 L 176.37 72.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 171.12 72.5 L 178.12 69 L 176.37 72.5 L 178.12 76 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: 61px; margin-left: 221px;"><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="221" y="64" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">consumesAPI</text></switch></g><rect x="20" 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: 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>API</b><br />(e.g. OpenAPI, gRPC API, Avro, Dataset, ...)</div></div></div></foreignObject><text x="95" y="59" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">API...</text></switch></g><path d="M 290 37.5 L 176.37 37.5" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 171.12 37.5 L 178.12 34 L 176.37 37.5 L 178.12 41 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: 21px; margin-left: 217px;"><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="217" y="24" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">providesAPI</text></switch></g><rect x="290" 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: 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>Component</b><br />(e.g. backend service, data pipeline ...)</div></div></div></foreignObject><text x="365" y="59" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">Component...</text></switch></g><rect x="0" y="0" width="10" height="10" fill="#ffffff" stroke="none" pointer-events="all"/><rect x="720" y="100" width="10" height="10" 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="731px" height="111px" viewBox="-0.5 -0.5 731 111" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2022-06-10T08:26:54.242Z&quot; agent=&quot;5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.0.0 Safari/537.36&quot; etag=&quot;j8YEHC2xJSUMPaAPWDOX&quot; version=&quot;17.4.3&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;owJHMEFGrEAKtmmgk64n&quot; name=&quot;Page-1&quot;&gt;1VnfV5swFP5res720B4ghdLH2up+6ebs2XRPnhRSiAJhIaXt/volEAoBxGrtdD5ocnNzb7j57neT2APTcPOBwti/IC4Keobmbnpg1jMM3dDG/I+QbHOJNTZygUexK5VKwRz/QVKoSekKuyhRFBkhAcOxKnRIFCGHKTJIKVmraksSqF5j6KGGYO7AoCm9xi7zc6ltjEr5R4Q9v/CsW/KDF9C59yhZRdJfzwBn2U8+HMLClvzQxIcuWVdE4LQHppQQlrfCzRQFIrZF2PJ5Zw+M7tZNUcT2mZB+9dmNc3WLUi0E13enV+v5774uPyaFwUoGxEUxitzkWySXzbZFqJDLIye7hDKfeCSCwWkpPcnCgYRDjfdKnXNCYi7UufAOMbaVMIArRrjIZ2EgR9EGs5tK+5cwNTBM2Z1tpOmssy06EaPbm2qnOk30y3lZr5jYDKGMakJW1EEdcbMkUiH1EOvQA7meiFzFgdygD4iEiK+HK8jk0c1cn6IAMpyqEIUS6d5u2s7SJcH8C0oVslwmfF0KHAodmblmkYDS9VhTveQhkJO67ADVzqhmJw9Rw86EUritqMVCIWn5JOlmOFbdALtzVd3qvJH7L3qVvShFWf48IZdAI5V6hhVwdJwseMMTjSskkSUHuJ/d2E6ZFpJ3aOANuMX593P+ewYZXMCEz50KGRAUtHLuxTYLwWAweN/IWDUf1z5maB7DDNlrTudq7i1xEExJQGg2F7gmst0hlyeMkntUGbGNBbCsrvxJEWVo04n4Aj6WulEFW65LLtZNKfMrPFyHWTUpKtv89F3Uh6/Je5rCe6M9eU9XeW/0+rxn7sl7zyU6iR6jRmK6fRz2qfsZgePTSVELKnzCz0DJKkTJ5PJTK0jP4YKfzhRgwQB7EW87fKsRz98TkZqYH38mciDErptjGCX4D1xk9gRIZEy4cfOkZ85aYdOZQQ0S2B3ipBflINRGDn1ewy1gKqE/sEIWlg1LsdrXRwNTNdKsoS+1s82NbRSKbIefUiO+8UNbNknUAu/qUvzZ9ScpJXlLFJHkPy8ZxlurGEZjP2NKUnGteShRX6Wa7HuKrlWTN3CK3reaSIDwNetjlTV4fh/GG8dnBetxVpiSMCaRCPOTuEHcVPmVTuwIoil25BHS5VwgNg7HKMAR+o8JYfx6jDC5ALejL9dpvNTunJUVf7m8IH29ZSsPiaoavYhD4MDAVSPTEhj9WIFpMuUbC4wcHdVqjK61QOpIgbs1f7LPNrI/f/+RnPXNua+R2T6I4hk+Ee9h4rAXwCTBjhorNbDtDy1HvW/U6Pu4JcN6FPhtjFDIDjxdgsbrwzMfV4ZmDYd1gL3U64qt+jHN7mXZR70OtWZAkzq6Hyr/yV1o7yuOCvaHU7zrKjRsHGqMF0FrDWMvcA3i3fJdO1cv/3kATv8C&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);"><defs/><g><path d="M 440 37.5 L 490 37.5 L 553.63 37.5" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 558.88 37.5 L 551.88 41 L 553.63 37.5 L 551.88 34 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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: 23px; margin-left: 500px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">dependsOn</div></div></div></foreignObject><text x="500" y="26" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">dependsOn</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 pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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 data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><b>Resource</b><br />(e.g. SQL Database, S3 bucket, ...)</div></div></div></foreignObject><text x="635" y="59" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Resource...</text></switch></g><path d="M 290 72.5 L 210 72.5 L 176.37 72.5" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 171.12 72.5 L 178.12 69 L 176.37 72.5 L 178.12 76 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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: 61px; margin-left: 221px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">consumesAPI</div></div></div></foreignObject><text x="221" y="64" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">consumesAPI</text></switch></g><rect x="20" y="20" width="150" height="70" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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: 21px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><b>API</b><br />(e.g. OpenAPI, gRPC API, Avro, Dataset, ...)</div></div></div></foreignObject><text x="95" y="59" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">API...</text></switch></g><path d="M 290 37.5 L 176.37 37.5" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 171.12 37.5 L 178.12 34 L 176.37 37.5 L 178.12 41 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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: 21px; margin-left: 217px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">providesAPI</div></div></div></foreignObject><text x="217" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">providesAPI</text></switch></g><rect x="290" y="20" width="150" height="70" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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: 291px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><b>Component</b><br />(e.g. backend service, data pipeline ...)</div></div></div></foreignObject><text x="365" y="59" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Component...</text></switch></g><rect x="0" y="0" width="10" height="10" fill="rgb(255, 255, 255)" stroke="none" pointer-events="all"/><rect x="720" y="100" width="10" height="10" fill="rgb(255, 255, 255)" stroke="none" pointer-events="all"/><path d="M 440 55 L 480 55 L 480 73 L 446.37 72.58" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 441.12 72.51 L 448.16 69.1 L 446.37 72.58 L 448.07 76.1 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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: 63px; margin-left: 519px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">dependsOn</div></div></div></foreignObject><text x="519" y="66" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">dependsOn</text></switch></g></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%">Text is not SVG - cannot display</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/assets/software-catalog/software-model-entities.drawio.svg b/docs/assets/software-catalog/software-model-entities.drawio.svg
old mode 100644
new mode 100755
index 7b8b88f224..e14cc93e62
--- a/docs/assets/software-catalog/software-model-entities.drawio.svg
+++ b/docs/assets/software-catalog/software-model-entities.drawio.svg
@@ -1,3 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Do not edit this file with editors other than diagrams.net -->
 <!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-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
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="751px" height="342px" viewBox="-0.5 -0.5 751 342" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2022-06-10T08:31:52.901Z&quot; agent=&quot;5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.0.0 Safari/537.36&quot; etag=&quot;IHw4RdAX8tDURWJRtPTF&quot; version=&quot;17.4.3&quot; type=&quot;device&quot;&gt;&lt;diagram id=&quot;owJHMEFGrEAKtmmgk64n&quot; name=&quot;Page-1&quot;&gt;3Vpbk6I4FP41Vs0+aAkRkEdvMztbPds9bdVOz9NWhIhMA2FDvPWv30TCJYCKNI7O9EObnCQn5ly+c05iB0z83ScCw9UXbCOvo/btXQdMO6qq9PtD9sEp+5iiGUZMcIhri0kZYe6+oWSloK5dG0XSRIqxR91QJlo4CJBFJRokBG/laUvsybuG0EElwtyCXpn6zbXpKqYOVSOj/4lcZ5XsrOhmPLKA1qtD8DoQ+3VU8PHwFw/7MOElDhqtoI23ORKYdcCEYEzjlr+bII/LNhFbvO7jkdH0exMU0DoLNn+v6Iv1/C/a9H3w7cfseTv/ryu4bKC3RskxdI/xGy9Yw+GNKfahGyRkxj8dEeei+0SWB2kgvl+fDW9XLkXzEFp8dMush9FW1PdYT2HNpet5E+xhclgLlkukWxajR5TgV5QbsQ1z0e+n++VPnHx9RCja5UhCAp8Q9hElezZFjCbKEMZqiu4207yiCdoqp3VD0KAwNidlnAmcNYTML5F/v0IBBakimxms6GJCV9jBAfRmGXUsyz2b84BxKKT9A1G6F94H1xTLukA7l77w5T1N9L4LZrw93eU7+6QTMAHkFvHu94Qf72TLDr1k3VEtRnhNLHRCWJqAB0gcRE/MEyLkcqtjE112AE3TJcPoKmIzgjxI3Y0MFlVmINg/YZcdK+U9MGSDS2EvYREfRqzKjGlECNznpoV8QiT7d7JVMgcvlxGiJZNMD/wOKwUlK2X6o4/LSlt9gAsWIyT7gp7rBKxtMZ0j5tZj7rEuA+GRGPBd245NGUXuG1wc+HFrEQdnzLVxR5tW2s9pzypiQxpKxC4SHB+xD3U4NFuxh66q9jTZ0sBQZnI9NarnwX6+jyjyfxewN+8N7c2SBmwUosCOHoPbwr7aCPfVi4D/qM+X0KF5iNBrhghwWYg4HDVvSonTvhMOCgvKrl9aoZlGAUCGBfw4ElFqcFL0AqtY3A2CU2uIVU6PTgSen+UteVdJE6YzzqLkPSXvOa1nSeBqWZKuJdlpW1nS9WNeOXMpxbxnJGRaGfXEZJJQPqCe02Mc518f2P8pZGkEjNjaCacBXheurVd+Fk7o9Xp/tBo4bQ0N7UFV4ByqC6Dr7QROTS9krTcPnIPbhkcjHx6VRh5vXM/j6wY9rabHt1zzAFCv5mmtWtFKPs8y/mjto2j09LnSkO6kZBkccdRGJYsO5OjeTkHbVZRipZymEddH87JmS2h+UPElQP7IEvDDIg7YzvMT/0j7ow3BcYsjffSL43qxIFK1mwN7uSYNCd7wK+FjvnqbmqgZ6F8xzWsb9LNKZwCKWZ5x71meWr7H/j3qhDvIGhrUCYZStKC7rxP085Flgv0QB1zOF8UX/k6EApurBJGNa4lawWbxhGvODZHnBujXDSrFYkExbh1UjNpgENgj/oTI0zwPRpFr1fFk9e5KfrWmKys1XbkI/DlNVikyob0ztQTmEUM6cx1VYpQ+slz46HIlvJk4c+Jsvu5n3c0b0DExtX8eKh9eC9Z5xtllpw4YMr3Tn3NaViu0rLbgrpWiKKeANxeFGDUKz8VAKUMbqBBVseBtIqrtcLr/623s6OZjaHwBZhS80DpWcw7T5ICSu8w3pMv8/hmwavJiXIk+101e9LOmfkVAMwoXIYrZENAMUAC0mjcqxy/qq/cpXhkog/7J76Ub4NR81oi/QVPkrPSBMlycfkP7KXc7ta9sZHM/7uQnr3bSXyu800CHkva6RYRvEv1YN/tJUzw9+90YmP0P&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 pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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 data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><b>Domain</b></div></div></div></foreignObject><text x="95" y="129" fill="rgb(0, 0, 0)" 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="rgb(0, 0, 0)" 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="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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 data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">partOf</div></div></div></foreignObject><text x="343" y="184" fill="rgb(0, 0, 0)" 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 pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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 data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><b>System</b></div></div></div></foreignObject><text x="365" y="129" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">System</text></switch></g><path d="M 597.5 170 L 597.5 96.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 597.5 91.12 L 601 98.12 L 597.5 96.37 L 594 98.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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: 120px; margin-left: 561px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">dependsOn</div></div></div></foreignObject><text x="561" y="123" fill="rgb(0, 0, 0)" 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="rgb(0, 0, 0)" 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="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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 data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">partOf</div></div></div></foreignObject><text x="530" y="43" fill="rgb(0, 0, 0)" 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 pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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 data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><b>Resource</b><br />(e.g. SQL Database, S3 bucket, ...)</div></div></div></foreignObject><text x="635" y="59" fill="rgb(0, 0, 0)" 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="rgb(0, 0, 0)" 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="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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: 290px; margin-left: 511px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">consumesAPI</div></div></div></foreignObject><text x="511" y="294" fill="rgb(0, 0, 0)" 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 pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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 data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><b>API</b><br />(e.g. OpenAPI, gRPC API, Avro, Dataset, ...)</div></div></div></foreignObject><text x="365" y="289" fill="rgb(0, 0, 0)" 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="rgb(0, 0, 0)" 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="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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 data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">providesAPI</div></div></div></foreignObject><text x="510" y="254" fill="rgb(0, 0, 0)" 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="rgb(0, 0, 0)" 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="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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 data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">partOf</div></div></div></foreignObject><text x="530" y="193" fill="rgb(0, 0, 0)" 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 pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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 data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><b>Component</b><br />(e.g. backend service, data pipeline ...)</div></div></div></foreignObject><text x="635" y="209" fill="rgb(0, 0, 0)" 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="rgb(0, 0, 0)" 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="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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 data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">partOf</div></div></div></foreignObject><text x="230" y="94" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">partOf</text></switch></g><rect x="0" y="0" width="20" height="20" fill="rgb(255, 255, 255)" stroke="none" pointer-events="all"/><rect x="720" y="310" width="30" height="30" fill="rgb(255, 255, 255)" stroke="none" pointer-events="all"/><path d="M 635 170 L 635 140 L 673 140 L 672.61 163.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 672.52 168.88 L 669.14 161.82 L 672.61 163.63 L 676.13 161.94 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><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: 120px; margin-left: 650px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">dependsOn</div></div></div></foreignObject><text x="650" y="124" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">dependsOn</text></switch></g></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%">Text is not SVG - cannot display</text></a></switch></svg>
\ No newline at end of file
diff --git a/docs/features/software-catalog/system-model.md b/docs/features/software-catalog/system-model.md
index eedb94d02e..8a7e0cd30a 100644
--- a/docs/features/software-catalog/system-model.md
+++ b/docs/features/software-catalog/system-model.md
@@ -33,8 +33,8 @@ tracked in source control, or use some existing open source or commercial
 software.
 
 A component can implement APIs for other components to consume. In turn it might
-depend on APIs implemented by other components, or resources that are attached
-to it at runtime.
+consume APIs implemented by other components, or directly depend on components or
+resources that are attached to it at runtime.
 
 ### API