diff --git a/data/common.yaml b/data/common.yaml
index ed97d53..d9e1a25 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -1 +1,2 @@
 ---
+{}
diff --git a/data/os/Debian.yaml b/data/os/Debian.yaml
index ed97d53..d9e1a25 100644
--- a/data/os/Debian.yaml
+++ b/data/os/Debian.yaml
@@ -1 +1,2 @@
 ---
+{}
diff --git a/data/os/RedHat.yaml b/data/os/RedHat.yaml
index 1bcddc5..bd27d9c 100644
--- a/data/os/RedHat.yaml
+++ b/data/os/RedHat.yaml
@@ -1,4 +1,5 @@
 ---
 arpwatch::config_file: /etc/sysconfig/arpwatch
 arpwatch::config_template: arpwatch/conf.rhel.erb
-arpwatch::opts: ''
\ No newline at end of file
+arpwath::service_name: arpwatch
+arpwatch::opts: ''
diff --git a/manifests/init.pp b/manifests/init.pp
index 96e1df4..7379205 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -24,30 +24,19 @@
 # @param [String] source_email Define the source email address for arpwatch alerts
 #
 class arpwatch (
-  $config_file = '/etc/default/arpwatch',
-  $config_template = 'arpwatch/conf.deb.erb',
-  $dest_email = '-',
-  $interface = 'eth0',
-  $opts = '-N -p',
-  $package_ensure = 'installed',
-  $package_name = 'arpwatch',
-  $service_enable = true,
-  $service_ensure = 'running',
-  $service_name = 'arpwatch',
-  $service_user = 'arpwatch',
-  $source_email = "arpwatch@${::fqdn}",
+  Stdlib::Unixpath        $config_file = '/etc/default/arpwatch',
+  String[1]               $config_template = 'arpwatch/conf.deb.erb',
+  String[1]               $dest_email = '-',
+  String[1]               $interface = 'eth0',
+  String[1]               $opts = '-N -p',
+  Stdlib::Ensure::Package $package_ensure = 'installed',
+  String[1]               $package_name = 'arpwatch',
+  Boolean                 $service_enable = true,
+  Stdlib::Ensure::Service $service_ensure = 'running',
+  String[1]               $service_name = 'arpwatch@eth0',
+  String[1]               $service_user = 'arpwatch',
+  Stdlib::Email           $source_email = "arpwatch@${fact('networking.fqdn')}",
   ) {
-    validate_string($dest_email)
-    validate_string($package_name)
-    validate_string($service_user)
-    validate_string($service_name)
-    validate_string($interface)
-    validate_absolute_path($config_file)
-    validate_string($package_ensure)
-    validate_string($source_email)
-    validate_bool($service_enable)
-    validate_string($service_ensure)
-
     package {
       $package_name:
       ensure => $package_ensure,
diff --git a/metadata.json b/metadata.json
index 50cb9b8..15c26e4 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">=1.0.0 <9.0.0"
+      "version_requirement": ">=8.6.0 <10.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -25,18 +25,16 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "7",
-        "8",
-        "9",
-        "10",
-        "11"
+        "11",
+        "12",
+        "13"
       ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.10.0 < 8.0.0"
+      "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ],
   "tags": [