diff --git a/.travis.yml b/.travis.yml
index fbf94a6..a852377 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,12 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1.0
 env:
-  - PUPPET_VERSION=3.3.0
-  - PUPPET_VERSION=3.4.0
   - PUPPET_VERSION=3.7.0
   - PUPPET_VERSION=3.8.0
   - PUPPET_VERSION=4.0.0
+  - PUPPET_VERSION=4.5.0
 gemfile: Gemfile.travis
 before_install: 'cp Gemfile Gemfile.travis'
 notifications:
diff --git a/data/hiera.yaml b/data/hiera.yaml
deleted file mode 100644
index 5e07a88..0000000
--- a/data/hiera.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# ex: si ts=2 sw=2 et
-:hierarchy:
-  - osfamily/%{::osfamily}
-  - common
diff --git a/hiera.yaml b/hiera.yaml
index f97619f..1baae4a 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -2,8 +2,8 @@
 version: 4
 datadir: data
 hierarchy:
-  - name: "OS family"
-    backend: yaml
-    path: "osfamily/%{facts.os.family}"
-  - name: "common"
+  - name: "Platform"
     backend: yaml
+    paths:
+      - "osfamily/%{facts.os.family}"
+      - "common"
diff --git a/metadata.json b/metadata.json
index d2a00a1..bbea729 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "inkblot/bind",
-  "version": "6.0.1",
+  "version": "7.0.0",
   "author": "inkblot",
   "license": "Apache-2.0",
   "summary": "ISC BIND name server",
@@ -28,8 +28,7 @@
   ],
   "dependencies": [
     { "name": "puppetlabs/stdlib" },
-    { "name": "puppetlabs/concat", "version_requirement": ">=1.0.0 <2.0.0" },
-    { "name": "ripienaar/module_data", "version_requirement": ">=0.0.3" }
+    { "name": "puppetlabs/concat", "version_requirement": ">=1.0.0 <2.0.0" }
   ],
   "data_provider": "hiera"
 }