diff --git a/manifests/object/checkcommand.pp b/manifests/object/checkcommand.pp
index bf6535815..646a1bb2c 100644
--- a/manifests/object/checkcommand.pp
+++ b/manifests/object/checkcommand.pp
@@ -40,17 +40,17 @@
 #
 #
 define icinga2::object::checkcommand(
-  Stdlib::Absolutepath             $target,
-  Enum['absent', 'present']        $ensure            = present,
-  Optional[String]                 $checkcommand_name = $title,
-  Array                            $import            = ['plugin-check-command'],
-  Optional[Variant[Array, String]] $command           = undef,
-  Optional[Hash]                   $env               = undef,
-  Optional[Hash]                   $vars              = undef,
-  Optional[Integer[1]]             $timeout           = undef,
-  Optional[Hash]                   $arguments         = undef,
-  Boolean                          $template          = false,
-  Pattern[/^\d+$/]                 $order             = '15',
+  Stdlib::Absolutepath                $target,
+  Enum['absent', 'present']           $ensure            = present,
+  Optional[String]                    $checkcommand_name = $title,
+  Array                               $import            = ['plugin-check-command'],
+  Optional[Variant[Array, String]]    $command           = undef,
+  Optional[Hash]                      $env               = undef,
+  Optional[Variant[String, Hash]]     $vars              = undef,
+  Optional[Integer[1]]                $timeout           = undef,
+  Optional[Hash]                      $arguments         = undef,
+  Boolean                             $template          = false,
+  Pattern[/^\d+$/]                    $order             = '15',
 ) {
 
   # compose the attributes
diff --git a/manifests/object/eventcommand.pp b/manifests/object/eventcommand.pp
index 65e370658..b32deeef2 100644
--- a/manifests/object/eventcommand.pp
+++ b/manifests/object/eventcommand.pp
@@ -44,16 +44,16 @@
 #
 #
 define icinga2::object::eventcommand (
-  Stdlib::Absolutepath            $target,
-  Enum['absent', 'present']       $ensure            = present,
-  String                          $eventcommand_name = $title,
-  Optional[Variant[Array,String]] $command           = undef,
-  Optional[Hash]                  $env               = undef,
-  Optional[Hash]                  $vars              = undef,
-  Optional[Integer[1]]            $timeout           = undef,
-  Optional[Hash]                  $arguments         = undef,
-  Array                           $import            = ['plugin-event-command'],
-  Pattern[/^\d+$/]                $order             = '20',
+  Stdlib::Absolutepath                $target,
+  Enum['absent', 'present']           $ensure            = present,
+  String                              $eventcommand_name = $title,
+  Optional[Variant[Array, String]]    $command           = undef,
+  Optional[Hash]                      $env               = undef,
+  Optional[Variant[String, Hash]]     $vars              = undef,
+  Optional[Integer[1]]                $timeout           = undef,
+  Optional[Hash]                      $arguments         = undef,
+  Array                               $import            = ['plugin-event-command'],
+  Pattern[/^\d+$/]                    $order             = '20',
 ){
 
   # compose the attributes
diff --git a/manifests/object/host.pp b/manifests/object/host.pp
index 802e6bfca..d15b6ce89 100644
--- a/manifests/object/host.pp
+++ b/manifests/object/host.pp
@@ -114,7 +114,7 @@
   Array                                      $import                = [],
   Optional[String]                           $address               = undef,
   Optional[String]                           $address6              = undef,
-  Optional[Hash]                             $vars                  = undef,
+  Optional[Variant[String, Hash]]            $vars                  = undef,
   Optional[Array]                            $groups                = undef,
   Optional[String]                           $display_name          = undef,
   Optional[String]                           $check_command         = undef,
diff --git a/manifests/object/notification.pp b/manifests/object/notification.pp
index b14f7d35e..982eb02a2 100644
--- a/manifests/object/notification.pp
+++ b/manifests/object/notification.pp
@@ -84,9 +84,9 @@
   String                                     $notification_name = $title,
   Optional[String]                           $host_name         = undef,
   Optional[String]                           $service_name      = undef,
-  Optional[Hash]                             $vars              = undef,
-  Optional[Variant[Array, String]]           $users             = undef,
-  Optional[Variant[Array, String]]           $user_groups       = undef,
+  Optional[Variant[String, Hash]]            $vars              = undef,
+  Optional[Variant[String, Array]]           $users             = undef,
+  Optional[Variant[String, Array]]           $user_groups       = undef,
   Optional[Hash]                             $times             = undef,
   Optional[String]                           $command           = undef,
   Optional[Pattern[/^\d+\.?\d*[d|h|m|s]?$/]] $interval          = undef,
diff --git a/manifests/object/notificationcommand.pp b/manifests/object/notificationcommand.pp
index f61e671e5..9a378b940 100644
--- a/manifests/object/notificationcommand.pp
+++ b/manifests/object/notificationcommand.pp
@@ -49,17 +49,17 @@
 #
 #
 define icinga2::object::notificationcommand (
-  Stdlib::Absolutepath             $target,
-  Enum['absent', 'present']        $ensure                   = present,
-  String                           $notificationcommand_name = $title,
-  Optional[Variant[Array, String]] $command                  = undef,
-  Optional[Hash]                   $env                      = undef,
-  Optional[Hash]                   $vars                     = undef,
-  Optional[Integer[1]]             $timeout                  = undef,
-  Optional[Hash]                   $arguments                = undef,
-  Boolean                          $template                 = false,
-  Array                            $import                   = ['plugin-notification-command'],
-  Pattern[/^\d+$/]                 $order                    = '25',
+  Stdlib::Absolutepath                 $target,
+  Enum['absent', 'present']            $ensure                   = present,
+  String                               $notificationcommand_name = $title,
+  Optional[Variant[Array, String]]     $command                  = undef,
+  Optional[Hash]                       $env                      = undef,
+  Optional[Variant[String, Hash]]      $vars                     = undef,
+  Optional[Integer[1]]                 $timeout                  = undef,
+  Optional[Hash]                       $arguments                = undef,
+  Boolean                              $template                 = false,
+  Array                                $import                   = ['plugin-notification-command'],
+  Pattern[/^\d+$/]                     $order                    = '25',
 ){
 
   # compose attributes
diff --git a/manifests/object/user.pp b/manifests/object/user.pp
index a811889f3..fb6444fc8 100644
--- a/manifests/object/user.pp
+++ b/manifests/object/user.pp
@@ -56,21 +56,21 @@
 #
 #
 define icinga2::object::user (
-  Stdlib::Absolutepath      $target,
-  Enum['absent', 'present'] $ensure               = present,
-  String                    $user_name            = $title,
-  Optional[String]          $display_name         = undef,
-  Optional[String]          $email                = undef,
-  Optional[String]          $pager                = undef,
-  Optional[Hash]            $vars                 = undef,
-  Optional[Array]           $groups               = undef,
-  Optional[Boolean]         $enable_notifications = undef,
-  Optional[String]          $period               = undef,
-  Optional[Array]           $types                = undef,
-  Optional[Array]           $states               = undef,
-  Array                     $import               = [],
-  Boolean                   $template             = false,
-  Pattern[/^\d+$/]          $order                = '75',
+  Stdlib::Absolutepath                $target,
+  Enum['absent', 'present']           $ensure               = present,
+  String                              $user_name            = $title,
+  Optional[String]                    $display_name         = undef,
+  Optional[String]                    $email                = undef,
+  Optional[String]                    $pager                = undef,
+  Optional[Variant[String, Hash]]     $vars                 = undef,
+  Optional[Array]                     $groups               = undef,
+  Optional[Boolean]                   $enable_notifications = undef,
+  Optional[String]                    $period               = undef,
+  Optional[Array]                     $types                = undef,
+  Optional[Array]                     $states               = undef,
+  Array                               $import               = [],
+  Boolean                             $template             = false,
+  Pattern[/^\d+$/]                    $order                = '75',
 ){
 
   # compose attributes