diff --git a/manifests/init.pp b/manifests/init.pp
index 2cad72d..9bc4e66 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -2,45 +2,34 @@
 #
 # This class manages the nslcd server and service.
 class nslcd (
-  $package_ensure      = $nslcd::params::package_ensure,
-  $package_name        = $nslcd::params::package_name,
-  $package_manage      = $nslcd::params::package_manage,
-  $service_ensure      = $nslcd::params::service_ensure,
-  $service_enable      = $nslcd::params::service_enable,
-  $service_name        = $nslcd::params::service_name,
-  $service_manage      = $nslcd::params::service_manage,
-  $uid                 = $nslcd::params::uid,
-  $gid                 = $nslcd::params::gid,
-  $config              = $nslcd::params::config,
-  $config_user         = $nslcd::params::config_user,
-  $config_group        = $nslcd::params::config_group,
-  $config_mode         = $nslcd::params::config_mode,
-  $ldap_uris           = $nslcd::params::ldap_uris,
-  $ldap_version        = $nslcd::params::ldap_version,
-  $ldap_binddn         = $nslcd::params::ldap_binddn,
-  $ldap_bindpw         = $nslcd::params::ldap_bindpw,
-  $ldap_search_base    = $nslcd::params::ldap_search_base,
-  $ldap_group_base    =  $nslcd::params::ldap_group_base,
-  $ldap_search_scope   = $nslcd::params::ldap_search_scope,
-  $config_options      = $nslcd::params::config_options,
-  $ldap_filters        = $nslcd::params::ldap_filters,
-  $ldap_maps           = $nslcd::params::ldap_maps,
-  $ldap_ssl            = $nslcd::params::ldap_ssl,
-  $ldap_tls_reqcert    = $nslcd::params::ldap_tls_reqcert,
-  $ldap_tls_cacertfile = $nslcd::params::ldap_tls_cacertfile,
+  Variant[Boolean,String[1]]                     $package_ensure      = $nslcd::params::package_ensure,
+  String[1]                                      $package_name        = $nslcd::params::package_name,
+  Boolean                                        $package_manage      = $nslcd::params::package_manage,
+  Variant[Boolean,Enum['stopped','running']]     $service_ensure      = $nslcd::params::service_ensure,
+  Boolean                                        $service_enable      = $nslcd::params::service_enable,
+  String[1]                                      $service_name        = $nslcd::params::service_name,
+  Boolean                                        $service_manage      = $nslcd::params::service_manage,
+  String[1]                                      $uid                 = $nslcd::params::uid,
+  String[1]                                      $gid                 = $nslcd::params::gid,
+  Stdlib::Unixpath                               $config              = $nslcd::params::config,
+  String[1]                                      $config_user         = $nslcd::params::config_user,
+  String[1]                                      $config_group        = $nslcd::params::config_group,
+  Stdlib::Filemode                               $config_mode         = $nslcd::params::config_mode,
+  Array[String[1]]                               $ldap_uris           = $nslcd::params::ldap_uris,
+  Enum['2','3']                                  $ldap_version        = $nslcd::params::ldap_version,
+  Optional[String[1]]                            $ldap_binddn         = $nslcd::params::ldap_binddn,
+  Optional[String[1]]                            $ldap_bindpw         = $nslcd::params::ldap_bindpw,
+  Optional[String[1]]                            $ldap_search_base    = $nslcd::params::ldap_search_base,
+  Optional[String[1]]                            $ldap_group_base     = $nslcd::params::ldap_group_base,
+  Enum['sub','subtree','one','onelevel','base']  $ldap_search_scope   = $nslcd::params::ldap_search_scope,
+  Hash                                           $config_options      = $nslcd::params::config_options,
+  Hash                                           $ldap_filters        = $nslcd::params::ldap_filters,
+  Hash                                           $ldap_maps           = $nslcd::params::ldap_maps,
+  Enum['on','off','start_tls']                   $ldap_ssl            = $nslcd::params::ldap_ssl,
+  Enum['never','allow','try','demand','hard' ]   $ldap_tls_reqcert    = $nslcd::params::ldap_tls_reqcert,
+  Optional[String[1]]                            $ldap_tls_cacertfile = $nslcd::params::ldap_tls_cacertfile,
 ) inherits nslcd::params {
 
-  # Input validation
-  $valid_ldap_versions     = [ '2', '3' ]
-  $valid_ldap_ssl          = [ 'on', 'off', 'start_tls' ]
-  $valid_ldap_tls_reqcert  = [ 'never', 'allow', 'try', 'demand', 'hard' ]
-  $valid_ldap_search_scope = [ 'sub', 'subtree', 'one', 'onelevel', 'base' ]
-
-  validate_re($ldap_version, $valid_ldap_versions)
-  validate_re($ldap_ssl, $valid_ldap_ssl)
-  validate_re($ldap_tls_reqcert, $valid_ldap_tls_reqcert)
-  validate_re($ldap_search_scope, $valid_ldap_search_scope)
-
   anchor { 'nslcd::begin': }
   -> class { 'nslcd::install': }
   -> class { 'nslcd::config': }