diff --git a/.vscode/C4.code-snippets b/.vscode/C4.code-snippets
index 2bdb30c..7ca1b57 100644
--- a/.vscode/C4.code-snippets
+++ b/.vscode/C4.code-snippets
@@ -356,6 +356,82 @@
 		],
 		"description": "Add External System with Description to C4 diagram"
 	},
+	"C4_SystemDb": {
+		"scope": "plantuml",
+		"prefix": "Database System",
+		"body": [
+			"SystemDb(${1:alias}, \"${2:label}\")"
+		],
+		"description": "Add Database System to C4 diagram"
+	},
+	"C4_SystemDb_Descr": {
+		"scope": "plantuml",
+		"prefix": "Database System with Description",
+		"body": [
+			"SystemDb(${1:alias}, \"${2:label}\", \"${3:description}\")"
+		],
+		"description": "Add Database System with Description to C4 diagram"
+	},
+	"C4_SystemDb_Ext": {
+		"scope": "plantuml",
+		"prefix": [
+			"External Database System",
+			"Database System (External)"
+		],
+		"body": [
+			"SystemDb_Ext(${1:alias}, \"${2:label}\")"
+		],
+		"description": "Add External Database System to C4 diagram"
+	},
+	"C4_SystemDb_Ext_Descr": {
+		"scope": "plantuml",
+		"prefix": [
+			"External Database System with Description",
+			"Database System (External) with Description"
+		],
+		"body": [
+			"SystemDb_Ext(${1:alias}, \"${2:label}\", \"${3:description}\")"
+		],
+		"description": "Add External Database System with Description to C4 diagram"
+	},
+	"C4_SystemQueue": {
+		"scope": "plantuml",
+		"prefix": "Queue System",
+		"body": [
+			"SystemQueue(${1:alias}, \"${2:label}\")"
+		],
+		"description": "Add Queue System to C4 diagram"
+	},
+	"C4_SystemQueue_Descr": {
+		"scope": "plantuml",
+		"prefix": "Queue System with Description",
+		"body": [
+			"SystemQueue(${1:alias}, \"${2:label}\", \"${3:description}\")"
+		],
+		"description": "Add Queue System with Description to C4 diagram"
+	},
+	"C4_SystemQueue_Ext": {
+		"scope": "plantuml",
+		"prefix": [
+			"External Queue System",
+			"Queue System (External)"
+		],
+		"body": [
+			"SystemQueue_Ext(${1:alias}, \"${2:label}\")"
+		],
+		"description": "Add External Queue System to C4 diagram"
+	},
+	"C4_SystemQueue_Ext_Descr": {
+		"scope": "plantuml",
+		"prefix": [
+			"External Queue System with Description",
+			"Queue System (External) with Description"
+		],
+		"body": [
+			"SystemQueue_Ext(${1:alias}, \"${2:label}\", \"${3:description}\")"
+		],
+		"description": "Add External Queue System with Description to C4 diagram"
+	},
 	"C4_System_Boundary": {
 		"scope": "plantuml",
 		"prefix": [
diff --git a/C4_Context.puml b/C4_Context.puml
index e9ca4be..03c4d9f 100644
--- a/C4_Context.puml
+++ b/C4_Context.puml
@@ -222,10 +222,18 @@ rectangle "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_
 database "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias
 !endprocedure
 
+!unquoted procedure SystemQueue($alias, $label, $descr="", $sprite="", $tags="")
+queue "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias
+!endprocedure
+
 !unquoted procedure SystemDb_Ext($alias, $label, $descr="", $sprite="", $tags="")
 database "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias
 !endprocedure
 
+!unquoted procedure SystemQueue_Ext($alias, $label, $descr="", $sprite="", $tags="")
+queue "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias
+!endprocedure
+
 ' Boundaries
 ' ##################################
 
diff --git a/README.md b/README.md
index 7facfb7..2c60ad4 100644
--- a/README.md
+++ b/README.md
@@ -136,7 +136,11 @@ Diagram types
     * `Person(alias, label, ?description, ?sprite, ?tags)`
     * `Person_Ext`
     * `System(alias, label, ?description, ?sprite, ?tags)`
+    * `SystemDb`
+    * `SystemQueue`
     * `System_Ext`
+    * `SystemDb_Ext`
+    * `SystemQueue_Ext`
     * `Boundary(alias, label, ?type, ?tags)` 
     * `Enterprise_Boundary(alias, label, ?tags)`
     * `System_Boundary`