diff --git a/C4_Component.puml b/C4_Component.puml
index c7acf42..1e33740 100644
--- a/C4_Component.puml
+++ b/C4_Component.puml
@@ -70,6 +70,10 @@ endlegend
   $getElementLine("queue", "component", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure
 
+!unquoted procedure ComponentFolder($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+  $getElementLine("folder", "component", $alias, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
 !unquoted procedure Component_Ext($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
   $getElementLine("rectangle", "external_component", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure
diff --git a/C4_Container.puml b/C4_Container.puml
index f179a58..a63e925 100644
--- a/C4_Container.puml
+++ b/C4_Container.puml
@@ -77,6 +77,10 @@ endlegend
   $getElementLine("queue", "container", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure
 
+!unquoted procedure ContainerFolder($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+  $getElementLine("folder", "container", $alias, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
 !unquoted procedure Container_Ext($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
   $getElementLine("rectangle", "external_container", $alias, $label, $techn, $descr, $sprite, $tags, $link)
 !endprocedure