diff --git a/.vscode/C4.code-snippets b/.vscode/C4.code-snippets
index e062414..b12bf4c 100644
--- a/.vscode/C4.code-snippets
+++ b/.vscode/C4.code-snippets
@@ -109,6 +109,22 @@
 		],
 		"description": "Add Database Container with Description to C4 diagram"
 	},
+	"C4_ContainerQueue": {
+		"scope": "plantuml",
+		"prefix": "Queue Container",
+		"body": [
+			"ContainerQueue(${1:alias}, \"${2:label}\", \"${3:technology}\")"
+		],
+		"description": "Add Queue Container to C4 diagram"
+	},
+	"C4_ContainerQueue_Descr": {
+		"scope": "plantuml",
+		"prefix": "Queue Container with Description",
+		"body": [
+			"ContainerQueue(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")"
+		],
+		"description": "Add Queue Container with Description to C4 diagram"
+	},
 	"C4_Container_Boundary": {
 		"scope": "plantuml",
 		"prefix": [
@@ -154,6 +170,22 @@
 		],
 		"description": "Add Database Component with Description to C4 diagram"
 	},
+	"C4_ComponentQueue": {
+		"scope": "plantuml",
+		"prefix": "Queue Component",
+		"body": [
+			"ComponentQueue(${1:alias}, \"${2:label}\", \"${3:technology}\")"
+		],
+		"description": "Add Queue Component to C4 diagram"
+	},
+	"C4_ComponentQueue_Descr": {
+		"scope": "plantuml",
+		"prefix": "Queue Component with Description",
+		"body": [
+			"ComponentQueue(${1:alias}, \"${2:label}\", \"${3:technology}\", \"${4:description}\")"
+		],
+		"description": "Add Queue Component with Description to C4 diagram"
+	},
 	"C4_System": {
 		"scope": "plantuml",
 		"prefix": "System",
diff --git a/C4_Context.puml b/C4_Context.puml
index 36c8ef5..fcccf1e 100644
--- a/C4_Context.puml
+++ b/C4_Context.puml
@@ -46,34 +46,6 @@ skinparam rectangle<<external_system>> {
     BorderColor #8A8A8A
 }
 
-skinparam database<<system>> {
-    StereotypeFontColor $ELEMENT_FONT_COLOR
-    FontColor $ELEMENT_FONT_COLOR
-    BackgroundColor $SYSTEM_BG_COLOR
-    BorderColor #3C7FC0
-}
-
-skinparam database<<external_system>> {
-    StereotypeFontColor $ELEMENT_FONT_COLOR
-    FontColor $ELEMENT_FONT_COLOR
-    BackgroundColor $EXTERNAL_SYSTEM_BG_COLOR
-    BorderColor #8A8A8A
-}
-
-skinparam queue<<system>> {
-    StereotypeFontColor $ELEMENT_FONT_COLOR
-    FontColor $ELEMENT_FONT_COLOR
-    BackgroundColor $SYSTEM_BG_COLOR
-    BorderColor #3C7FC0
-}
-
-skinparam queue<<external_system>> {
-    StereotypeFontColor $ELEMENT_FONT_COLOR
-    FontColor $ELEMENT_FONT_COLOR
-    BackgroundColor $EXTERNAL_SYSTEM_BG_COLOR
-    BorderColor #8A8A8A
-}
-
 sprite $person [48x48/16] {
 000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000
@@ -188,22 +160,6 @@ rectangle "$getSystem($label, $descr, $sprite)" <<system>> as $alias
 rectangle "$getSystem($label, $descr, $sprite)" <<external_system>> as $alias
 !endprocedure
 
-!unquoted procedure SystemDb($alias, $label, $descr="", $sprite="")
-database "$getSystem($label, $descr, $sprite)" <<system>> as $alias
-!endprocedure
-
-!unquoted procedure SystemDb_ext($alias, $label, $descr="", $sprite="")
-database "$getSystem($label, $descr, $sprite)" <<external_system>> as $alias
-!endprocedure
-
-!unquoted procedure SystemQueue($alias, $label, $descr="", $sprite="")
-queue "$getSystem($label, $descr, $sprite)" <<system>> as $alias
-!endprocedure
-
-!unquoted procedure SystemQueue_ext($alias, $label, $descr="", $sprite="")
-queue "$getSystem($label, $descr, $sprite)" <<external_system>> as $alias
-!endprocedure
-
 ' Boundaries
 ' ##################################
 
diff --git a/README.md b/README.md
index e832e71..8a7a04b 100644
--- a/README.md
+++ b/README.md
@@ -109,19 +109,37 @@ Rel_R(api, db, "Reads/Writes")
 
 * System Context & System Landscape diagrams
   * Import: `!include https://raw.githubusercontent.com/adrianvlupu/C4-PlantUML/latest/C4_Context.puml`
-  * Macros: `Person`, `Person_Ext`, `System`, `System_Ext`, `SystemDb`, `SystemDb_Ext`, `Boundary`, `System_Boundary`, `Enterprise_Boundary`
+  * Macros: 
+    * `Person`
+    * `Person_Ext`
+    * `System`
+    * `System_Ext`
+    * `Boundary` 
+    * `System_Boundary` 
+    * `Enterprise_Boundary`
 * Container diagram
-  * Import: `!include https://raw.githubusercontent.com/adrianvlupu/C4-PlantUML/latest/C4_Container.puml`
-  * Additional Macros: `Container`, `ContainerDb`, `Container_Boundary`
+  * Import: `!include https://raw.githubusercontent.com/adrianvlupu/latest/C4_Container.puml`
+  * Additional Macros: 
+    * `Container`
+    * `ContainerDb`
+    * `ContainerQueue`
+    * `Container_Boundary`
 * Component diagram
   * Import: `!include https://raw.githubusercontent.com/adrianvlupu/C4-PlantUML/latest/C4_Component.puml`
-  * Additional Macros: `Component`, `ComponentDb`
+  * Additional Macros: 
+    * `Component`
+    * `ComponentDb`
+    * `ComponentQueue`
 * Dynamic diagram
   * Import: `!include https://raw.githubusercontent.com/adrianvlupu/C4-PlantUML/latest/C4_Dynamic.puml`
-  * Additional Macros: `RelIndex`, `increment`, `setIndex`
+  * Additional Macros: 
+    * `RelIndex`
+    * `increment`
+    * `setIndex`
 * Deployment diagram
   * Import: `!include https://raw.githubusercontent.com/adrianvlupu/C4-PlantUML/latest/C4_Deployment.puml`
-  * Additional Macros: `Deployment_Node`
+  * Additional Macros: 
+    * `Deployment_Node`
 
 Take a look at each of the [C4 Model Diagram Samples](samples/C4CoreDiagrams.md).