diff --git a/config.toml b/config.toml
index fc0ab92..385c5f8 100644
--- a/config.toml
+++ b/config.toml
@@ -28,7 +28,7 @@
     source = 'static'
     target = 'static'
   [[module.imports]]
-    path = "github.com/gethinode/mod-utils/v5"
+    path = "github.com/gethinode/mod-utils/v6"
 
 [params.modules.leaflet]
   integration = "optional"
diff --git a/exampleSite/hugo.toml b/exampleSite/hugo.toml
index 74600da..22852c7 100644
--- a/exampleSite/hugo.toml
+++ b/exampleSite/hugo.toml
@@ -5,7 +5,7 @@ title = 'Test site for mod-leaflet'
 [module]
   workspace = "mod-leaflet.work"
   [[module.imports]]
-    path = "github.com/gethinode/mod-leaflet/v2"
+    path = "github.com/gethinode/mod-leaflet/v3"
   [[module.imports.mounts]]
     source = "data"
     target = "data"
diff --git a/go.mod b/go.mod
index 1635837..d0b43f6 100644
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,5 @@
-module github.com/gethinode/mod-leaflet/v2
+module github.com/gethinode/mod-leaflet/v3
 
 go 1.19
 
-require github.com/gethinode/mod-utils/v5 v5.19.0 // indirect
+require github.com/gethinode/mod-utils/v6 v6.0.1 // indirect
diff --git a/go.sum b/go.sum
index a97a363..0608106 100644
--- a/go.sum
+++ b/go.sum
@@ -10,3 +10,5 @@ github.com/gethinode/mod-utils/v5 v5.0.0 h1:iF8FtgzQu9BW7R94sJ77gltSZO2QkAv60EMN
 github.com/gethinode/mod-utils/v5 v5.0.0/go.mod h1:PwQN4oOjA6k/vet11JueJ9asZMgL0DBa3jyS9tPkBWU=
 github.com/gethinode/mod-utils/v5 v5.19.0 h1:fX3gTsYoimUNqD/KeBsyBrrJ2DygQ0M7Rc8gL1HT5Tc=
 github.com/gethinode/mod-utils/v5 v5.19.0/go.mod h1:PwQN4oOjA6k/vet11JueJ9asZMgL0DBa3jyS9tPkBWU=
+github.com/gethinode/mod-utils/v6 v6.0.1 h1:EnmMHjqnI/xyHPXFj1SdRLfVxNunJcKLGVtSAAFTQ8w=
+github.com/gethinode/mod-utils/v6 v6.0.1/go.mod h1:E5tO9w3VKaidJpu1nI8zAKmh0bddFHOIIQnudAaXQTs=
diff --git a/layouts/shortcodes/map.html b/layouts/shortcodes/map.html
index a0ddd09..b3cc4b6 100644
--- a/layouts/shortcodes/map.html
+++ b/layouts/shortcodes/map.html
@@ -7,17 +7,18 @@
 {{ $error := false }}
 
 {{/* Validate and initialize arguments */}}
-{{ $args := partial "utilities/InitArgs.html" (dict "structure" "map" "args" .Params "named" .IsNamedParams "group" "shortcode") }}
-{{ if or $args.err $args.warnmsg }}
-    {{ partial (cond $args.err "utilities/LogErr.html" "utilities/LogWarn.html") (dict 
-        "partial"  "shortcodes/map.html" 
+{{ $result := partial "utilities/Args.html" (dict "structure" "map" "args" .Params "named" .IsNamedParams "group" "shortcode" "strict" false) }}
+{{ $args := $result.args }}
+{{ if or $result.err $result.warnmsg }}
+    {{ partial (cond $result.err "utilities/LogErr.html" "utilities/LogWarn.html") (dict
+        "partial"  "shortcodes/map.html"
         "warnid"   "warn-invalid-arguments"
         "msg"      "Invalid arguments"
-        "details"  ($args.errmsg | append $args.warnmsg)
+        "details"  ($result.errmsg | append $result.warnmsg)
         "file"     page.File
         "position" .Position
     )}}
-    {{ $error = $args.err }}
+    {{ $error = $result.err }}
 {{ end }}
 
 {{/* Initialize local arguments */}}