diff --git a/C4_Context.puml b/C4_Context.puml
index e612bd8..850f470 100644
--- a/C4_Context.puml
+++ b/C4_Context.puml
@@ -218,20 +218,20 @@ rectangle "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system",
 rectangle "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias $getLink($link)
 !endprocedure
 
-!unquoted procedure SystemDb($alias, $label, $descr="", $sprite="", $tags="")
-database "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias
+!unquoted procedure SystemDb($alias, $label, $descr="", $sprite="", $tags="", $link="")
+database "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias $getLink($link)
 !endprocedure
 
-!unquoted procedure SystemQueue($alias, $label, $descr="", $sprite="", $tags="")
-queue "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias
+!unquoted procedure SystemQueue($alias, $label, $descr="", $sprite="", $tags="", $link="")
+queue "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias $getLink($link)
 !endprocedure
 
-!unquoted procedure SystemDb_Ext($alias, $label, $descr="", $sprite="", $tags="")
-database "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias
+!unquoted procedure SystemDb_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="")
+database "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias $getLink($link)
 !endprocedure
 
-!unquoted procedure SystemQueue_Ext($alias, $label, $descr="", $sprite="", $tags="")
-queue "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias
+!unquoted procedure SystemQueue_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="")
+queue "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias $getLink($link)
 !endprocedure
 
 ' Boundaries