diff --git a/demo/html/FirstDivision/ApplicationPackage/index.html b/demo/html/FirstDivision/ApplicationPackage/index.html
index 60b7107..4d5ebf7 100644
--- a/demo/html/FirstDivision/ApplicationPackage/index.html
+++ b/demo/html/FirstDivision/ApplicationPackage/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a> | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>ApplicationPackage</h1>
 <h2>Integration Diagram</h2>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZarBmq0GXk_pAyPJJu6sYdWefMaJnOEDQCH3aJ8cGx9aixFCRlr0_EzIuWTuodjQzddUcPcC3amcE2hVQlfG5bVvDhzBopp3JP7bc2IO5RWjIiopw_BaLnqzTVIji0gHD1vw2z54ovXwRqr5qOYxfQgZXg4rDME8h2pntJE4YYnZJsyuEp-zECEMJTD629rndfHwhAJtujX5_034DLLTet9mzKQiA5vQKRAFhObyfA8rwq3MbgeE45DLUHs-Dchw80u-ONSZpyPowlqJKi3z51UBrZIjFIvVBc5tp_h2Ei0PxAUO9ClZwwyu7-3yNtC__r5NxEf3Rxy2003__p0OVjO0" alt=""></p>
@@ -23,22 +23,22 @@ <h2>Application Index</h2>
 <tr>
 <td>MobileApp</td>
 <td><a href="#MobileApp-Another">Another</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>MobileApp</td>
 <td><a href="#MobileApp-Login">Login</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>MobileApp2</td>
 <td><a href="#MobileApp2-SecondEndpoint">SecondEndpoint</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>MobileApp2</td>
 <td><a href="#MobileApp2-ThirdEndpoint">ThirdEndpoint</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 </tbody>
 </table>
@@ -57,7 +57,7 @@ <h2>Application MobileApp</h2>
 <ul>
 <li>this is a comment for MobileApp</li>
 </ul>
-<h3>MobileApp Another</h3>
+<h3><a name=MobileApp-Another></a>MobileApp Another</h3>
 <p>hello, world</p>
 <details>
 <summary>Sequence Diagram</summary>
@@ -75,7 +75,7 @@ <h4>Response types</h4>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCaK5Bmq0GXU_pAvwvHBScD3sMKbhSHJoqWHhFOPeEMaWsTNSZ5Eb_5xNe8Jda7OVtFZwObG_iGjVK58yEnJ56vLfTlnJvezcQtRem6W-vDaWIw1pRl83HJyNDNtKqTRGhLJLxZsWZhwmvy9wzfAOvXNC4zYYdYmLkzNthghVZuGxB9JxfCZZQj5Qkemm3gmcuQJiRCCVHXd_8ixWFSUbE_AcrNdu9is72dcksbM0EfVh6Ij44xvsuSx_mOwSKNQYSGIK9eYnDCqGefxrBHYknX--dVmK00F__ZEPvaG00" alt=""></p>
 </details>
 <hr>
-<h3>MobileApp Login</h3>
+<h3><a name=MobileApp-Login></a>MobileApp Login</h3>
 <p>hello, gamers</p>
 <details>
 <summary>Sequence Diagram</summary>
@@ -97,7 +97,7 @@ <h2>Application MobileApp2</h2>
 <ul>
 <li>this is a comment for MobileApp</li>
 </ul>
-<h3>MobileApp2 SecondEndpoint</h3>
+<h3><a name=MobileApp2-SecondEndpoint></a>MobileApp2 SecondEndpoint</h3>
 <p>SecondEndpoint, comment</p>
 <details>
 <summary>Sequence Diagram</summary>
@@ -115,7 +115,7 @@ <h4>Response types</h4>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDfoA2v9B2efpStXKYSQSAchAn05e4eTGqFytLtzN8CSGrnT59pzNLmLT7KLNFmL_Fn355nTF4CKuKg9DfLejt8bvoGM5oie-QQc9xeabYGc9HQdwhdc5fHKAYaa5Yl46zZOA6YuwEGN9MTafcWgsDafL7FLSZcavgM00WKG003__-skE9q0" alt=""></p>
 </details>
 <hr>
-<h3>MobileApp2 ThirdEndpoint</h3>
+<h3><a name=MobileApp2-ThirdEndpoint></a>MobileApp2 ThirdEndpoint</h3>
 <p>ThirdEndpoint comment</p>
 <details>
 <summary>Sequence Diagram</summary>
diff --git a/demo/html/FirstDivision/index.html b/demo/html/FirstDivision/index.html
index 56b8adb..59e69d2 100644
--- a/demo/html/FirstDivision/index.html
+++ b/demo/html/FirstDivision/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a>  | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>FirstDivision</h1>
 <table>
 <thead>
@@ -23,7 +23,7 @@ <h1>FirstDivision</h1>
 <h2>Integration Diagram</h2>
 <img src="https://plantuml.com/plantuml/svg/~1UDgCZazByq0Gnk_pAUOzzHHe-ufuAALfaue76z28Xo9bJORkqDsTCBkjYlZTfSG_u2dFQTdVxvcPqU30Q8I3ygNc3tLrNMxAkxmk2rnLHObPXaM5cwh6ihYf__seWwSElXKMCHbDH-yWSNA4QzQO2ZvnP0bWkIMCYPGalNK4iJ6Eq9jNd5p-lxf0Ixot2UA1GsVKU6p4Tn8e97m7nALf3dkLOsXNuaHnxKIDUxISw4n5MzAUB9rf3e2OgyfB_xLIzb42VC3sLfxPKTvrJsWYxiOucrdUMtTUFf_3zfxqHDh32Up6c6Npy-ktEEtXz4zpD_rM5nJQetUV0G00__-HJdq3">
 <h2>End Point Analysis Integration Diagram</h2>
-<img src="https://plantuml.com/plantuml/svg/~1UDgSa55hr40Gnz_tKupruPuExd95V2X7qqigWlR0dYX82TlTCHbkinjc9wSY_UwoJLI870JdRMT-yvyVkvXTQh60MJMY-SV3_arvLtx83sK1ktrHmd89nHxkzWSeYxU75t_GsQcpNTLr5CtIjqu9YKEu9OvIq8aY1QySVXMG04nr8s29qKZgHwCTGgk_m_hLvlKbD9W0rP15mBQJ7s0n6gPke8_aEyswXIXQ47ugW1jjZZM7tjjTS87XrWNMxbD3WcaQs28FankdpL41vCpXsz3QCRKnUFMaXi2Bz-6H7EPTTm4wmkTg1LTN3TMDIrhRxVF54SrxQT0BcVGoZj3Byz9qv-_6kr2J7vZrXFbN81iDrlzXa9qpk4SJl2szxGBzXZVdLEwHJyYZHdRky11ogPvKjO7bbvUHt0dvORc5AbDLbbgFwUCVjecgrXDcfQhLXBb6R_lM_Ge00F__pgBbmm00">
+<img src="https://plantuml.com/plantuml/svg/~1UDgSa55hr40Gnz_tKupruPuExd95V2X7qqigWlR0dYX82TlTCHbkinjc9wSY_UwoJLI870JdRMT-yvyVkvXTQh60MJMY-SV3_arvLtx83sK1ktrHmd89nHxkzWSeYxU75t_GsQcpNTLr5CtIjqu9YKEu9OvIq8aY1QySVXMG04nr8s29qKZgHwCTGgk_m_hLvlKbD9W0rP15mBQJ7s0n6gPke8_aEyswXIXQ47ugW1jjZZM7tjjTS87XrWNMxbD3WcaQs28FankdpL41vCpXsz3QCRKnUFMaXi2Bz-6H7EPTTm4wmkTg1LTN3TMDIrhRxVF54SrxQT0BcVGoZj3Byz9qv-_6kr2J7vZrXFbN81iDrlzXa9qpk4SJl2szxGBzXZVdLEwHJyYZHdRky11ogPvKjORbbvUHt0dvORc5QgMgLMezfez_s2QgsaoOJ5NPXBb6R_lM_Ge00F__pShbmm00">
 
 <style type="text/css">
 
diff --git a/demo/html/SecondDivision/MegaDatabase/index.html b/demo/html/SecondDivision/MegaDatabase/index.html
index ec95638..0344380 100644
--- a/demo/html/SecondDivision/MegaDatabase/index.html
+++ b/demo/html/SecondDivision/MegaDatabase/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a> | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>MegaDatabase</h1>
 <h2>Integration Diagram</h2>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZazBjL0GnlVpAUPTkHAkl14jBdAzQj6YAuJH8a8c7Jm7pnyvPwGY-kuXHckVtJFFZ-6Nx0ua2UxABreyjSrTVQaVYxQki6og6jCKgmOlJOjrTT_--qDtVztj2gSe56In1aIBONpWaIeIUgF8eFJ068K3U_cS6M9FXj7I1sRN_s-kKB4UbK2Sj9ifaCNUszaxTe9VW7YcVXg3NznGUkC3tXeVo3mhBRokFWmSjkLig9y0iGZ1ls-dCcWRlODlU155yeeKiJkiHSUjP7WyAZqgiqhaENG7JDCSkmnEx8R5cfy0003__yBrRDq0" alt=""></p>
@@ -23,7 +23,7 @@ <h2>Application Index</h2>
 <tr>
 <td>this</td>
 <td><a href="#this-this">this</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 </tbody>
 </table>
@@ -40,12 +40,12 @@ <h2>Type Index</h2>
 <tr>
 <td>MegaDatabase</td>
 <td><a href="#MegaDatabase.Empty">Empty</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>MegaDatabase</td>
 <td><a href="#MegaDatabase.Money">Money</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 </tbody>
 </table>
@@ -54,7 +54,7 @@ <h2>Application this</h2>
 <ul>
 <li></li>
 </ul>
-<h3>this this</h3>
+<h3><a name=this-this></a>this this</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDfI9nfmgQih40MWIXr3G_pTNVrSWnn3N5qKdFrTN1LqTHLS_1Ny_4CKN5qyGnJXIeasbMYtSZaKboGMbPJcvd0bv-UL5ENdA2YLP6GMAoaa5Yl46t0LPsVc5IGM9UOgv2PM-AOM5oUcfmPdLgKg69aQS9LabkIaAe2KAzZeWcakMriKleAjBLUqhbsyWO8LH3unkIIpBB4a5MHsIYeopo4rBmNa3400003__rbaKLi0" alt=""></p>
diff --git a/demo/html/SecondDivision/index.html b/demo/html/SecondDivision/index.html
index 236d82c..183d233 100644
--- a/demo/html/SecondDivision/index.html
+++ b/demo/html/SecondDivision/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a>  | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>SecondDivision</h1>
 <table>
 <thead>
diff --git a/demo/html/ThirdDivision/ServerPackage/index.html b/demo/html/ThirdDivision/ServerPackage/index.html
index f7124cf..3258b89 100644
--- a/demo/html/ThirdDivision/ServerPackage/index.html
+++ b/demo/html/ThirdDivision/ServerPackage/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a> | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>ServerPackage</h1>
 <h2>Integration Diagram</h2>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZijAx40GXlVr57LMMGKcEI8kXZ2P98eB9w8H5uE4DYdIJVeIgZjU4DzTXgYupB-h-hyglcXr88fmLRxH_A6fhwf3TPStLOb5NLOOnrZMUAWRhChhvjylklhhQbVO-I0up4P3K44JtXE_4D-ARXG3WLGzeG_4vCBxHE0xeGcDUCFa_F_56KfIWmpWHsKdmS9WvypaBDc07u2u5zqui9jjNpZj62-rOw4VfGfqQXttn4kprw8R0J5dTg_Bgc1blBFm2SSRzwmqvTFqXC9Zku7ZehcC2MwtKWrIdroo3DeDnd66RVBdC5tG5DhqfzoHxMUZlm800F__dtLu3G00" alt=""></p>
@@ -21,7 +21,7 @@ <h2>Database Index</h2>
 <tbody>
 <tr>
 <td><a href="#Database-RelModel">RelModel</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 </tbody>
 </table>
@@ -38,32 +38,32 @@ <h2>Application Index</h2>
 <tr>
 <td>Server</td>
 <td><a href="#Server-Authenticate">Authenticate</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>Server</td>
 <td><a href="#Server-GETtestRestPathParamPrimitive%7BprimitiveID%7D">GET /testRestPathParamPrimitive/{primitiveID}</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>Server</td>
 <td><a href="#Server-GETtestRestQueryParam">GET /testRestQueryParam</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>Server</td>
 <td><a href="#Server-GETtestRestQueryParamPrimitive">GET /testRestQueryParamPrimitive</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>Server</td>
 <td><a href="#Server-GETtestRestURLParam%7Bid%7D">GET /testRestURLParam/{id}</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>Server</td>
 <td><a href="#Server-GETtestReturnNil">GET /testReturnNil</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 </tbody>
 </table>
@@ -80,17 +80,17 @@ <h2>Type Index</h2>
 <tr>
 <td>Server</td>
 <td><a href="#Server.Empty">Empty</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>Server</td>
 <td><a href="#Server.Request">Request</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>Server</td>
 <td><a href="#Server.Response">Response</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 </tbody>
 </table>
@@ -104,7 +104,7 @@ <h2>Application Server</h2>
 <ul>
 <li>this is a comment for Server</li>
 </ul>
-<h3>Server Authenticate</h3>
+<h3><a name=Server-Authenticate></a>Server Authenticate</h3>
 <p>this is a description of Authenticate</p>
 <details>
 <summary>Sequence Diagram</summary>
@@ -121,7 +121,7 @@ <h4>Response types</h4>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCaK5Bmq0GXU_pAvwvHBScD3sMKbhSHJoqWHhFOPeEMaWsTNSZ5Eb_5xNe8Jda7OVtFZwObG_iGjVK58yEnJ56vLfTlnJvezcQtRem6W-vDaWIw1pRl83HJyNDNtKqTRGhLJLxZsWZhwmvy9wzfAOvXNC4zYYdYmLkzNthghVZuGxB9JxfCZZQj5Qkemm3gmcuQJiRCCVHXd_8ixWFSUbE_AcrNdu9is72dcksbM0EfVh6Ij44xvsuSx_mOwSKNQYSGIK9eYnDCqGefxrBHYknX--dVmK00F__ZEPvaG00" alt=""></p>
 </details>
 <hr>
-<h3>Server GETtestRestPathParamPrimitive{primitiveID}</h3>
+<h3><a name=Server-GETtestRestPathParamPrimitive{primitiveID}></a>Server GET /testRestPathParamPrimitive/{primitiveID}</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgSaCrBmq0GnU_xLpnxoMbf4Bn88orcAJtOX7GzzL26Tj35VB4p1b7ytoL-uJ7sdGRc_Tvy99DbaWIJz6rTtVjYxRQkMdcNuxR87Qn5Nc1RUBXyuoz-hPDJ9-zgbg8KzRcfpR5hDNOrPZkE0ySPI718ZJo5jgT83HfwkMCHUk1TU6LSNgL6WzQCBm0BYxNpc2kBLYnQaZwM8rd6q0GD0y_V-fzoax-RB3iNHPQPlRqvfBZ-vqmwQXX8UJnjlx3sCw9YwRjMs9puRt_9xMdyp4S0003__v0UXxO0" alt=""></p>
@@ -138,7 +138,7 @@ <h4>Response types</h4>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCaK5Bmq0GXU_pAvwvHBScD3sMKbhSHJoqWHhFOPeEMaWsTNSZ5Eb_5xNe8Jda7OVtFZwObG_iGjVK58yEnJ56vLfTlnJvezcQtRem6W-vDaWIw1pRl83HJyNDNtKqTRGhLJLxZsWZhwmvy9wzfAOvXNC4zYYdYmLkzNthghVZuGxB9JxfCZZQj5Qkemm3gmcuQJiRCCVHXd_8ixWFSUbE_AcrNdu9is72dcksbM0EfVh6Ij44xvsuSx_mOwSKNQYSGIK9eYnDCqGefxrBHYknX--dVmK00F__ZEPvaG00" alt=""></p>
 </details>
 <hr>
-<h3>Server GETtestRestQueryParam</h3>
+<h3><a name=Server-GETtestRestQueryParam></a>Server GET /testRestQueryParam</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZqzBmq0GnU_pAPwzvBGO12_II8jPYWSRJTTJ3sLe1mdcJzcP1lNJIrJ4YtJVTNxlyPiiEPHbICeFkdmErSglVRqCliHTLNeuXxB2kWhmvNsu-4MJLvDTQQ76qKvTI_kXjpYqc6qaZX9dOCKk9trj-YD7xj3nsuEeyejicW_1rNLErbWh-2vWxh3o0PScQhMeFPqalZzELIgAyn2AWhRkTfVZvjyTtbipiiaajfqxzmNNeiUXLw63_Bqlf3zCVtq6003__ozURNy0" alt=""></p>
@@ -157,7 +157,7 @@ <h4>Response types</h4>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCaK5Bmq0GXU_pAvwvHBScD3sMKbhSHJoqWHhFOPeEMaWsTNSZ5Eb_5xNe8Jda7OVtFZwObG_iGjVK58yEnJ56vLfTlnJvezcQtRem6W-vDaWIw1pRl83HJyNDNtKqTRGhLJLxZsWZhwmvy9wzfAOvXNC4zYYdYmLkzNthghVZuGxB9JxfCZZQj5Qkemm3gmcuQJiRCCVHXd_8ixWFSUbE_AcrNdu9is72dcksbM0EfVh6Ij44xvsuSx_mOwSKNQYSGIK9eYnDCqGefxrBHYknX--dVmK00F__ZEPvaG00" alt=""></p>
 </details>
 <hr>
-<h3>Server GETtestRestQueryParamPrimitive</h3>
+<h3><a name=Server-GETtestRestQueryParamPrimitive></a>Server GET /testRestQueryParamPrimitive</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgKZqzBmq0GnU_pAPwzvBGO12_II8jPYWURcgwd7ihG3hAOFsLd6jHFBr4HRyPtdT_lyIQR7CeoJCetkdmArSglVRqCliHTLNeuXxB2kWhmvNsu-44djqxUIWirJdPk6phqdQM-mMmhQP0q0olsEUbBx4wSk4NBhm-Yoi-oZU-2g-kSB5eZ-18mTrZvW4iJjLhK7i-ItZQZkacnZHO7eQBu1usYe9sxtUUu-RkP3nO7DXatx-REVLgrwAdlLEWel-yBwOxZony1003__pHSUAe0" alt=""></p>
@@ -174,7 +174,7 @@ <h4>Response types</h4>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCaK5Bmq0GXU_pAvwvHBScD3sMKbhSHJoqWHhFOPeEMaWsTNSZ5Eb_5xNe8Jda7OVtFZwObG_iGjVK58yEnJ56vLfTlnJvezcQtRem6W-vDaWIw1pRl83HJyNDNtKqTRGhLJLxZsWZhwmvy9wzfAOvXNC4zYYdYmLkzNthghVZuGxB9JxfCZZQj5Qkemm3gmcuQJiRCCVHXd_8ixWFSUbE_AcrNdu9is72dcksbM0EfVh6Ij44xvsuSx_mOwSKNQYSGIK9eYnDCqGefxrBHYknX--dVmK00F__ZEPvaG00" alt=""></p>
 </details>
 <hr>
-<h3>Server GETtestRestURLParam{id}</h3>
+<h3><a name=Server-GETtestRestURLParam{id}></a>Server GET /testRestURLParam/{id}</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZq5Bmq0GXU_xAvwzvBGq25waaHQp544RIRUd7ihG3BAORChEM4JnlqjKn9Fikyxt7jyKsJ55WQpyeAkTRzPkuzgLTpLkczh1MjGDDes7g-_ynI-QlPhjQfQYbFHbwCrnZ9h67hCjfpEd6KXmA8qyXtYYH0C6UdrW4NhYRNXZN5wLHeFsZEy25XPhvp5N5crPTDVUFqx5-NleFanLPN6eAhEtDuSIr_-jqL73cPGdm_t2sY--PJcDKTXq_FU-vDXD3tu6003__-C5R_80" alt=""></p>
@@ -191,7 +191,7 @@ <h4>Response types</h4>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCaK5Bmq0GXU_pAvwvHBScD3sMKbhSHJoqWHhFOPeEMaWsTNSZ5Eb_5xNe8Jda7OVtFZwObG_iGjVK58yEnJ56vLfTlnJvezcQtRem6W-vDaWIw1pRl83HJyNDNtKqTRGhLJLxZsWZhwmvy9wzfAOvXNC4zYYdYmLkzNthghVZuGxB9JxfCZZQj5Qkemm3gmcuQJiRCCVHXd_8ixWFSUbE_AcrNdu9is72dcksbM0EfVh6Ij44xvsuSx_mOwSKNQYSGIK9eYnDCqGefxrBHYknX--dVmK00F__ZEPvaG00" alt=""></p>
 </details>
 <hr>
-<h3>Server GETtestReturnNil</h3>
+<h3><a name=Server-GETtestReturnNil></a>Server GET /testReturnNil</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZq5B0p4GXU_pAvwzx2cu25waAorkA1xSG1jFFPIX7IIOJIMP5l7Nowg81obvnvdl3TyqrQ6cGLL-qEMpToixsFNIsnuFhhSm1ht3u3ni_-YlVj7ggzMkj2ZAMKzZfFqnQJv6p3QIpv9du89TI-Krf3VEF6BazoSfXLza4pu4DxSjQT0e-2vWRh2o7jSgHTUYfvo64AdhBkxHTRGrzxiMT_-rUQ_Xp2gJoNPkp1T71_axNqWwJ0zy1W00__z6GMGg" alt=""></p>
diff --git a/demo/html/ThirdDivision/foo/index.html b/demo/html/ThirdDivision/foo/index.html
index b76eb41..8cb075c 100644
--- a/demo/html/ThirdDivision/foo/index.html
+++ b/demo/html/ThirdDivision/foo/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a> | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>foo</h1>
 <h2>Integration Diagram</h2>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZZ5Bn40GHllv5PzLgYj44SlB9QlON40YraioNfRixeJP2IhYVnU9MEULynx3L-s6gWgx-4lhbxvxT6VtNFUkHTEr3eS3sWxdheThd_gh_tJtrzrRwLZCgwqfaWMBZ3SHciB8ACRAOfyBKnbyP2J_WUkxc_jRJ1mkar6PGrwy-eH1qYAPi-6BW9CVvelAciT6eYWUegYFhrCm_hMY8-jcJj4FCm6rghnlfqP3AfBfcuwSnpN5dm000F__dZnQaG00" alt=""></p>
@@ -23,7 +23,7 @@ <h2>Application Index</h2>
 <tr>
 <td>foo</td>
 <td><a href="#foo-whatever">whatever</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 </tbody>
 </table>
@@ -42,7 +42,7 @@ <h2>Application foo</h2>
 <ul>
 <li></li>
 </ul>
-<h3>foo whatever</h3>
+<h3><a name=foo-whatever></a>foo whatever</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZa5Bn30GHk_v5PzxwIbG12zYP1SJn8CRq7ZoK8Psgi6saMIiug-NWgXuohlDy9XvJJMgQL35jtfu2FxQ7TtT8JYBAsyTj8RrEFe0Ps_2oOzQVRMwLUsBK9QtUL9zMYId2RinfHsee6jLUOdBAsMQCTF7BPT2JtmVFncdPwsIA1DZJ0aN6k_F9BnoLiRyNy4OzQWlknRdlnhr4bSIthuC_7VQyp9iFLy1003__sErLGa0" alt=""></p>
diff --git a/demo/html/ThirdDivision/index.html b/demo/html/ThirdDivision/index.html
index dba5fb6..6fefa50 100644
--- a/demo/html/ThirdDivision/index.html
+++ b/demo/html/ThirdDivision/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a>  | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>ThirdDivision</h1>
 <table>
 <thead>
diff --git a/demo/html/ThirdDivision/simpleredoc/index.html b/demo/html/ThirdDivision/simpleredoc/index.html
index cc86fc9..581a526 100644
--- a/demo/html/ThirdDivision/simpleredoc/index.html
+++ b/demo/html/ThirdDivision/simpleredoc/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a> | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>simpleredoc</h1>
 <h2>Integration Diagram</h2>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZa5Bn30GHk_pApvFFUr15F6utJQAbor8nND8XcreaYcJ51NnlujKzjntdFSOlcOtr3JOnN_Qlet3ipcRrtOqFRgXDpWSq0yu3oDC_pBUNDFTNtTlfMEfLkkQ8jLG8wE4j4HMzk9e2fvHAYjB_LgOYhEHaUmdRX_k7kynSRXCbSeSycBL9ZX9YsJE5Ty4dAoRBofhzfr4KJn5KHlVfr3vpufwrisSedKp0QsgV6odJaCgakc7Zfpzck9l0000___CILta" alt=""></p>
@@ -23,7 +23,7 @@ <h2>Application Index</h2>
 <tr>
 <td>simpleredoc</td>
 <td><a href="#simpleredoc-GETtest">GET /test</a></td>
-<td><a href="../../../../demo/simple.yaml">../../../../demo/simple.yaml</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml</a></td>
 </tr>
 </tbody>
 </table>
@@ -40,12 +40,12 @@ <h2>Type Index</h2>
 <tr>
 <td>simpleredoc</td>
 <td><a href="#simpleredoc.SimpleObj">SimpleObj</a></td>
-<td><a href="../../../../demo/simple.yaml">../../../../demo/simple.yaml</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml</a></td>
 </tr>
 <tr>
 <td>simpleredoc</td>
 <td><a href="#simpleredoc.SimpleObj2">SimpleObj2</a></td>
-<td><a href="../../../../demo/simple.yaml">../../../../demo/simple.yaml</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml</a></td>
 </tr>
 </tbody>
 </table>
@@ -55,7 +55,7 @@ <h2>Application simpleredoc</h2>
 <li>No description.</li>
 </ul>
 <p><a href="simpleredoc.redoc.html">View OpenAPI Specs in Redoc</a></p>
-<h3>simpleredoc GETtest</h3>
+<h3><a name=simpleredoc-GETtest></a>simpleredoc GET /test</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZq5Bmq0GXU_pAvwzvBGO12_II8jPYWUxODTJ3sLC1bbDicLt5F7NIujeBiA-s_2-zsQcAXPL5OhqWwwVlDlOhNrSUzlYphKMng1rs3eFszxxYr-qkBNuLbfbvQJluq1Td3J50OiSnkCWIVhOBS0PXvhoMvYEd7Z4o9yFaZE_o2vy2QwkQzAWWs2Mmj9WOpqkLR9Iq_pheMbeRsuFDMvc0UuqVB3AQV5-QSpPbfHY-XjtvqRt_4gzpFcLJFtfcUy0003__n70PrG0" alt=""></p>
diff --git a/demo/html/index.html b/demo/html/index.html
index 394159f..4f712a8 100644
--- a/demo/html/index.html
+++ b/demo/html/index.html
@@ -2,10 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
+<p><a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>simple2.sysl</h1>
 <table>
 <thead>
diff --git a/demo/markdown/FirstDivision/ApplicationPackage/README.md b/demo/markdown/FirstDivision/ApplicationPackage/README.md
index cfae265..01de189 100644
--- a/demo/markdown/FirstDivision/ApplicationPackage/README.md
+++ b/demo/markdown/FirstDivision/ApplicationPackage/README.md
@@ -1,6 +1,6 @@
 
 
-[Back](../README.md)
+[Back](../README.md) | [Chat with us](https://anzoss.slack.com/messages/sysl-catalog/) | [New bug or feature request](https://github.com/anz-bank/sysl-catalog/issues/new)
 
 
 # ApplicationPackage
@@ -17,10 +17,10 @@
 ## Application Index
 | Application Name | Method | Source Location |
 ----|----|----
-MobileApp | [Another](#MobileApp-Another) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|  
-MobileApp | [Login](#MobileApp-Login) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|  
-MobileApp2 | [SecondEndpoint](#MobileApp2-SecondEndpoint) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|  
-MobileApp2 | [ThirdEndpoint](#MobileApp2-ThirdEndpoint) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|  
+MobileApp | [Another](#MobileApp-Another) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|  
+MobileApp | [Login](#MobileApp-Login) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|  
+MobileApp2 | [SecondEndpoint](#MobileApp2-SecondEndpoint) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|  
+MobileApp2 | [ThirdEndpoint](#MobileApp2-ThirdEndpoint) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|  
 
 ## Type Index
 | Application Name | Type Name | Source Location |
@@ -45,7 +45,9 @@ MobileApp2 | [ThirdEndpoint](#MobileApp2-ThirdEndpoint) | [../../../../demo/simp
 
 
 
-### MobileApp Another
+
+
+### <a name=MobileApp-Another></a>MobileApp Another
 hello, world
 
 <details>
@@ -88,7 +90,7 @@ Response Response Response
 
 
 
-### MobileApp Login
+### <a name=MobileApp-Login></a>MobileApp Login
 hello, gamers
 
 <details>
@@ -144,7 +146,9 @@ Empty Empty Empty
 
 
 
-### MobileApp2 SecondEndpoint
+
+
+### <a name=MobileApp2-SecondEndpoint></a>MobileApp2 SecondEndpoint
 SecondEndpoint, comment
 
 <details>
@@ -189,7 +193,7 @@ Empty Empty Empty
 
 
 
-### MobileApp2 ThirdEndpoint
+### <a name=MobileApp2-ThirdEndpoint></a>MobileApp2 ThirdEndpoint
 ThirdEndpoint comment
 
 <details>
diff --git a/demo/markdown/FirstDivision/ApplicationPackage/integration.svg b/demo/markdown/FirstDivision/ApplicationPackage/integration.svg
index 41b635a..11299a2 100755
--- a/demo/markdown/FirstDivision/ApplicationPackage/integration.svg
+++ b/demo/markdown/FirstDivision/ApplicationPackage/integration.svg
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="179px" preserveAspectRatio="none" style="width:270px;height:179px;" version="1.1" viewBox="0 0 270 179" width="270px" zoomAndPan="magnify"><defs><filter height="300%" id="fxyseq1370ypt" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="179" x="36.5" y="16.708">ApplicationPackage</text><!--MD5=[834ef74a6aa73a899f9de7987f49a674]
-entity _0--><rect fill="#FFFAF0" filter="url(#fxyseq1370ypt)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="98" x="12" y="27.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="7" y="32.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="7" y="54.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="78" x="22" y="50.9482">MobileApp</text><!--MD5=[5793e68b51480d2da18d2edf8802f392]
-entity _1--><rect fill="#FFFAF0" filter="url(#fxyseq1370ypt)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="67" x="95.5" y="123.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="90.5" y="128.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="90.5" y="150.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="47" x="105.5" y="146.9482">Server</text><!--MD5=[fc69c2ef26418c6b4957312aae07cc91]
-entity _2--><rect fill="#FFFAF0" filter="url(#fxyseq1370ypt)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="106" x="145" y="27.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="140" y="32.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="140" y="54.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="86" x="155" y="50.9482">MobileApp2</text><!--MD5=[b84326987e98dcb917912705a3ef9c62]
-link _0 to _1--><path d="M73.4722,64.1941 C84.7831,79.8297 101.4937,102.9297 113.627,119.702 " fill="none" id="_0-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="116.607,123.8214,114.5732,114.1848,113.6766,119.7702,108.0912,118.8735,116.607,123.8214" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[797b2ad59651ef14175f94513191e355]
-link _2 to _1--><path d="M185.344,64.1941 C173.867,79.8297 156.911,102.9297 144.599,119.702 " fill="none" id="_2-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="141.575,123.8214,150.1247,118.9325,144.5333,119.7905,143.6753,114.1991,141.575,123.8214" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[1658641b5f0cfea98c53073adc8ea4e7]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="199px" preserveAspectRatio="none" style="width:305px;height:199px;" version="1.1" viewBox="0 0 305 199" width="305px" zoomAndPan="magnify"><defs><filter height="300%" id="fxyseq1370ypt" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="179" x="54" y="16.708">ApplicationPackage</text><!--MD5=[834ef74a6aa73a899f9de7987f49a674]
+entity _0--><rect fill="#FFFAF0" filter="url(#fxyseq1370ypt)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="118" x="7" y="27.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="105" y="32.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="103" y="34.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="103" y="38.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="78" x="22" y="60.9482">MobileApp</text><!--MD5=[5793e68b51480d2da18d2edf8802f392]
+entity _1--><rect fill="#FFFAF0" filter="url(#fxyseq1370ypt)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="87" x="100.5" y="133.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="167.5" y="138.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="165.5" y="140.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="165.5" y="144.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="47" x="115.5" y="166.9482">Server</text><!--MD5=[fc69c2ef26418c6b4957312aae07cc91]
+entity _2--><rect fill="#FFFAF0" filter="url(#fxyseq1370ypt)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="126" x="160" y="27.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="266" y="32.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="264" y="34.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="264" y="38.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="86" x="175" y="60.9482">MobileApp2</text><!--MD5=[b84326987e98dcb917912705a3ef9c62]
+link _0 to _1--><path d="M82.5418,74.0091 C94.7445,90.2791 111.397,112.4825 124.29,129.6733 " fill="none" id="_0-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="127.482,133.9292,125.2818,124.3293,124.4819,129.9293,118.8819,129.1294,127.482,133.9292" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[797b2ad59651ef14175f94513191e355]
+link _2 to _1--><path d="M206.246,74.0091 C193.887,90.2791 177.021,112.4825 163.963,129.6733 " fill="none" id="_2-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="160.73,133.9292,169.3594,129.1823,163.7546,129.9478,162.9891,124.343,160.73,133.9292" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[1658641b5f0cfea98c53073adc8ea4e7]
 @startuml
 ''''''''''''''''''''''''''''''''''''''''''
 ''                                      ''
diff --git a/demo/markdown/FirstDivision/README.md b/demo/markdown/FirstDivision/README.md
index 4874db9..7678d24 100644
--- a/demo/markdown/FirstDivision/README.md
+++ b/demo/markdown/FirstDivision/README.md
@@ -1,8 +1,6 @@
 
 
-
-[Back](../README.md)
-
+ [Back](../README.md)  | [Chat with us](https://anzoss.slack.com/messages/sysl-catalog/) | [New bug or feature request](https://github.com/anz-bank/sysl-catalog/issues/new)
 # FirstDivision
 
 | Package |
diff --git a/demo/markdown/FirstDivision/integration.svg b/demo/markdown/FirstDivision/integration.svg
index df5af8a..6390db0 100755
--- a/demo/markdown/FirstDivision/integration.svg
+++ b/demo/markdown/FirstDivision/integration.svg
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="179px" preserveAspectRatio="none" style="width:270px;height:179px;" version="1.1" viewBox="0 0 270 179" width="270px" zoomAndPan="magnify"><defs><filter height="300%" id="f5vyh3nowgeaa" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="116" x="68" y="16.708">FirstDivision</text><!--MD5=[834ef74a6aa73a899f9de7987f49a674]
-entity _0--><rect fill="#FFFAF0" filter="url(#f5vyh3nowgeaa)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="98" x="12" y="27.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="7" y="32.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="7" y="54.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="78" x="22" y="50.9482">MobileApp</text><!--MD5=[5793e68b51480d2da18d2edf8802f392]
-entity _1--><rect fill="#FFFAF0" filter="url(#f5vyh3nowgeaa)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="67" x="95.5" y="123.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="90.5" y="128.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="90.5" y="150.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="47" x="105.5" y="146.9482">Server</text><!--MD5=[fc69c2ef26418c6b4957312aae07cc91]
-entity _2--><rect fill="#FFFAF0" filter="url(#f5vyh3nowgeaa)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="106" x="145" y="27.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="140" y="32.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="140" y="54.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="86" x="155" y="50.9482">MobileApp2</text><!--MD5=[b84326987e98dcb917912705a3ef9c62]
-link _0 to _1--><path d="M73.4722,64.1941 C84.7831,79.8297 101.4937,102.9297 113.627,119.702 " fill="none" id="_0-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="116.607,123.8214,114.5732,114.1848,113.6766,119.7702,108.0912,118.8735,116.607,123.8214" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[797b2ad59651ef14175f94513191e355]
-link _2 to _1--><path d="M185.344,64.1941 C173.867,79.8297 156.911,102.9297 144.599,119.702 " fill="none" id="_2-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="141.575,123.8214,150.1247,118.9325,144.5333,119.7905,143.6753,114.1991,141.575,123.8214" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[78d52a8c2b0cb6d3c950e504a64f772d]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="199px" preserveAspectRatio="none" style="width:305px;height:199px;" version="1.1" viewBox="0 0 305 199" width="305px" zoomAndPan="magnify"><defs><filter height="300%" id="f5vyh3nowgeaa" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="116" x="85.5" y="16.708">FirstDivision</text><!--MD5=[834ef74a6aa73a899f9de7987f49a674]
+entity _0--><rect fill="#FFFAF0" filter="url(#f5vyh3nowgeaa)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="118" x="7" y="27.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="105" y="32.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="103" y="34.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="103" y="38.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="78" x="22" y="60.9482">MobileApp</text><!--MD5=[5793e68b51480d2da18d2edf8802f392]
+entity _1--><rect fill="#FFFAF0" filter="url(#f5vyh3nowgeaa)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="87" x="100.5" y="133.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="167.5" y="138.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="165.5" y="140.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="165.5" y="144.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="47" x="115.5" y="166.9482">Server</text><!--MD5=[fc69c2ef26418c6b4957312aae07cc91]
+entity _2--><rect fill="#FFFAF0" filter="url(#f5vyh3nowgeaa)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="126" x="160" y="27.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="266" y="32.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="264" y="34.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="264" y="38.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="86" x="175" y="60.9482">MobileApp2</text><!--MD5=[b84326987e98dcb917912705a3ef9c62]
+link _0 to _1--><path d="M82.5418,74.0091 C94.7445,90.2791 111.397,112.4825 124.29,129.6733 " fill="none" id="_0-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="127.482,133.9292,125.2818,124.3293,124.4819,129.9293,118.8819,129.1294,127.482,133.9292" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[797b2ad59651ef14175f94513191e355]
+link _2 to _1--><path d="M206.246,74.0091 C193.887,90.2791 177.021,112.4825 163.963,129.6733 " fill="none" id="_2-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="160.73,133.9292,169.3594,129.1823,163.7546,129.9478,162.9891,124.343,160.73,133.9292" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[78d52a8c2b0cb6d3c950e504a64f772d]
 @startuml
 ''''''''''''''''''''''''''''''''''''''''''
 ''                                      ''
diff --git a/demo/markdown/README.md b/demo/markdown/README.md
index 9190dc3..336a825 100644
--- a/demo/markdown/README.md
+++ b/demo/markdown/README.md
@@ -1,5 +1,6 @@
 
 
+[Chat with us](https://anzoss.slack.com/messages/sysl-catalog/) | [New bug or feature request](https://github.com/anz-bank/sysl-catalog/issues/new)
 # simple2.sysl
 
 | Package |
diff --git a/demo/markdown/SecondDivision/MegaDatabase/README.md b/demo/markdown/SecondDivision/MegaDatabase/README.md
index 44c8784..7bb88c2 100644
--- a/demo/markdown/SecondDivision/MegaDatabase/README.md
+++ b/demo/markdown/SecondDivision/MegaDatabase/README.md
@@ -1,6 +1,6 @@
 
 
-[Back](../README.md)
+[Back](../README.md) | [Chat with us](https://anzoss.slack.com/messages/sysl-catalog/) | [New bug or feature request](https://github.com/anz-bank/sysl-catalog/issues/new)
 
 
 # MegaDatabase
@@ -17,13 +17,13 @@
 ## Application Index
 | Application Name | Method | Source Location |
 ----|----|----
-this | [this](#this-this) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|  
+this | [this](#this-this) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|  
 
 ## Type Index
 | Application Name | Type Name | Source Location |
 ----|----|----
-MegaDatabase | [Empty](#MegaDatabase.Empty) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|
-MegaDatabase | [Money](#MegaDatabase.Money) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|
+MegaDatabase | [Empty](#MegaDatabase.Empty) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|
+MegaDatabase | [Money](#MegaDatabase.Money) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|
 
 
 
@@ -47,7 +47,9 @@ MegaDatabase | [Money](#MegaDatabase.Money) | [../../../../demo/simple2.sysl](..
 
 
 
-### this this
+
+
+### <a name=this-this></a>this this
 
 
 <details>
diff --git a/demo/markdown/SecondDivision/MegaDatabase/integration.svg b/demo/markdown/SecondDivision/MegaDatabase/integration.svg
index de3d0f8..37c16f7 100755
--- a/demo/markdown/SecondDivision/MegaDatabase/integration.svg
+++ b/demo/markdown/SecondDivision/MegaDatabase/integration.svg
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="179px" preserveAspectRatio="none" style="width:151px;height:179px;" version="1.1" viewBox="0 0 151 179" width="151px" zoomAndPan="magnify"><defs><filter height="300%" id="fzn8l3ipxn7d4" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="137" x="2" y="16.708">MegaDatabase</text><!--MD5=[834ef74a6aa73a899f9de7987f49a674]
-entity _0--><rect fill="#FFFAF0" filter="url(#fzn8l3ipxn7d4)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="51" x="50.5" y="27.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="45.5" y="32.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="45.5" y="54.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="31" x="60.5" y="50.9482">that</text><!--MD5=[5793e68b51480d2da18d2edf8802f392]
-entity _1--><rect fill="#FFFAF0" filter="url(#fzn8l3ipxn7d4)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="47" x="52.5" y="123.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="47.5" y="128.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="47.5" y="150.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="62.5" y="146.9482">this</text><!--MD5=[b84326987e98dcb917912705a3ef9c62]
-link _0 to _1--><path d="M76,64.1941 C76,79.4322 76,101.76 76,118.4107 " fill="none" id="_0-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="76,123.8214,80,114.8214,76,118.8214,72,114.8214,76,123.8214" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[af5f52c45c59292af6254a5049b968cd]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="199px" preserveAspectRatio="none" style="width:151px;height:199px;" version="1.1" viewBox="0 0 151 199" width="151px" zoomAndPan="magnify"><defs><filter height="300%" id="fzn8l3ipxn7d4" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="137" x="2" y="16.708">MegaDatabase</text><!--MD5=[834ef74a6aa73a899f9de7987f49a674]
+entity _0--><rect fill="#FFFAF0" filter="url(#fzn8l3ipxn7d4)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="71" x="38" y="27.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="89" y="32.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="87" y="34.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="87" y="38.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="31" x="53" y="60.9482">that</text><!--MD5=[5793e68b51480d2da18d2edf8802f392]
+entity _1--><rect fill="#FFFAF0" filter="url(#fzn8l3ipxn7d4)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="67" x="40" y="133.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="87" y="138.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="85" y="140.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="85" y="144.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="55" y="166.9482">this</text><!--MD5=[b84326987e98dcb917912705a3ef9c62]
+link _0 to _1--><path d="M73.5,74.0091 C73.5,90.0034 73.5,111.7316 73.5,128.7949 " fill="none" id="_0-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="73.5,133.9292,77.5,124.9292,73.5,128.9292,69.5,124.9292,73.5,133.9292" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[af5f52c45c59292af6254a5049b968cd]
 @startuml
 ''''''''''''''''''''''''''''''''''''''''''
 ''                                      ''
diff --git a/demo/markdown/SecondDivision/MegaDatabase/this/this.svg b/demo/markdown/SecondDivision/MegaDatabase/this/this.svg
index 6495ea1..18a345c 100755
--- a/demo/markdown/SecondDivision/MegaDatabase/this/this.svg
+++ b/demo/markdown/SecondDivision/MegaDatabase/this/this.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="270px" preserveAspectRatio="none" style="width:142px;height:270px;" version="1.1" viewBox="0 0 142 270" width="142px" zoomAndPan="magnify"><defs><filter height="300%" id="f7s9ans3cx2he" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="104" x="14.5" y="26.708">this &lt;- this</text><rect fill="#FFFFFF" filter="url(#f7s9ans3cx2he)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="45" y="160.5156"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="49.5" x2="49.5" y1="86.25" y2="208.5156"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="33.5" y="82.9482">this</text><ellipse cx="50" cy="53.9531" fill="#FEFECE" filter="url(#f7s9ans3cx2he)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><polygon fill="#A80036" points="46,41.9531,52,36.9531,50,41.9531,52,46.9531,46,41.9531" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="33.5" y="220.5107">this</text><ellipse cx="50" cy="239.8125" fill="#FEFECE" filter="url(#f7s9ans3cx2he)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><polygon fill="#A80036" points="46,227.8125,52,222.8125,50,227.8125,52,232.8125,46,227.8125" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="#FFFFFF" filter="url(#f7s9ans3cx2he)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="45" y="160.5156"/><rect fill="#EEEEEE" filter="url(#f7s9ans3cx2he)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="127" x="3" y="116.8164"/><line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="130" y1="116.8164" y2="116.8164"/><line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="130" y1="119.8164" y2="119.8164"/><rect fill="#EEEEEE" filter="url(#f7s9ans3cx2he)" height="23.1328" style="stroke: #000000; stroke-width: 2.0;" width="103" x="15" y="106.25"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="84" x="21" y="122.3169">this &lt;- this</text><polygon fill="#A80036" points="33,156.5156,43,160.5156,33,164.5156,37,160.5156" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="39" y1="160.5156" y2="160.5156"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="23" x="10" y="155.4497">this</text><!--MD5=[abe784cd6827fd11be764f8b71a2166a]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="270px" preserveAspectRatio="none" style="width:142px;height:270px;" version="1.1" viewBox="0 0 142 270" width="142px" zoomAndPan="magnify"><defs><filter height="300%" id="f7s9ans3cx2he" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="104" x="14.5" y="26.708">this &lt;- this</text><rect fill="#FFFFFF" filter="url(#f7s9ans3cx2he)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="45" y="160.5156"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="49.5" x2="49.5" y1="86.25" y2="208.5156"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="33.5" y="82.9482">this</text><ellipse cx="50" cy="53.9531" fill="#FEFECE" filter="url(#f7s9ans3cx2he)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><polygon fill="#A80036" points="46,41.9531,52,36.9531,50,41.9531,52,46.9531,46,41.9531" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="33.5" y="220.5107">this</text><ellipse cx="50" cy="239.8125" fill="#FEFECE" filter="url(#f7s9ans3cx2he)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><polygon fill="#A80036" points="46,227.8125,52,222.8125,50,227.8125,52,232.8125,46,227.8125" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="#FFFFFF" filter="url(#f7s9ans3cx2he)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="45" y="160.5156"/><rect fill="#EEEEEE" filter="url(#f7s9ans3cx2he)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="127" x="3" y="116.8164"/><line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="130" y1="116.8164" y2="116.8164"/><line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="130" y1="119.8164" y2="119.8164"/><rect fill="#EEEEEE" filter="url(#f7s9ans3cx2he)" height="23.1328" style="stroke: #000000; stroke-width: 2.0;" width="103" x="15" y="106.25"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="84" x="21" y="122.3169">this &lt;- this</text><polygon fill="#A80036" points="33,156.5156,43,160.5156,33,164.5156,37,160.5156" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="39" y1="160.5156" y2="160.5156"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="23" x="10" y="155.4497">this</text><!--MD5=[ce98498b759ca68eb7e9b54d7e05a430]
 @startuml
 ''''''''''''''''''''''''''''''''''''''''''
 ''                                      ''
@@ -28,7 +28,7 @@ activate _0
 deactivate _0
 @enduml
 
-PlantUML version 1.2020.13(Sat Jun 13 12:26:38 UTC 2020)
+PlantUML version 1.2020.15beta1(Unknown compile time)
 (GPL source distribution)
 Java Runtime: Java(TM) SE Runtime Environment
 JVM: Java HotSpot(TM) 64-Bit Server VM
diff --git a/demo/markdown/SecondDivision/README.md b/demo/markdown/SecondDivision/README.md
index c2cab22..cb23c27 100644
--- a/demo/markdown/SecondDivision/README.md
+++ b/demo/markdown/SecondDivision/README.md
@@ -1,8 +1,6 @@
 
 
-
-[Back](../README.md)
-
+ [Back](../README.md)  | [Chat with us](https://anzoss.slack.com/messages/sysl-catalog/) | [New bug or feature request](https://github.com/anz-bank/sysl-catalog/issues/new)
 # SecondDivision
 
 | Package |
diff --git a/demo/markdown/SecondDivision/integration.svg b/demo/markdown/SecondDivision/integration.svg
index 654b413..cc91351 100755
--- a/demo/markdown/SecondDivision/integration.svg
+++ b/demo/markdown/SecondDivision/integration.svg
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="179px" preserveAspectRatio="none" style="width:153px;height:179px;" version="1.1" viewBox="0 0 153 179" width="153px" zoomAndPan="magnify"><defs><filter height="300%" id="fbr8m84rv2yx0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="139" x="2" y="16.708">SecondDivision</text><!--MD5=[834ef74a6aa73a899f9de7987f49a674]
-entity _0--><rect fill="#FFFAF0" filter="url(#fbr8m84rv2yx0)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="51" x="51.5" y="27.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="46.5" y="32.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="46.5" y="54.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="31" x="61.5" y="50.9482">that</text><!--MD5=[5793e68b51480d2da18d2edf8802f392]
-entity _1--><rect fill="#FFFAF0" filter="url(#fbr8m84rv2yx0)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="47" x="53.5" y="123.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="48.5" y="128.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="48.5" y="150.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="63.5" y="146.9482">this</text><!--MD5=[b84326987e98dcb917912705a3ef9c62]
-link _0 to _1--><path d="M77,64.1941 C77,79.4322 77,101.76 77,118.4107 " fill="none" id="_0-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="77,123.8214,81,114.8214,77,118.8214,73,114.8214,77,123.8214" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[0be33e6c3e8b229d115c1b30c35ef974]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="199px" preserveAspectRatio="none" style="width:153px;height:199px;" version="1.1" viewBox="0 0 153 199" width="153px" zoomAndPan="magnify"><defs><filter height="300%" id="fbr8m84rv2yx0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="139" x="2" y="16.708">SecondDivision</text><!--MD5=[834ef74a6aa73a899f9de7987f49a674]
+entity _0--><rect fill="#FFFAF0" filter="url(#fbr8m84rv2yx0)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="71" x="39" y="27.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="90" y="32.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="88" y="34.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="88" y="38.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="31" x="54" y="60.9482">that</text><!--MD5=[5793e68b51480d2da18d2edf8802f392]
+entity _1--><rect fill="#FFFAF0" filter="url(#fbr8m84rv2yx0)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="67" x="41" y="133.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="88" y="138.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="86" y="140.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="86" y="144.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="56" y="166.9482">this</text><!--MD5=[b84326987e98dcb917912705a3ef9c62]
+link _0 to _1--><path d="M74.5,74.0091 C74.5,90.0034 74.5,111.7316 74.5,128.7949 " fill="none" id="_0-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="74.5,133.9292,78.5,124.9292,74.5,128.9292,70.5,124.9292,74.5,133.9292" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[0be33e6c3e8b229d115c1b30c35ef974]
 @startuml
 ''''''''''''''''''''''''''''''''''''''''''
 ''                                      ''
diff --git a/demo/markdown/ThirdDivision/README.md b/demo/markdown/ThirdDivision/README.md
index bd6f5ff..b72fe07 100644
--- a/demo/markdown/ThirdDivision/README.md
+++ b/demo/markdown/ThirdDivision/README.md
@@ -1,8 +1,6 @@
 
 
-
-[Back](../README.md)
-
+ [Back](../README.md)  | [Chat with us](https://anzoss.slack.com/messages/sysl-catalog/) | [New bug or feature request](https://github.com/anz-bank/sysl-catalog/issues/new)
 # ThirdDivision
 
 | Package |
diff --git a/demo/markdown/ThirdDivision/ServerPackage/README.md b/demo/markdown/ThirdDivision/ServerPackage/README.md
index 5ac627b..6a79855 100644
--- a/demo/markdown/ThirdDivision/ServerPackage/README.md
+++ b/demo/markdown/ThirdDivision/ServerPackage/README.md
@@ -1,6 +1,6 @@
 
 
-[Back](../README.md)
+[Back](../README.md) | [Chat with us](https://anzoss.slack.com/messages/sysl-catalog/) | [New bug or feature request](https://github.com/anz-bank/sysl-catalog/issues/new)
 
 
 # ServerPackage
@@ -18,25 +18,25 @@
 ## Database Index
 | Database Application Name  | Source Location |
 ----|----
-[RelModel](#Database-RelModel) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|  
+[RelModel](#Database-RelModel) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|  
 
 
 ## Application Index
 | Application Name | Method | Source Location |
 ----|----|----
-Server | [Authenticate](#Server-Authenticate) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|  
-Server | [GET /testRestPathParamPrimitive/{primitiveID}](#Server-GETtestRestPathParamPrimitive{primitiveID}) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|  
-Server | [GET /testRestQueryParam](#Server-GETtestRestQueryParam) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|  
-Server | [GET /testRestQueryParamPrimitive](#Server-GETtestRestQueryParamPrimitive) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|  
-Server | [GET /testRestURLParam/{id}](#Server-GETtestRestURLParam{id}) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|  
-Server | [GET /testReturnNil](#Server-GETtestReturnNil) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|  
+Server | [Authenticate](#Server-Authenticate) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|  
+Server | [GET /testRestPathParamPrimitive/{primitiveID}](#Server-GETtestRestPathParamPrimitive{primitiveID}) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|  
+Server | [GET /testRestQueryParam](#Server-GETtestRestQueryParam) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|  
+Server | [GET /testRestQueryParamPrimitive](#Server-GETtestRestQueryParamPrimitive) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|  
+Server | [GET /testRestURLParam/{id}](#Server-GETtestRestURLParam{id}) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|  
+Server | [GET /testReturnNil](#Server-GETtestReturnNil) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|  
 
 ## Type Index
 | Application Name | Type Name | Source Location |
 ----|----|----
-Server | [Empty](#Server.Empty) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|
-Server | [Request](#Server.Request) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|
-Server | [Response](#Server.Response) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|
+Server | [Empty](#Server.Empty) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|
+Server | [Request](#Server.Request) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|
+Server | [Response](#Server.Response) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|
 
 
 
@@ -72,7 +72,9 @@ Server | [Response](#Server.Response) | [../../../../demo/simple2.sysl](../../..
 
 
 
-### Server Authenticate
+
+
+### <a name=Server-Authenticate></a>Server Authenticate
 this is a description of Authenticate
 
 <details>
@@ -116,7 +118,7 @@ this is a description of Authenticate
 
 
 
-### Server GETtestRestPathParamPrimitive{primitiveID}
+### <a name=Server-GETtestRestPathParamPrimitive{primitiveID}></a>Server GET /testRestPathParamPrimitive/{primitiveID}
 
 
 <details>
@@ -165,7 +167,7 @@ this is a description of Authenticate
 
 
 
-### Server GETtestRestQueryParam
+### <a name=Server-GETtestRestQueryParam></a>Server GET /testRestQueryParam
 
 
 <details>
@@ -220,7 +222,7 @@ this is a description of Authenticate
 
 
 
-### Server GETtestRestQueryParamPrimitive
+### <a name=Server-GETtestRestQueryParamPrimitive></a>Server GET /testRestQueryParamPrimitive
 
 
 <details>
@@ -269,7 +271,7 @@ this is a description of Authenticate
 
 
 
-### Server GETtestRestURLParam{id}
+### <a name=Server-GETtestRestURLParam{id}></a>Server GET /testRestURLParam/{id}
 
 
 <details>
@@ -318,7 +320,7 @@ this is a description of Authenticate
 
 
 
-### Server GETtestReturnNil
+### <a name=Server-GETtestReturnNil></a>Server GET /testReturnNil
 
 
 <details>
diff --git a/demo/markdown/ThirdDivision/ServerPackage/Server/gettestrestqueryparam.svg b/demo/markdown/ThirdDivision/ServerPackage/Server/gettestrestqueryparam.svg
index efba3a0..5f54022 100755
--- a/demo/markdown/ThirdDivision/ServerPackage/Server/gettestrestqueryparam.svg
+++ b/demo/markdown/ThirdDivision/ServerPackage/Server/gettestrestqueryparam.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="269px" preserveAspectRatio="none" style="width:365px;height:269px;" version="1.1" viewBox="0 0 365 269" width="365px" zoomAndPan="magnify"><defs><filter height="300%" id="fyrj9s5bvwfhv" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="341" x="12" y="26.708">Server &lt;- GET /testRestQueryParam</text><rect fill="#FFFFFF" filter="url(#fyrj9s5bvwfhv)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="210.5" y="160.5156"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="215" x2="215" y1="86.25" y2="207.6484"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="47" x="189" y="82.9482">Server</text><ellipse cx="215.5" cy="53.9531" fill="#FEFECE" filter="url(#fyrj9s5bvwfhv)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><polygon fill="#A80036" points="211.5,41.9531,217.5,36.9531,215.5,41.9531,217.5,46.9531,211.5,41.9531" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="47" x="189" y="219.6436">Server</text><ellipse cx="215.5" cy="238.9453" fill="#FEFECE" filter="url(#fyrj9s5bvwfhv)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><polygon fill="#A80036" points="211.5,226.9453,217.5,221.9453,215.5,226.9453,217.5,231.9453,211.5,226.9453" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="#FFFFFF" filter="url(#fyrj9s5bvwfhv)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="210.5" y="160.5156"/><rect fill="#EEEEEE" filter="url(#fyrj9s5bvwfhv)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="320" x="22.5" y="116.8164"/><line style="stroke: #000000; stroke-width: 1.0;" x1="22.5" x2="342.5" y1="116.8164" y2="116.8164"/><line style="stroke: #000000; stroke-width: 1.0;" x1="22.5" x2="342.5" y1="119.8164" y2="119.8164"/><rect fill="#EEEEEE" filter="url(#fyrj9s5bvwfhv)" height="23.1328" style="stroke: #000000; stroke-width: 2.0;" width="296" x="34.5" y="106.25"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="277" x="40.5" y="122.3169">Server &lt;- GET /testRestQueryParam</text><polygon fill="#A80036" points="198.5,156.5156,208.5,160.5156,198.5,164.5156,202.5,160.5156" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="22.5" x2="204.5" y1="160.5156" y2="160.5156"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="169" x="29.5" y="155.4497">GET /testRestQueryParam</text><polygon fill="#A80036" points="33.5,185.6484,23.5,189.6484,33.5,193.6484,29.5,189.6484" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="27.5" x2="214.5" y1="189.6484" y2="189.6484"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="63" x="39.5" y="184.5825">Response</text><!--MD5=[d7e763b7232707ca0efab020c5fd0057]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="269px" preserveAspectRatio="none" style="width:365px;height:269px;" version="1.1" viewBox="0 0 365 269" width="365px" zoomAndPan="magnify"><defs><filter height="300%" id="fyrj9s5bvwfhv" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="341" x="12" y="26.708">Server &lt;- GET /testRestQueryParam</text><rect fill="#FFFFFF" filter="url(#fyrj9s5bvwfhv)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="210.5" y="160.5156"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="215" x2="215" y1="86.25" y2="207.6484"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="47" x="189" y="82.9482">Server</text><ellipse cx="215.5" cy="53.9531" fill="#FEFECE" filter="url(#fyrj9s5bvwfhv)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><polygon fill="#A80036" points="211.5,41.9531,217.5,36.9531,215.5,41.9531,217.5,46.9531,211.5,41.9531" style="stroke: #A80036; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="47" x="189" y="219.6436">Server</text><ellipse cx="215.5" cy="238.9453" fill="#FEFECE" filter="url(#fyrj9s5bvwfhv)" rx="12" ry="12" style="stroke: #A80036; stroke-width: 2.0;"/><polygon fill="#A80036" points="211.5,226.9453,217.5,221.9453,215.5,226.9453,217.5,231.9453,211.5,226.9453" style="stroke: #A80036; stroke-width: 1.0;"/><rect fill="#FFFFFF" filter="url(#fyrj9s5bvwfhv)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="210.5" y="160.5156"/><rect fill="#EEEEEE" filter="url(#fyrj9s5bvwfhv)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="320" x="22.5" y="116.8164"/><line style="stroke: #000000; stroke-width: 1.0;" x1="22.5" x2="342.5" y1="116.8164" y2="116.8164"/><line style="stroke: #000000; stroke-width: 1.0;" x1="22.5" x2="342.5" y1="119.8164" y2="119.8164"/><rect fill="#EEEEEE" filter="url(#fyrj9s5bvwfhv)" height="23.1328" style="stroke: #000000; stroke-width: 2.0;" width="296" x="34.5" y="106.25"/><text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="277" x="40.5" y="122.3169">Server &lt;- GET /testRestQueryParam</text><polygon fill="#A80036" points="198.5,156.5156,208.5,160.5156,198.5,164.5156,202.5,160.5156" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0;" x1="22.5" x2="204.5" y1="160.5156" y2="160.5156"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="169" x="29.5" y="155.4497">GET /testRestQueryParam</text><polygon fill="#A80036" points="33.5,185.6484,23.5,189.6484,33.5,193.6484,29.5,189.6484" style="stroke: #A80036; stroke-width: 1.0;"/><line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="27.5" x2="214.5" y1="189.6484" y2="189.6484"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="63" x="39.5" y="184.5825">Response</text><!--MD5=[29c3647ba44d38a116161573ad4a53c7]
 @startuml
 ''''''''''''''''''''''''''''''''''''''''''
 ''                                      ''
@@ -30,7 +30,7 @@ activate _0
 deactivate _0
 @enduml
 
-PlantUML version 1.2020.13(Sat Jun 13 12:26:38 UTC 2020)
+PlantUML version 1.2020.15beta1(Unknown compile time)
 (GPL source distribution)
 Java Runtime: Java(TM) SE Runtime Environment
 JVM: Java HotSpot(TM) 64-Bit Server VM
diff --git a/demo/markdown/ThirdDivision/ServerPackage/integration.svg b/demo/markdown/ThirdDivision/ServerPackage/integration.svg
index fd58f0d..facef41 100755
--- a/demo/markdown/ThirdDivision/ServerPackage/integration.svg
+++ b/demo/markdown/ThirdDivision/ServerPackage/integration.svg
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="179px" preserveAspectRatio="none" style="width:270px;height:179px;" version="1.1" viewBox="0 0 270 179" width="270px" zoomAndPan="magnify"><defs><filter height="300%" id="fyynbsgpz9vg8" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="138" x="57" y="16.708">ServerPackage</text><!--MD5=[834ef74a6aa73a899f9de7987f49a674]
-entity _0--><rect fill="#FFFAF0" filter="url(#fyynbsgpz9vg8)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="98" x="12" y="27.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="7" y="32.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="7" y="54.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="78" x="22" y="50.9482">MobileApp</text><!--MD5=[5793e68b51480d2da18d2edf8802f392]
-entity _1--><rect fill="#FFFAF0" filter="url(#fyynbsgpz9vg8)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="67" x="95.5" y="123.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="90.5" y="128.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="90.5" y="150.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="47" x="105.5" y="146.9482">Server</text><!--MD5=[fc69c2ef26418c6b4957312aae07cc91]
-entity _2--><rect fill="#FFFAF0" filter="url(#fyynbsgpz9vg8)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="106" x="145" y="27.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="140" y="32.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="140" y="54.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="86" x="155" y="50.9482">MobileApp2</text><!--MD5=[b84326987e98dcb917912705a3ef9c62]
-link _0 to _1--><path d="M73.4722,64.1941 C84.7831,79.8297 101.4937,102.9297 113.627,119.702 " fill="none" id="_0-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="116.607,123.8214,114.5732,114.1848,113.6766,119.7702,108.0912,118.8735,116.607,123.8214" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[797b2ad59651ef14175f94513191e355]
-link _2 to _1--><path d="M185.344,64.1941 C173.867,79.8297 156.911,102.9297 144.599,119.702 " fill="none" id="_2-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="141.575,123.8214,150.1247,118.9325,144.5333,119.7905,143.6753,114.1991,141.575,123.8214" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[c7454a4a1dbb70de87c65efe67c6e532]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="199px" preserveAspectRatio="none" style="width:305px;height:199px;" version="1.1" viewBox="0 0 305 199" width="305px" zoomAndPan="magnify"><defs><filter height="300%" id="fyynbsgpz9vg8" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="138" x="74.5" y="16.708">ServerPackage</text><!--MD5=[834ef74a6aa73a899f9de7987f49a674]
+entity _0--><rect fill="#FFFAF0" filter="url(#fyynbsgpz9vg8)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="118" x="7" y="27.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="105" y="32.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="103" y="34.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="103" y="38.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="78" x="22" y="60.9482">MobileApp</text><!--MD5=[5793e68b51480d2da18d2edf8802f392]
+entity _1--><rect fill="#FFFAF0" filter="url(#fyynbsgpz9vg8)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="87" x="100.5" y="133.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="167.5" y="138.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="165.5" y="140.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="165.5" y="144.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="47" x="115.5" y="166.9482">Server</text><!--MD5=[fc69c2ef26418c6b4957312aae07cc91]
+entity _2--><rect fill="#FFFAF0" filter="url(#fyynbsgpz9vg8)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="126" x="160" y="27.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="266" y="32.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="264" y="34.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="264" y="38.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="86" x="175" y="60.9482">MobileApp2</text><!--MD5=[b84326987e98dcb917912705a3ef9c62]
+link _0 to _1--><path d="M82.5418,74.0091 C94.7445,90.2791 111.397,112.4825 124.29,129.6733 " fill="none" id="_0-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="127.482,133.9292,125.2818,124.3293,124.4819,129.9293,118.8819,129.1294,127.482,133.9292" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[797b2ad59651ef14175f94513191e355]
+link _2 to _1--><path d="M206.246,74.0091 C193.887,90.2791 177.021,112.4825 163.963,129.6733 " fill="none" id="_2-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="160.73,133.9292,169.3594,129.1823,163.7546,129.9478,162.9891,124.343,160.73,133.9292" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[c7454a4a1dbb70de87c65efe67c6e532]
 @startuml
 ''''''''''''''''''''''''''''''''''''''''''
 ''                                      ''
diff --git a/demo/markdown/ThirdDivision/foo/README.md b/demo/markdown/ThirdDivision/foo/README.md
index 00b7142..94bc43c 100644
--- a/demo/markdown/ThirdDivision/foo/README.md
+++ b/demo/markdown/ThirdDivision/foo/README.md
@@ -1,6 +1,6 @@
 
 
-[Back](../README.md)
+[Back](../README.md) | [Chat with us](https://anzoss.slack.com/messages/sysl-catalog/) | [New bug or feature request](https://github.com/anz-bank/sysl-catalog/issues/new)
 
 
 # foo
@@ -17,7 +17,7 @@
 ## Application Index
 | Application Name | Method | Source Location |
 ----|----|----
-foo | [whatever](#foo-whatever) | [../../../../demo/simple2.sysl](../../../../demo/simple2.sysl)|  
+foo | [whatever](#foo-whatever) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl)|  
 
 ## Type Index
 | Application Name | Type Name | Source Location |
@@ -42,7 +42,9 @@ foo | [whatever](#foo-whatever) | [../../../../demo/simple2.sysl](../../../../de
 
 
 
-### foo whatever
+
+
+### <a name=foo-whatever></a>foo whatever
 
 
 <details>
diff --git a/demo/markdown/ThirdDivision/integration.svg b/demo/markdown/ThirdDivision/integration.svg
index 5be085e..b5f6f85 100755
--- a/demo/markdown/ThirdDivision/integration.svg
+++ b/demo/markdown/ThirdDivision/integration.svg
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="179px" preserveAspectRatio="none" style="width:270px;height:179px;" version="1.1" viewBox="0 0 270 179" width="270px" zoomAndPan="magnify"><defs><filter height="300%" id="f1m9n6ah2kayw7" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="121" x="65.5" y="16.708">ThirdDivision</text><!--MD5=[834ef74a6aa73a899f9de7987f49a674]
-entity _0--><rect fill="#FFFAF0" filter="url(#f1m9n6ah2kayw7)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="98" x="12" y="27.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="7" y="32.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="7" y="54.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="78" x="22" y="50.9482">MobileApp</text><!--MD5=[5793e68b51480d2da18d2edf8802f392]
-entity _1--><rect fill="#FFFAF0" filter="url(#f1m9n6ah2kayw7)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="67" x="95.5" y="123.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="90.5" y="128.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="90.5" y="150.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="47" x="105.5" y="146.9482">Server</text><!--MD5=[fc69c2ef26418c6b4957312aae07cc91]
-entity _2--><rect fill="#FFFAF0" filter="url(#f1m9n6ah2kayw7)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="106" x="145" y="27.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="140" y="32.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="140" y="54.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="86" x="155" y="50.9482">MobileApp2</text><!--MD5=[b84326987e98dcb917912705a3ef9c62]
-link _0 to _1--><path d="M73.4722,64.1941 C84.7831,79.8297 101.4937,102.9297 113.627,119.702 " fill="none" id="_0-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="116.607,123.8214,114.5732,114.1848,113.6766,119.7702,108.0912,118.8735,116.607,123.8214" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[797b2ad59651ef14175f94513191e355]
-link _2 to _1--><path d="M185.344,64.1941 C173.867,79.8297 156.911,102.9297 144.599,119.702 " fill="none" id="_2-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="141.575,123.8214,150.1247,118.9325,144.5333,119.7905,143.6753,114.1991,141.575,123.8214" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[9a2de00ac32f454aab75fae4027fe617]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="199px" preserveAspectRatio="none" style="width:305px;height:199px;" version="1.1" viewBox="0 0 305 199" width="305px" zoomAndPan="magnify"><defs><filter height="300%" id="f1m9n6ah2kayw7" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="121" x="83" y="16.708">ThirdDivision</text><!--MD5=[834ef74a6aa73a899f9de7987f49a674]
+entity _0--><rect fill="#FFFAF0" filter="url(#f1m9n6ah2kayw7)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="118" x="7" y="27.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="105" y="32.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="103" y="34.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="103" y="38.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="78" x="22" y="60.9482">MobileApp</text><!--MD5=[5793e68b51480d2da18d2edf8802f392]
+entity _1--><rect fill="#FFFAF0" filter="url(#f1m9n6ah2kayw7)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="87" x="100.5" y="133.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="167.5" y="138.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="165.5" y="140.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="165.5" y="144.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="47" x="115.5" y="166.9482">Server</text><!--MD5=[fc69c2ef26418c6b4957312aae07cc91]
+entity _2--><rect fill="#FFFAF0" filter="url(#f1m9n6ah2kayw7)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="126" x="160" y="27.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="266" y="32.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="264" y="34.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="264" y="38.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="86" x="175" y="60.9482">MobileApp2</text><!--MD5=[b84326987e98dcb917912705a3ef9c62]
+link _0 to _1--><path d="M82.5418,74.0091 C94.7445,90.2791 111.397,112.4825 124.29,129.6733 " fill="none" id="_0-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="127.482,133.9292,125.2818,124.3293,124.4819,129.9293,118.8819,129.1294,127.482,133.9292" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[797b2ad59651ef14175f94513191e355]
+link _2 to _1--><path d="M206.246,74.0091 C193.887,90.2791 177.021,112.4825 163.963,129.6733 " fill="none" id="_2-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="160.73,133.9292,169.3594,129.1823,163.7546,129.9478,162.9891,124.343,160.73,133.9292" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[9a2de00ac32f454aab75fae4027fe617]
 @startuml
 ''''''''''''''''''''''''''''''''''''''''''
 ''                                      ''
diff --git a/demo/markdown/ThirdDivision/simpleredoc/README.md b/demo/markdown/ThirdDivision/simpleredoc/README.md
index ee1e885..d4ba1c0 100644
--- a/demo/markdown/ThirdDivision/simpleredoc/README.md
+++ b/demo/markdown/ThirdDivision/simpleredoc/README.md
@@ -1,6 +1,6 @@
 
 
-[Back](../README.md)
+[Back](../README.md) | [Chat with us](https://anzoss.slack.com/messages/sysl-catalog/) | [New bug or feature request](https://github.com/anz-bank/sysl-catalog/issues/new)
 
 
 # simpleredoc
@@ -17,13 +17,13 @@
 ## Application Index
 | Application Name | Method | Source Location |
 ----|----|----
-simpleredoc | [GET /test](#simpleredoc-GETtest) | [../../../../demo/simple.yaml](../../../../demo/simple.yaml)|  
+simpleredoc | [GET /test](#simpleredoc-GETtest) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml)|  
 
 ## Type Index
 | Application Name | Type Name | Source Location |
 ----|----|----
-simpleredoc | [SimpleObj](#simpleredoc.SimpleObj) | [../../../../demo/simple.yaml](../../../../demo/simple.yaml)|
-simpleredoc | [SimpleObj2](#simpleredoc.SimpleObj2) | [../../../../demo/simple.yaml](../../../../demo/simple.yaml)|
+simpleredoc | [SimpleObj](#simpleredoc.SimpleObj) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml)|
+simpleredoc | [SimpleObj2](#simpleredoc.SimpleObj2) | [https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml](https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml)|
 
 
 
@@ -44,7 +44,9 @@ simpleredoc | [SimpleObj2](#simpleredoc.SimpleObj2) | [../../../../demo/simple.y
 
 
 
-### simpleredoc GETtest
+
+
+### <a name=simpleredoc-GETtest></a>simpleredoc GET /test
 
 
 <details>
diff --git a/demo/markdown/ThirdDivision/simpleredoc/simpleredoc/simpleobj.svg b/demo/markdown/ThirdDivision/simpleredoc/simpleredoc/simpleobj.svg
index d7fadc5..3804624 100755
--- a/demo/markdown/ThirdDivision/simpleredoc/simpleredoc/simpleobj.svg
+++ b/demo/markdown/ThirdDivision/simpleredoc/simpleredoc/simpleobj.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="86px" preserveAspectRatio="none" style="width:199px;height:86px;" version="1.1" viewBox="0 0 199 86" width="199px" zoomAndPan="magnify"><defs><filter height="300%" id="f1387pu0jdok1k" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><!--MD5=[f77682fd75c3e1fc6a82f566c0814d0f]
-class _0--><rect fill="#FEFECE" filter="url(#f1387pu0jdok1k)" height="60.8047" id="_0" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="7" y="7"/><ellipse cx="22" cy="23" fill="#DA70D6" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M19.5156,26.2969 C18.8594,26.2969 18.4688,26.6094 18.4688,27.1563 C18.4688,27.4063 18.6094,27.6719 18.8281,27.8281 C18.9844,27.9531 19.2031,28 19.6094,28 L23.0781,28 C24.5625,28 25.5781,27.6094 26.4063,26.7188 C27.1875,25.9063 27.5938,24.8594 27.5938,23.6094 L27.5938,22.8125 C27.5938,20.1406 25.7031,18.0938 23.2188,18.0938 L19.6094,18.0938 C19.1563,18.0938 19.0313,18.1094 18.875,18.2031 C18.625,18.3594 18.4688,18.6563 18.4688,18.9375 C18.4688,19.4844 18.8438,19.7813 19.5156,19.7813 L19.5156,26.2969 Z M21.2031,26.2969 L21.2031,19.7813 L23.0781,19.7813 C23.9844,19.7813 24.625,20.0625 25.1406,20.6563 C25.625,21.2344 25.9063,21.9844 25.9063,22.7813 L25.9063,23.5625 C25.9063,24.4375 25.6719,25.0313 25.2031,25.5469 C24.6719,26.0938 24.1094,26.2969 23.0938,26.2969 L21.2031,26.2969 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="141" x="36" y="27.1543">simpleredoc.SimpleObj</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="179" y1="39" y2="39"/><ellipse cx="18" cy="50" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="75" x="27" y="53.2104">name : string</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="179" y1="59.8047" y2="59.8047"/><!--MD5=[2a094aa7b4c697c44cae4a7feaa0c1e8]
+class _0--><rect fill="#FEFECE" filter="url(#f1387pu0jdok1k)" height="60.8047" id="_0" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="7" y="7"/><ellipse cx="22" cy="23" fill="#DA70D6" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/><path d="M19.5156,26.2969 C18.8594,26.2969 18.4688,26.6094 18.4688,27.1563 C18.4688,27.4063 18.6094,27.6719 18.8281,27.8281 C18.9844,27.9531 19.2031,28 19.6094,28 L23.0781,28 C24.5625,28 25.5781,27.6094 26.4063,26.7188 C27.1875,25.9063 27.5938,24.8594 27.5938,23.6094 L27.5938,22.8125 C27.5938,20.1406 25.7031,18.0938 23.2188,18.0938 L19.6094,18.0938 C19.1563,18.0938 19.0313,18.1094 18.875,18.2031 C18.625,18.3594 18.4688,18.6563 18.4688,18.9375 C18.4688,19.4844 18.8438,19.7813 19.5156,19.7813 L19.5156,26.2969 Z M21.2031,26.2969 L21.2031,19.7813 L23.0781,19.7813 C23.9844,19.7813 24.625,20.0625 25.1406,20.6563 C25.625,21.2344 25.9063,21.9844 25.9063,22.7813 L25.9063,23.5625 C25.9063,24.4375 25.6719,25.0313 25.2031,25.5469 C24.6719,26.0938 24.1094,26.2969 23.0938,26.2969 L21.2031,26.2969 Z "/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="141" x="36" y="27.1543">simpleredoc.SimpleObj</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="179" y1="39" y2="39"/><ellipse cx="18" cy="50" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="75" x="27" y="53.2104">name : string</text><line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="179" y1="59.8047" y2="59.8047"/><!--MD5=[82342a79d1dba38f88f92b45c3351064]
 @startuml
 ''''''''''''''''''''''''''''''''''''''''''
 ''                                      ''
@@ -19,7 +19,7 @@ class "simpleredoc.SimpleObj" as _0 << (D,orchid) >> {
 }
 @enduml
 
-PlantUML version 1.2020.13(Sat Jun 13 12:26:38 UTC 2020)
+PlantUML version 1.2020.15beta1(Unknown compile time)
 (GPL source distribution)
 Java Runtime: Java(TM) SE Runtime Environment
 JVM: Java HotSpot(TM) 64-Bit Server VM
diff --git a/demo/markdown/integration.svg b/demo/markdown/integration.svg
index 5be085e..cc91351 100755
--- a/demo/markdown/integration.svg
+++ b/demo/markdown/integration.svg
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="179px" preserveAspectRatio="none" style="width:270px;height:179px;" version="1.1" viewBox="0 0 270 179" width="270px" zoomAndPan="magnify"><defs><filter height="300%" id="f1m9n6ah2kayw7" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="121" x="65.5" y="16.708">ThirdDivision</text><!--MD5=[834ef74a6aa73a899f9de7987f49a674]
-entity _0--><rect fill="#FFFAF0" filter="url(#f1m9n6ah2kayw7)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="98" x="12" y="27.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="7" y="32.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="7" y="54.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="78" x="22" y="50.9482">MobileApp</text><!--MD5=[5793e68b51480d2da18d2edf8802f392]
-entity _1--><rect fill="#FFFAF0" filter="url(#f1m9n6ah2kayw7)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="67" x="95.5" y="123.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="90.5" y="128.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="90.5" y="150.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="47" x="105.5" y="146.9482">Server</text><!--MD5=[fc69c2ef26418c6b4957312aae07cc91]
-entity _2--><rect fill="#FFFAF0" filter="url(#f1m9n6ah2kayw7)" height="36.2969" style="stroke: #000000; stroke-width: 1.5;" width="106" x="145" y="27.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="140" y="32.9531"/><rect fill="#FFFAF0" height="5" style="stroke: #000000; stroke-width: 1.5;" width="10" x="140" y="54.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="86" x="155" y="50.9482">MobileApp2</text><!--MD5=[b84326987e98dcb917912705a3ef9c62]
-link _0 to _1--><path d="M73.4722,64.1941 C84.7831,79.8297 101.4937,102.9297 113.627,119.702 " fill="none" id="_0-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="116.607,123.8214,114.5732,114.1848,113.6766,119.7702,108.0912,118.8735,116.607,123.8214" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[797b2ad59651ef14175f94513191e355]
-link _2 to _1--><path d="M185.344,64.1941 C173.867,79.8297 156.911,102.9297 144.599,119.702 " fill="none" id="_2-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="141.575,123.8214,150.1247,118.9325,144.5333,119.7905,143.6753,114.1991,141.575,123.8214" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[9a2de00ac32f454aab75fae4027fe617]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="199px" preserveAspectRatio="none" style="width:153px;height:199px;" version="1.1" viewBox="0 0 153 199" width="153px" zoomAndPan="magnify"><defs><filter height="300%" id="fbr8m84rv2yx0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="139" x="2" y="16.708">SecondDivision</text><!--MD5=[834ef74a6aa73a899f9de7987f49a674]
+entity _0--><rect fill="#FFFAF0" filter="url(#fbr8m84rv2yx0)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="71" x="39" y="27.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="90" y="32.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="88" y="34.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="88" y="38.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="31" x="54" y="60.9482">that</text><!--MD5=[5793e68b51480d2da18d2edf8802f392]
+entity _1--><rect fill="#FFFAF0" filter="url(#fbr8m84rv2yx0)" height="46.2969" style="stroke: #000000; stroke-width: 1.5;" width="67" x="41" y="133.9531"/><rect fill="#FFFAF0" height="10" style="stroke: #000000; stroke-width: 1.5;" width="15" x="88" y="138.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="86" y="140.9531"/><rect fill="#FFFAF0" height="2" style="stroke: #000000; stroke-width: 1.5;" width="4" x="86" y="144.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="56" y="166.9482">this</text><!--MD5=[b84326987e98dcb917912705a3ef9c62]
+link _0 to _1--><path d="M74.5,74.0091 C74.5,90.0034 74.5,111.7316 74.5,128.7949 " fill="none" id="_0-&gt;_1" style="stroke: #DC143C; stroke-width: 1.0;"/><polygon fill="#DC143C" points="74.5,133.9292,78.5,124.9292,74.5,128.9292,70.5,124.9292,74.5,133.9292" style="stroke: #DC143C; stroke-width: 1.0;"/><!--MD5=[0be33e6c3e8b229d115c1b30c35ef974]
 @startuml
 ''''''''''''''''''''''''''''''''''''''''''
 ''                                      ''
@@ -12,7 +10,7 @@ link _2 to _1--><path d="M185.344,64.1941 C173.867,79.8297 156.911,102.9297 144.
 ''''''''''''''''''''''''''''''''''''''''''
 
 
-title ThirdDivision
+title SecondDivision
 hide stereotype
 scale max 16384 height
 skinparam component {
@@ -20,17 +18,15 @@ skinparam component {
   BorderColor Black
   ArrowColor Crimson
 }
-[MobileApp] as _0
-[Server] as _1 <<highlight>>
+[that] as _0
+[this] as _1 <<highlight>>
 _0 - -> _1
-[MobileApp2] as _2
-_2 - -> _1
 @enduml
 
 @startuml
 
 
-title ThirdDivision
+title SecondDivision
 hide stereotype
 scale max 16384 height
 skinparam component {
@@ -38,11 +34,9 @@ skinparam component {
   BorderColor Black
   ArrowColor Crimson
 }
-[MobileApp] as _0
-[Server] as _1 <<highlight>>
+[that] as _0
+[this] as _1 <<highlight>>
 _0 - -> _1
-[MobileApp2] as _2
-_2 - -> _1
 @enduml
 
 PlantUML version 1.2020.13(Sat Jun 13 12:26:38 UTC 2020)
diff --git a/demo/markdown/integrationepa.svg b/demo/markdown/integrationepa.svg
index b30f73e..57e3a0e 100755
--- a/demo/markdown/integrationepa.svg
+++ b/demo/markdown/integrationepa.svg
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="381px" preserveAspectRatio="none" style="width:395px;height:381px;" version="1.1" viewBox="0 0 395 381" width="395px" zoomAndPan="magnify"><defs><filter height="300%" id="futi05fps9k2a" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="121" x="128" y="16.708">ThirdDivision</text><!--MD5=[758d88821a0e741df1f73accbabae398]
-cluster X_0--><rect fill="#FFFAF0" filter="url(#futi05fps9k2a)" height="91" rx="12.5" ry="12.5" style="stroke: #000000; stroke-width: 1.5;" width="331.5" x="46.5" y="273.9531"/><rect fill="#FFFFFF" height="58.7031" rx="12.5" ry="12.5" style="stroke: #FFFFFF; stroke-width: 1.0;" width="325.5" x="49.5" y="303.25"/><line style="stroke: #000000; stroke-width: 1.5;" x1="46.5" x2="378" y1="300.25" y2="300.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="78" x="173.25" y="290.9482">MobileApp</text><!--MD5=[cecb9a85ae19b9003f4441b135e71cd6]
-cluster X_1--><rect fill="#FFFAF0" filter="url(#futi05fps9k2a)" height="91" rx="12.5" ry="12.5" style="stroke: #000000; stroke-width: 1.5;" width="371" x="7" y="27.9531"/><rect fill="#FFFFFF" height="58.7031" rx="12.5" ry="12.5" style="stroke: #FFFFFF; stroke-width: 1.0;" width="365" x="10" y="57.25"/><line style="stroke: #000000; stroke-width: 1.5;" x1="7" x2="378" y1="54.25" y2="54.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="86" x="149.5" y="44.9482">MobileApp2</text><!--MD5=[51e8d94a944361a156a1f52e5c4894ba]
-cluster X_2--><rect fill="#FFFAF0" filter="url(#futi05fps9k2a)" height="107" rx="12.5" ry="12.5" style="stroke: #000000; stroke-width: 1.5;" width="137" x="218.5" y="142.9531"/><rect fill="#FFFFFF" height="74.7031" rx="12.5" ry="12.5" style="stroke: #FFFFFF; stroke-width: 1.0;" width="131" x="221.5" y="172.25"/><line style="stroke: #000000; stroke-width: 1.5;" x1="218.5" x2="355.5" y1="169.25" y2="169.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="47" x="247" y="159.9482">Server</text><rect fill="#FFFAF0" filter="url(#futi05fps9k2a)" height="40" rx="12.5" ry="12.5" style="stroke: #000000; stroke-width: 1.5;" width="150" x="212" y="308.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="140" x="217" y="333.7998">Authenticate client</text><rect fill="#FFFAF0" filter="url(#futi05fps9k2a)" height="40" rx="12.5" ry="12.5" style="stroke: #000000; stroke-width: 1.5;" width="50" x="62.5" y="308.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="68" y="333.7998">Login</text><rect fill="#FFFAF0" filter="url(#futi05fps9k2a)" height="40" rx="12.5" ry="12.5" style="stroke: #000000; stroke-width: 1.5;" width="150" x="212" y="62.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="140" x="217" y="87.7998">Authenticate client</text><rect fill="#FFFAF0" filter="url(#futi05fps9k2a)" height="40" rx="12.5" ry="12.5" style="stroke: #000000; stroke-width: 1.5;" width="129" x="23" y="62.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="119" x="28" y="87.7998">SecondEndpoint</text><rect fill="#FFFAF0" filter="url(#futi05fps9k2a)" height="40" rx="12.5" ry="12.5" style="stroke: #000000; stroke-width: 1.5;" width="105" x="234.5" y="193.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="95" x="239.5" y="218.7998">Authenticate</text><!--MD5=[b4e3d399786c33682cf7201d5a7381ec]
-link _1 to _0--><path d="M112.717,328.9531 C136.085,328.9531 172.766,328.9531 206.373,328.9531 " fill="none" id="_1-&gt;_0" style="stroke: #C0C0C0; stroke-width: 1.0;"/><polygon fill="#C0C0C0" points="211.738,328.9531,202.738,324.9531,206.738,328.9531,202.738,332.9531,211.738,328.9531" style="stroke: #C0C0C0; stroke-width: 1.0;"/><!--MD5=[66d2e95ee2e3e1b5b59548f8bdae5bf2]
-link _0 to _4--><path d="M287,308.7383 C287,285.6754 287,262.6131 287,239.5501 " fill="none" id="_0-&gt;_4" style="stroke: #000000; stroke-width: 1.0;"/><polygon fill="#000000" points="287,234.3171,283,243.3171,287,239.3171,291,243.3171,287,234.3171" style="stroke: #000000; stroke-width: 1.0;"/><!--MD5=[450ea2f654882f822490fe83b2b538b8]
-link _3 to _2--><path d="M152.077,82.9531 C169.497,82.9531 188.596,82.9531 206.776,82.9531 " fill="none" id="_3-&gt;_2" style="stroke: #C0C0C0; stroke-width: 1.0;"/><polygon fill="#C0C0C0" points="211.877,82.9531,202.877,78.9531,206.877,82.9531,202.877,86.9531,211.877,82.9531" style="stroke: #C0C0C0; stroke-width: 1.0;"/><!--MD5=[7147dd2715d95ef75e19400737a46bd1]
-link _2 to _4--><path d="M287,103.2931 C287,131.6751 287,160.0581 287,188.4401 " fill="none" id="_2-&gt;_4" style="stroke: #000000; stroke-width: 1.0;"/><polygon fill="#000000" points="287,193.7401,291,184.7401,287,188.7401,283,184.7401,287,193.7401" style="stroke: #000000; stroke-width: 1.0;"/><!--MD5=[93c2226076b366f93a779511bd07aeed]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="266px" preserveAspectRatio="none" style="width:255px;height:266px;" version="1.1" viewBox="0 0 255 266" width="255px" zoomAndPan="magnify"><defs><filter height="300%" id="fecfvxx5r8vu5" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="139" x="49" y="16.708">SecondDivision</text><!--MD5=[758d88821a0e741df1f73accbabae398]
+cluster X_0--><rect fill="#FFFAF0" filter="url(#fecfvxx5r8vu5)" height="91" rx="12.5" ry="12.5" style="stroke: #000000; stroke-width: 1.5;" width="231" x="7" y="158.9531"/><rect fill="#FFFFFF" height="58.7031" rx="12.5" ry="12.5" style="stroke: #FFFFFF; stroke-width: 1.0;" width="225" x="10" y="188.25"/><line style="stroke: #000000; stroke-width: 1.5;" x1="7" x2="238" y1="185.25" y2="185.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="31" x="107" y="175.9482">that</text><!--MD5=[cecb9a85ae19b9003f4441b135e71cd6]
+cluster X_1--><rect fill="#FFFAF0" filter="url(#fecfvxx5r8vu5)" height="107" rx="12.5" ry="12.5" style="stroke: #000000; stroke-width: 1.5;" width="96" x="133" y="27.9531"/><rect fill="#FFFFFF" height="74.7031" rx="12.5" ry="12.5" style="stroke: #FFFFFF; stroke-width: 1.0;" width="90" x="136" y="57.25"/><line style="stroke: #000000; stroke-width: 1.5;" x1="133" x2="229" y1="54.25" y2="54.25"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="141" y="44.9482">this</text><rect fill="#FFFAF0" filter="url(#fecfvxx5r8vu5)" height="40" rx="12.5" ry="12.5" style="stroke: #000000; stroke-width: 1.5;" width="50" x="23" y="193.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="34.5" y="218.7998">this</text><rect fill="#FFFAF0" filter="url(#fecfvxx5r8vu5)" height="40" rx="12.5" ry="12.5" style="stroke: #000000; stroke-width: 1.5;" width="82" x="140" y="193.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="72" x="145" y="218.7998">this client</text><rect fill="#FFFAF0" filter="url(#fecfvxx5r8vu5)" height="40" rx="12.5" ry="12.5" style="stroke: #000000; stroke-width: 1.5;" width="50" x="156" y="78.9531"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="167.5" y="103.7998">this</text><!--MD5=[b84326987e98dcb917912705a3ef9c62]
+link _0 to _1--><path d="M73.0274,213.9531 C90.2551,213.9531 113.985,213.9531 134.719,213.9531 " fill="none" id="_0-&gt;_1" style="stroke: #C0C0C0; stroke-width: 1.0;"/><polygon fill="#C0C0C0" points="139.92,213.9531,130.92,209.9531,134.92,213.9531,130.92,217.9531,139.92,213.9531" style="stroke: #C0C0C0; stroke-width: 1.0;"/><!--MD5=[9b2f885a3b732ca8ca49345c576bdf4e]
+link _1 to _2--><path d="M181,193.7383 C181,170.6754 181,147.6131 181,124.5501 " fill="none" id="_1-&gt;_2" style="stroke: #000000; stroke-width: 1.0;"/><polygon fill="#000000" points="181,119.3171,177,128.3171,181,124.3171,185,128.3171,181,119.3171" style="stroke: #000000; stroke-width: 1.0;"/><!--MD5=[6918948fd9da82c742dbfeb14b3e0c64]
 @startuml
 ''''''''''''''''''''''''''''''''''''''''''
 ''                                      ''
@@ -14,7 +11,7 @@ link _2 to _4--><path d="M287,103.2931 C287,131.6751 287,160.0581 287,188.4401 "
 ''''''''''''''''''''''''''''''''''''''''''
 
 
-title ThirdDivision
+title SecondDivision
 left to right direction
 scale max 16384 height
 hide empty description
@@ -23,27 +20,21 @@ skinparam state {
   BorderColor Black
   ArrowColor Crimson
 }
-state "MobileApp" as X_0 {
-  state "Authenticate client" as _0
-  state "Login" as _1
+state "that" as X_0 {
+  state "this" as _0
+  state "this client" as _1
 }
-state "MobileApp2" as X_1 {
-  state "Authenticate client" as _2
-  state "SecondEndpoint" as _3
+state "this" as X_1 <<highlight>> {
+  state "this" as _2 <<highlight>>
 }
-state "Server" as X_2 <<highlight>> {
-  state "Authenticate" as _4 <<highlight>>
-}
-_1 -[#silver]-> _0
-_0 -[#black]> _4
-_3 -[#silver]-> _2
-_2 -[#black]> _4
+_0 -[#silver]-> _1
+_1 -[#black]> _2
 @enduml
 
 @startuml
 
 
-title ThirdDivision
+title SecondDivision
 left to right direction
 scale max 16384 height
 hide empty description
@@ -52,21 +43,15 @@ skinparam state {
   BorderColor Black
   ArrowColor Crimson
 }
-state "MobileApp" as X_0 {
-  state "Authenticate client" as _0
-  state "Login" as _1
-}
-state "MobileApp2" as X_1 {
-  state "Authenticate client" as _2
-  state "SecondEndpoint" as _3
+state "that" as X_0 {
+  state "this" as _0
+  state "this client" as _1
 }
-state "Server" as X_2 <<highlight>> {
-  state "Authenticate" as _4 <<highlight>>
+state "this" as X_1 <<highlight>> {
+  state "this" as _2 <<highlight>>
 }
-_1 -[#silver]-> _0
-_0 -[#black]> _4
-_3 -[#silver]-> _2
-_2 -[#black]> _4
+_0 -[#silver]-> _1
+_1 -[#black]> _2
 @enduml
 
 PlantUML version 1.2020.13(Sat Jun 13 12:26:38 UTC 2020)
diff --git a/docs/FirstDivision/ApplicationPackage/index.html b/docs/FirstDivision/ApplicationPackage/index.html
index 60b7107..4d5ebf7 100644
--- a/docs/FirstDivision/ApplicationPackage/index.html
+++ b/docs/FirstDivision/ApplicationPackage/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a> | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>ApplicationPackage</h1>
 <h2>Integration Diagram</h2>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZarBmq0GXk_pAyPJJu6sYdWefMaJnOEDQCH3aJ8cGx9aixFCRlr0_EzIuWTuodjQzddUcPcC3amcE2hVQlfG5bVvDhzBopp3JP7bc2IO5RWjIiopw_BaLnqzTVIji0gHD1vw2z54ovXwRqr5qOYxfQgZXg4rDME8h2pntJE4YYnZJsyuEp-zECEMJTD629rndfHwhAJtujX5_034DLLTet9mzKQiA5vQKRAFhObyfA8rwq3MbgeE45DLUHs-Dchw80u-ONSZpyPowlqJKi3z51UBrZIjFIvVBc5tp_h2Ei0PxAUO9ClZwwyu7-3yNtC__r5NxEf3Rxy2003__p0OVjO0" alt=""></p>
@@ -23,22 +23,22 @@ <h2>Application Index</h2>
 <tr>
 <td>MobileApp</td>
 <td><a href="#MobileApp-Another">Another</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>MobileApp</td>
 <td><a href="#MobileApp-Login">Login</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>MobileApp2</td>
 <td><a href="#MobileApp2-SecondEndpoint">SecondEndpoint</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>MobileApp2</td>
 <td><a href="#MobileApp2-ThirdEndpoint">ThirdEndpoint</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 </tbody>
 </table>
@@ -57,7 +57,7 @@ <h2>Application MobileApp</h2>
 <ul>
 <li>this is a comment for MobileApp</li>
 </ul>
-<h3>MobileApp Another</h3>
+<h3><a name=MobileApp-Another></a>MobileApp Another</h3>
 <p>hello, world</p>
 <details>
 <summary>Sequence Diagram</summary>
@@ -75,7 +75,7 @@ <h4>Response types</h4>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCaK5Bmq0GXU_pAvwvHBScD3sMKbhSHJoqWHhFOPeEMaWsTNSZ5Eb_5xNe8Jda7OVtFZwObG_iGjVK58yEnJ56vLfTlnJvezcQtRem6W-vDaWIw1pRl83HJyNDNtKqTRGhLJLxZsWZhwmvy9wzfAOvXNC4zYYdYmLkzNthghVZuGxB9JxfCZZQj5Qkemm3gmcuQJiRCCVHXd_8ixWFSUbE_AcrNdu9is72dcksbM0EfVh6Ij44xvsuSx_mOwSKNQYSGIK9eYnDCqGefxrBHYknX--dVmK00F__ZEPvaG00" alt=""></p>
 </details>
 <hr>
-<h3>MobileApp Login</h3>
+<h3><a name=MobileApp-Login></a>MobileApp Login</h3>
 <p>hello, gamers</p>
 <details>
 <summary>Sequence Diagram</summary>
@@ -97,7 +97,7 @@ <h2>Application MobileApp2</h2>
 <ul>
 <li>this is a comment for MobileApp</li>
 </ul>
-<h3>MobileApp2 SecondEndpoint</h3>
+<h3><a name=MobileApp2-SecondEndpoint></a>MobileApp2 SecondEndpoint</h3>
 <p>SecondEndpoint, comment</p>
 <details>
 <summary>Sequence Diagram</summary>
@@ -115,7 +115,7 @@ <h4>Response types</h4>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDfoA2v9B2efpStXKYSQSAchAn05e4eTGqFytLtzN8CSGrnT59pzNLmLT7KLNFmL_Fn355nTF4CKuKg9DfLejt8bvoGM5oie-QQc9xeabYGc9HQdwhdc5fHKAYaa5Yl46zZOA6YuwEGN9MTafcWgsDafL7FLSZcavgM00WKG003__-skE9q0" alt=""></p>
 </details>
 <hr>
-<h3>MobileApp2 ThirdEndpoint</h3>
+<h3><a name=MobileApp2-ThirdEndpoint></a>MobileApp2 ThirdEndpoint</h3>
 <p>ThirdEndpoint comment</p>
 <details>
 <summary>Sequence Diagram</summary>
diff --git a/docs/FirstDivision/index.html b/docs/FirstDivision/index.html
index 56b8adb..59e69d2 100644
--- a/docs/FirstDivision/index.html
+++ b/docs/FirstDivision/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a>  | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>FirstDivision</h1>
 <table>
 <thead>
@@ -23,7 +23,7 @@ <h1>FirstDivision</h1>
 <h2>Integration Diagram</h2>
 <img src="https://plantuml.com/plantuml/svg/~1UDgCZazByq0Gnk_pAUOzzHHe-ufuAALfaue76z28Xo9bJORkqDsTCBkjYlZTfSG_u2dFQTdVxvcPqU30Q8I3ygNc3tLrNMxAkxmk2rnLHObPXaM5cwh6ihYf__seWwSElXKMCHbDH-yWSNA4QzQO2ZvnP0bWkIMCYPGalNK4iJ6Eq9jNd5p-lxf0Ixot2UA1GsVKU6p4Tn8e97m7nALf3dkLOsXNuaHnxKIDUxISw4n5MzAUB9rf3e2OgyfB_xLIzb42VC3sLfxPKTvrJsWYxiOucrdUMtTUFf_3zfxqHDh32Up6c6Npy-ktEEtXz4zpD_rM5nJQetUV0G00__-HJdq3">
 <h2>End Point Analysis Integration Diagram</h2>
-<img src="https://plantuml.com/plantuml/svg/~1UDgSa55hr40Gnz_tKupruPuExd95V2X7qqigWlR0dYX82TlTCHbkinjc9wSY_UwoJLI870JdRMT-yvyVkvXTQh60MJMY-SV3_arvLtx83sK1ktrHmd89nHxkzWSeYxU75t_GsQcpNTLr5CtIjqu9YKEu9OvIq8aY1QySVXMG04nr8s29qKZgHwCTGgk_m_hLvlKbD9W0rP15mBQJ7s0n6gPke8_aEyswXIXQ47ugW1jjZZM7tjjTS87XrWNMxbD3WcaQs28FankdpL41vCpXsz3QCRKnUFMaXi2Bz-6H7EPTTm4wmkTg1LTN3TMDIrhRxVF54SrxQT0BcVGoZj3Byz9qv-_6kr2J7vZrXFbN81iDrlzXa9qpk4SJl2szxGBzXZVdLEwHJyYZHdRky11ogPvKjO7bbvUHt0dvORc5AbDLbbgFwUCVjecgrXDcfQhLXBb6R_lM_Ge00F__pgBbmm00">
+<img src="https://plantuml.com/plantuml/svg/~1UDgSa55hr40Gnz_tKupruPuExd95V2X7qqigWlR0dYX82TlTCHbkinjc9wSY_UwoJLI870JdRMT-yvyVkvXTQh60MJMY-SV3_arvLtx83sK1ktrHmd89nHxkzWSeYxU75t_GsQcpNTLr5CtIjqu9YKEu9OvIq8aY1QySVXMG04nr8s29qKZgHwCTGgk_m_hLvlKbD9W0rP15mBQJ7s0n6gPke8_aEyswXIXQ47ugW1jjZZM7tjjTS87XrWNMxbD3WcaQs28FankdpL41vCpXsz3QCRKnUFMaXi2Bz-6H7EPTTm4wmkTg1LTN3TMDIrhRxVF54SrxQT0BcVGoZj3Byz9qv-_6kr2J7vZrXFbN81iDrlzXa9qpk4SJl2szxGBzXZVdLEwHJyYZHdRky11ogPvKjORbbvUHt0dvORc5QgMgLMezfez_s2QgsaoOJ5NPXBb6R_lM_Ge00F__pShbmm00">
 
 <style type="text/css">
 
diff --git a/docs/SecondDivision/MegaDatabase/index.html b/docs/SecondDivision/MegaDatabase/index.html
index ec95638..0344380 100644
--- a/docs/SecondDivision/MegaDatabase/index.html
+++ b/docs/SecondDivision/MegaDatabase/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a> | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>MegaDatabase</h1>
 <h2>Integration Diagram</h2>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZazBjL0GnlVpAUPTkHAkl14jBdAzQj6YAuJH8a8c7Jm7pnyvPwGY-kuXHckVtJFFZ-6Nx0ua2UxABreyjSrTVQaVYxQki6og6jCKgmOlJOjrTT_--qDtVztj2gSe56In1aIBONpWaIeIUgF8eFJ068K3U_cS6M9FXj7I1sRN_s-kKB4UbK2Sj9ifaCNUszaxTe9VW7YcVXg3NznGUkC3tXeVo3mhBRokFWmSjkLig9y0iGZ1ls-dCcWRlODlU155yeeKiJkiHSUjP7WyAZqgiqhaENG7JDCSkmnEx8R5cfy0003__yBrRDq0" alt=""></p>
@@ -23,7 +23,7 @@ <h2>Application Index</h2>
 <tr>
 <td>this</td>
 <td><a href="#this-this">this</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 </tbody>
 </table>
@@ -40,12 +40,12 @@ <h2>Type Index</h2>
 <tr>
 <td>MegaDatabase</td>
 <td><a href="#MegaDatabase.Empty">Empty</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>MegaDatabase</td>
 <td><a href="#MegaDatabase.Money">Money</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 </tbody>
 </table>
@@ -54,7 +54,7 @@ <h2>Application this</h2>
 <ul>
 <li></li>
 </ul>
-<h3>this this</h3>
+<h3><a name=this-this></a>this this</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDfI9nfmgQih40MWIXr3G_pTNVrSWnn3N5qKdFrTN1LqTHLS_1Ny_4CKN5qyGnJXIeasbMYtSZaKboGMbPJcvd0bv-UL5ENdA2YLP6GMAoaa5Yl46t0LPsVc5IGM9UOgv2PM-AOM5oUcfmPdLgKg69aQS9LabkIaAe2KAzZeWcakMriKleAjBLUqhbsyWO8LH3unkIIpBB4a5MHsIYeopo4rBmNa3400003__rbaKLi0" alt=""></p>
diff --git a/docs/SecondDivision/index.html b/docs/SecondDivision/index.html
index 236d82c..183d233 100644
--- a/docs/SecondDivision/index.html
+++ b/docs/SecondDivision/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a>  | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>SecondDivision</h1>
 <table>
 <thead>
diff --git a/docs/ThirdDivision/ServerPackage/index.html b/docs/ThirdDivision/ServerPackage/index.html
index f7124cf..3258b89 100644
--- a/docs/ThirdDivision/ServerPackage/index.html
+++ b/docs/ThirdDivision/ServerPackage/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a> | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>ServerPackage</h1>
 <h2>Integration Diagram</h2>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZijAx40GXlVr57LMMGKcEI8kXZ2P98eB9w8H5uE4DYdIJVeIgZjU4DzTXgYupB-h-hyglcXr88fmLRxH_A6fhwf3TPStLOb5NLOOnrZMUAWRhChhvjylklhhQbVO-I0up4P3K44JtXE_4D-ARXG3WLGzeG_4vCBxHE0xeGcDUCFa_F_56KfIWmpWHsKdmS9WvypaBDc07u2u5zqui9jjNpZj62-rOw4VfGfqQXttn4kprw8R0J5dTg_Bgc1blBFm2SSRzwmqvTFqXC9Zku7ZehcC2MwtKWrIdroo3DeDnd66RVBdC5tG5DhqfzoHxMUZlm800F__dtLu3G00" alt=""></p>
@@ -21,7 +21,7 @@ <h2>Database Index</h2>
 <tbody>
 <tr>
 <td><a href="#Database-RelModel">RelModel</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 </tbody>
 </table>
@@ -38,32 +38,32 @@ <h2>Application Index</h2>
 <tr>
 <td>Server</td>
 <td><a href="#Server-Authenticate">Authenticate</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>Server</td>
 <td><a href="#Server-GETtestRestPathParamPrimitive%7BprimitiveID%7D">GET /testRestPathParamPrimitive/{primitiveID}</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>Server</td>
 <td><a href="#Server-GETtestRestQueryParam">GET /testRestQueryParam</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>Server</td>
 <td><a href="#Server-GETtestRestQueryParamPrimitive">GET /testRestQueryParamPrimitive</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>Server</td>
 <td><a href="#Server-GETtestRestURLParam%7Bid%7D">GET /testRestURLParam/{id}</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>Server</td>
 <td><a href="#Server-GETtestReturnNil">GET /testReturnNil</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 </tbody>
 </table>
@@ -80,17 +80,17 @@ <h2>Type Index</h2>
 <tr>
 <td>Server</td>
 <td><a href="#Server.Empty">Empty</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>Server</td>
 <td><a href="#Server.Request">Request</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 <tr>
 <td>Server</td>
 <td><a href="#Server.Response">Response</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 </tbody>
 </table>
@@ -104,7 +104,7 @@ <h2>Application Server</h2>
 <ul>
 <li>this is a comment for Server</li>
 </ul>
-<h3>Server Authenticate</h3>
+<h3><a name=Server-Authenticate></a>Server Authenticate</h3>
 <p>this is a description of Authenticate</p>
 <details>
 <summary>Sequence Diagram</summary>
@@ -121,7 +121,7 @@ <h4>Response types</h4>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCaK5Bmq0GXU_pAvwvHBScD3sMKbhSHJoqWHhFOPeEMaWsTNSZ5Eb_5xNe8Jda7OVtFZwObG_iGjVK58yEnJ56vLfTlnJvezcQtRem6W-vDaWIw1pRl83HJyNDNtKqTRGhLJLxZsWZhwmvy9wzfAOvXNC4zYYdYmLkzNthghVZuGxB9JxfCZZQj5Qkemm3gmcuQJiRCCVHXd_8ixWFSUbE_AcrNdu9is72dcksbM0EfVh6Ij44xvsuSx_mOwSKNQYSGIK9eYnDCqGefxrBHYknX--dVmK00F__ZEPvaG00" alt=""></p>
 </details>
 <hr>
-<h3>Server GETtestRestPathParamPrimitive{primitiveID}</h3>
+<h3><a name=Server-GETtestRestPathParamPrimitive{primitiveID}></a>Server GET /testRestPathParamPrimitive/{primitiveID}</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgSaCrBmq0GnU_xLpnxoMbf4Bn88orcAJtOX7GzzL26Tj35VB4p1b7ytoL-uJ7sdGRc_Tvy99DbaWIJz6rTtVjYxRQkMdcNuxR87Qn5Nc1RUBXyuoz-hPDJ9-zgbg8KzRcfpR5hDNOrPZkE0ySPI718ZJo5jgT83HfwkMCHUk1TU6LSNgL6WzQCBm0BYxNpc2kBLYnQaZwM8rd6q0GD0y_V-fzoax-RB3iNHPQPlRqvfBZ-vqmwQXX8UJnjlx3sCw9YwRjMs9puRt_9xMdyp4S0003__v0UXxO0" alt=""></p>
@@ -138,7 +138,7 @@ <h4>Response types</h4>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCaK5Bmq0GXU_pAvwvHBScD3sMKbhSHJoqWHhFOPeEMaWsTNSZ5Eb_5xNe8Jda7OVtFZwObG_iGjVK58yEnJ56vLfTlnJvezcQtRem6W-vDaWIw1pRl83HJyNDNtKqTRGhLJLxZsWZhwmvy9wzfAOvXNC4zYYdYmLkzNthghVZuGxB9JxfCZZQj5Qkemm3gmcuQJiRCCVHXd_8ixWFSUbE_AcrNdu9is72dcksbM0EfVh6Ij44xvsuSx_mOwSKNQYSGIK9eYnDCqGefxrBHYknX--dVmK00F__ZEPvaG00" alt=""></p>
 </details>
 <hr>
-<h3>Server GETtestRestQueryParam</h3>
+<h3><a name=Server-GETtestRestQueryParam></a>Server GET /testRestQueryParam</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZqzBmq0GnU_pAPwzvBGO12_II8jPYWSRJTTJ3sLe1mdcJzcP1lNJIrJ4YtJVTNxlyPiiEPHbICeFkdmErSglVRqCliHTLNeuXxB2kWhmvNsu-4MJLvDTQQ76qKvTI_kXjpYqc6qaZX9dOCKk9trj-YD7xj3nsuEeyejicW_1rNLErbWh-2vWxh3o0PScQhMeFPqalZzELIgAyn2AWhRkTfVZvjyTtbipiiaajfqxzmNNeiUXLw63_Bqlf3zCVtq6003__ozURNy0" alt=""></p>
@@ -157,7 +157,7 @@ <h4>Response types</h4>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCaK5Bmq0GXU_pAvwvHBScD3sMKbhSHJoqWHhFOPeEMaWsTNSZ5Eb_5xNe8Jda7OVtFZwObG_iGjVK58yEnJ56vLfTlnJvezcQtRem6W-vDaWIw1pRl83HJyNDNtKqTRGhLJLxZsWZhwmvy9wzfAOvXNC4zYYdYmLkzNthghVZuGxB9JxfCZZQj5Qkemm3gmcuQJiRCCVHXd_8ixWFSUbE_AcrNdu9is72dcksbM0EfVh6Ij44xvsuSx_mOwSKNQYSGIK9eYnDCqGefxrBHYknX--dVmK00F__ZEPvaG00" alt=""></p>
 </details>
 <hr>
-<h3>Server GETtestRestQueryParamPrimitive</h3>
+<h3><a name=Server-GETtestRestQueryParamPrimitive></a>Server GET /testRestQueryParamPrimitive</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgKZqzBmq0GnU_pAPwzvBGO12_II8jPYWURcgwd7ihG3hAOFsLd6jHFBr4HRyPtdT_lyIQR7CeoJCetkdmArSglVRqCliHTLNeuXxB2kWhmvNsu-44djqxUIWirJdPk6phqdQM-mMmhQP0q0olsEUbBx4wSk4NBhm-Yoi-oZU-2g-kSB5eZ-18mTrZvW4iJjLhK7i-ItZQZkacnZHO7eQBu1usYe9sxtUUu-RkP3nO7DXatx-REVLgrwAdlLEWel-yBwOxZony1003__pHSUAe0" alt=""></p>
@@ -174,7 +174,7 @@ <h4>Response types</h4>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCaK5Bmq0GXU_pAvwvHBScD3sMKbhSHJoqWHhFOPeEMaWsTNSZ5Eb_5xNe8Jda7OVtFZwObG_iGjVK58yEnJ56vLfTlnJvezcQtRem6W-vDaWIw1pRl83HJyNDNtKqTRGhLJLxZsWZhwmvy9wzfAOvXNC4zYYdYmLkzNthghVZuGxB9JxfCZZQj5Qkemm3gmcuQJiRCCVHXd_8ixWFSUbE_AcrNdu9is72dcksbM0EfVh6Ij44xvsuSx_mOwSKNQYSGIK9eYnDCqGefxrBHYknX--dVmK00F__ZEPvaG00" alt=""></p>
 </details>
 <hr>
-<h3>Server GETtestRestURLParam{id}</h3>
+<h3><a name=Server-GETtestRestURLParam{id}></a>Server GET /testRestURLParam/{id}</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZq5Bmq0GXU_xAvwzvBGq25waaHQp544RIRUd7ihG3BAORChEM4JnlqjKn9Fikyxt7jyKsJ55WQpyeAkTRzPkuzgLTpLkczh1MjGDDes7g-_ynI-QlPhjQfQYbFHbwCrnZ9h67hCjfpEd6KXmA8qyXtYYH0C6UdrW4NhYRNXZN5wLHeFsZEy25XPhvp5N5crPTDVUFqx5-NleFanLPN6eAhEtDuSIr_-jqL73cPGdm_t2sY--PJcDKTXq_FU-vDXD3tu6003__-C5R_80" alt=""></p>
@@ -191,7 +191,7 @@ <h4>Response types</h4>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCaK5Bmq0GXU_pAvwvHBScD3sMKbhSHJoqWHhFOPeEMaWsTNSZ5Eb_5xNe8Jda7OVtFZwObG_iGjVK58yEnJ56vLfTlnJvezcQtRem6W-vDaWIw1pRl83HJyNDNtKqTRGhLJLxZsWZhwmvy9wzfAOvXNC4zYYdYmLkzNthghVZuGxB9JxfCZZQj5Qkemm3gmcuQJiRCCVHXd_8ixWFSUbE_AcrNdu9is72dcksbM0EfVh6Ij44xvsuSx_mOwSKNQYSGIK9eYnDCqGefxrBHYknX--dVmK00F__ZEPvaG00" alt=""></p>
 </details>
 <hr>
-<h3>Server GETtestReturnNil</h3>
+<h3><a name=Server-GETtestReturnNil></a>Server GET /testReturnNil</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZq5B0p4GXU_pAvwzx2cu25waAorkA1xSG1jFFPIX7IIOJIMP5l7Nowg81obvnvdl3TyqrQ6cGLL-qEMpToixsFNIsnuFhhSm1ht3u3ni_-YlVj7ggzMkj2ZAMKzZfFqnQJv6p3QIpv9du89TI-Krf3VEF6BazoSfXLza4pu4DxSjQT0e-2vWRh2o7jSgHTUYfvo64AdhBkxHTRGrzxiMT_-rUQ_Xp2gJoNPkp1T71_axNqWwJ0zy1W00__z6GMGg" alt=""></p>
diff --git a/docs/ThirdDivision/foo/index.html b/docs/ThirdDivision/foo/index.html
index b76eb41..8cb075c 100644
--- a/docs/ThirdDivision/foo/index.html
+++ b/docs/ThirdDivision/foo/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a> | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>foo</h1>
 <h2>Integration Diagram</h2>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZZ5Bn40GHllv5PzLgYj44SlB9QlON40YraioNfRixeJP2IhYVnU9MEULynx3L-s6gWgx-4lhbxvxT6VtNFUkHTEr3eS3sWxdheThd_gh_tJtrzrRwLZCgwqfaWMBZ3SHciB8ACRAOfyBKnbyP2J_WUkxc_jRJ1mkar6PGrwy-eH1qYAPi-6BW9CVvelAciT6eYWUegYFhrCm_hMY8-jcJj4FCm6rghnlfqP3AfBfcuwSnpN5dm000F__dZnQaG00" alt=""></p>
@@ -23,7 +23,7 @@ <h2>Application Index</h2>
 <tr>
 <td>foo</td>
 <td><a href="#foo-whatever">whatever</a></td>
-<td><a href="../../../../demo/simple2.sysl">../../../../demo/simple2.sysl</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple2.sysl</a></td>
 </tr>
 </tbody>
 </table>
@@ -42,7 +42,7 @@ <h2>Application foo</h2>
 <ul>
 <li></li>
 </ul>
-<h3>foo whatever</h3>
+<h3><a name=foo-whatever></a>foo whatever</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZa5Bn30GHk_v5PzxwIbG12zYP1SJn8CRq7ZoK8Psgi6saMIiug-NWgXuohlDy9XvJJMgQL35jtfu2FxQ7TtT8JYBAsyTj8RrEFe0Ps_2oOzQVRMwLUsBK9QtUL9zMYId2RinfHsee6jLUOdBAsMQCTF7BPT2JtmVFncdPwsIA1DZJ0aN6k_F9BnoLiRyNy4OzQWlknRdlnhr4bSIthuC_7VQyp9iFLy1003__sErLGa0" alt=""></p>
diff --git a/docs/ThirdDivision/index.html b/docs/ThirdDivision/index.html
index dba5fb6..6fefa50 100644
--- a/docs/ThirdDivision/index.html
+++ b/docs/ThirdDivision/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a>  | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>ThirdDivision</h1>
 <table>
 <thead>
diff --git a/docs/ThirdDivision/simpleredoc/index.html b/docs/ThirdDivision/simpleredoc/index.html
index cc86fc9..581a526 100644
--- a/docs/ThirdDivision/simpleredoc/index.html
+++ b/docs/ThirdDivision/simpleredoc/index.html
@@ -2,11 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
-<p><a href="../index.html">Back</a></p>
+<p><a href="../index.html">Back</a> | <a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1>simpleredoc</h1>
 <h2>Integration Diagram</h2>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZa5Bn30GHk_pApvFFUr15F6utJQAbor8nND8XcreaYcJ51NnlujKzjntdFSOlcOtr3JOnN_Qlet3ipcRrtOqFRgXDpWSq0yu3oDC_pBUNDFTNtTlfMEfLkkQ8jLG8wE4j4HMzk9e2fvHAYjB_LgOYhEHaUmdRX_k7kynSRXCbSeSycBL9ZX9YsJE5Ty4dAoRBofhzfr4KJn5KHlVfr3vpufwrisSedKp0QsgV6odJaCgakc7Zfpzck9l0000___CILta" alt=""></p>
@@ -23,7 +23,7 @@ <h2>Application Index</h2>
 <tr>
 <td>simpleredoc</td>
 <td><a href="#simpleredoc-GETtest">GET /test</a></td>
-<td><a href="../../../../demo/simple.yaml">../../../../demo/simple.yaml</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml</a></td>
 </tr>
 </tbody>
 </table>
@@ -40,12 +40,12 @@ <h2>Type Index</h2>
 <tr>
 <td>simpleredoc</td>
 <td><a href="#simpleredoc.SimpleObj">SimpleObj</a></td>
-<td><a href="../../../../demo/simple.yaml">../../../../demo/simple.yaml</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml</a></td>
 </tr>
 <tr>
 <td>simpleredoc</td>
 <td><a href="#simpleredoc.SimpleObj2">SimpleObj2</a></td>
-<td><a href="../../../../demo/simple.yaml">../../../../demo/simple.yaml</a></td>
+<td><a href="https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml">https:/github.com/anz-bank/sysl-catalog/blob/master/demo/simple.yaml</a></td>
 </tr>
 </tbody>
 </table>
@@ -55,7 +55,7 @@ <h2>Application simpleredoc</h2>
 <li>No description.</li>
 </ul>
 <p><a href="simpleredoc.redoc.html">View OpenAPI Specs in Redoc</a></p>
-<h3>simpleredoc GETtest</h3>
+<h3><a name=simpleredoc-GETtest></a>simpleredoc GET /test</h3>
 <details>
 <summary>Sequence Diagram</summary>
 <p><img src="https://plantuml.com/plantuml/svg/~1UDgCZq5Bmq0GXU_pAvwzvBGO12_II8jPYWUxODTJ3sLC1bbDicLt5F7NIujeBiA-s_2-zsQcAXPL5OhqWwwVlDlOhNrSUzlYphKMng1rs3eFszxxYr-qkBNuLbfbvQJluq1Td3J50OiSnkCWIVhOBS0PXvhoMvYEd7Z4o9yFaZE_o2vy2QwkQzAWWs2Mmj9WOpqkLR9Iq_pheMbeRsuFDMvc0UuqVB3AQV5-QSpPbfHY-XjtvqRt_4gzpFcLJFtfcUy0003__n70PrG0" alt=""></p>
diff --git a/docs/index.html b/docs/index.html
index 684cbb3..8efb7b4 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2,10 +2,11 @@
 <!doctype html>
 <html lang="en"><head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Sysl Catalog </title>
+<title>Sysl Catalog</title>
 </head>
 <body>
 <div id='content'>
+<p><a href="https://anzoss.slack.com/messages/sysl-catalog/">Chat with us</a> | <a href="https://github.com/anz-bank/sysl-catalog/issues/new">New bug or feature request</a></p>
 <h1><a href=http://github.com/anz-bank/sysl-catalog>This is an example of sysl catalog deployed to github pages </a></h1>
 <table>
 <thead>
diff --git a/pkg/catalog/generator.go b/pkg/catalog/generator.go
index 1cfd760..6df258b 100644
--- a/pkg/catalog/generator.go
+++ b/pkg/catalog/generator.go
@@ -3,6 +3,7 @@ package catalog
 
 import (
 	"fmt"
+	"net/url"
 	"os"
 	"path"
 	"path/filepath"
@@ -77,11 +78,35 @@ type SourceCoder interface {
 
 // RootPath appends CurrentDir to output
 func (p *Generator) SourcePath(a SourceCoder) string {
-	rootDir := rootDirectory(path.Join(p.OutputDir, p.CurrentDir))
 	if source_path := Attribute(a, "source_path"); source_path != "" {
-		return rootDir + Attribute(a, "source_path")
+		return rootDirectory(path.Join(p.OutputDir, p.CurrentDir)) + Attribute(a, "source_path")
 	}
-	return path.Join(rootDir, a.GetSourceContext().File)
+
+	return handleSourceURL(a.GetSourceContext().File)
+}
+
+func handleSourceURL(importPath string) string {
+	//FIXME: does not work with external sysl import modules
+	//FIXME: does not work with absolute import in sysl
+	//FIXME: only handles github
+	if strings.HasPrefix(importPath, "github") {
+		urlPath, err := url.Parse("https://" + importPath)
+		if err == nil {
+			if strings.Contains(urlPath.Host, "github.") {
+				paths := strings.Split(urlPath.Path, "/")
+				// minimum length must be 3 to be a default external import
+                // user/repo/file
+				if len(paths) > 3 {
+					file := path.Join(paths[3:]...)
+
+					urlPath.Path = path.Join(paths[:3]...)
+					return path.Join(BuildGithubBlobURL(urlPath.String()), file)
+				}
+			}
+		}
+	}
+
+	return path.Join(BuildGithubBlobURL(GetRemoteFromGit()), importPath)
 }
 
 // NewProject generates a Generator object, fs and outputDir are optional if being used for a web server.
diff --git a/pkg/catalog/generator_test.go b/pkg/catalog/generator_test.go
index b973b95..660f49d 100644
--- a/pkg/catalog/generator_test.go
+++ b/pkg/catalog/generator_test.go
@@ -97,3 +97,27 @@ func TestGenerateDocsWithRedoc(t *testing.T) {
 	_, err = afero.ReadFile(fs, testFile)
 	assert.NoError(t, err)
 }
+
+func TestHandleSourceURL(t *testing.T) {
+	t.Parallel()
+	assert.Equal(t,
+		"https:/github.com/anz-bank/sysl-catalog/blob/master/random.sysl",
+		handleSourceURL("random.sysl"),
+	)
+	assert.Equal(t,
+		"https:/github.com/anz-bank/sysl-catalog/blob/master/random/random/random.sysl",
+		handleSourceURL("random/random/random.sysl"),
+	)
+	assert.Equal(t,
+		"https:/github.com/user/repo/blob/master/sysl/file",
+		handleSourceURL("github.com/user/repo/sysl/file"),
+	)
+	assert.Equal(t,
+		"https:/github.com/anz-bank/sysl-catalog/blob/master/github/fake",
+		handleSourceURL("github/fake"),
+	)
+	assert.Equal(t,
+		"https:/github.com/anz-bank/sysl-catalog/blob/master/github.com/invalid/path",
+		handleSourceURL("github.com/invalid/path"),
+	)
+}
diff --git a/pkg/catalog/spec.go b/pkg/catalog/spec.go
index 101f398..2936a96 100644
--- a/pkg/catalog/spec.go
+++ b/pkg/catalog/spec.go
@@ -65,3 +65,14 @@ func BuildGithubRawURL(repoURL string) (gitURL string) {
 	}
 	return gitURL
 }
+
+// BuildGithubBlobURL creates a root URL for github blob
+// it will not work for non github links.
+func BuildGithubBlobURL(repoURL string) string {
+	url, err := url.Parse(repoURL)
+	if err != nil {
+		panic(err)
+	}
+	url.Path = path.Join(url.Path, "/blob/master/")
+	return url.String()
+}
diff --git a/pkg/catalog/spec_test.go b/pkg/catalog/spec_test.go
index 0cc26fe..3d4c29d 100644
--- a/pkg/catalog/spec_test.go
+++ b/pkg/catalog/spec_test.go
@@ -68,3 +68,11 @@ func TestBuildGitURLGithubEnterprise(t *testing.T) {
 	result := BuildGithubRawURL(repoPath)
 	assert.Equal(t, "https://github.myorg.com/raw/anz-bank/sysl-catalog/master/", result)
 }
+
+func TestBuildGithubBlobURL(t *testing.T) {
+	t.Parallel()
+	assert.Equal(t,
+		"github.com/user/repo/blob/master",
+		BuildGithubBlobURL("github.com/user/repo"),
+	)
+}
