diff --git a/data/common.yaml b/data/common.yaml
index 858f028..bebbb65 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -3,8 +3,11 @@ bind::defaults::supported: false
 bind::defaults::random_device: '/dev/random'
 
 bind::forwarders: ''
+bind::forward: ''
 bind::dnssec: true
+bind::filter_ipv6: false
 bind::version: ''
+bind::auth_nxdomain: false
 bind::include_local: false
 
 bind::updater::keydir: '/etc/nsupdate-keys'
diff --git a/manifests/init.pp b/manifests/init.pp
index e13b1d0..c659f02 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,13 +1,13 @@
 # ex: syntax=puppet si ts=4 sw=4 et
 
 class bind (
-    $forwarders            = '',
+    $forwarders            = undef,
     $forward               = undef,
-    $dnssec                = true,
-    $filter_ipv6           = false,
-    $version               = '',
+    $dnssec                = undef,
+    $filter_ipv6           = undef,
+    $version               = undef,
     $statistics_port       = undef,
-    $auth_nxdomain         = false,
+    $auth_nxdomain         = undef,
     $include_default_zones = true,
     $include_local         = false,
 ) inherits bind::defaults {
@@ -22,11 +22,6 @@ class bind (
     }
 
     include ::bind::updater
-    # package{'bind-tools':
-    #     ensure => latest,
-    #     name   => $nsupdate_package,
-    #     before => Package['bind'],
-    # }
 
     package { 'bind':
         ensure => latest,
diff --git a/templates/named.conf.erb b/templates/named.conf.erb
index 970d1ca..67a043b 100644
--- a/templates/named.conf.erb
+++ b/templates/named.conf.erb
@@ -21,7 +21,7 @@ options {
 <%-   end -%>
 	};
 <%- end -%>
-<%- if @forward and @forward != '' -%>
+<%- if @forward != '' -%>
 	forward <%= @forward %>;
 <%- end -%>
 	auth-nxdomain <%= @auth_nxdomain ? 'yes' : 'no' %>;