diff --git a/manifests/init.pp b/manifests/init.pp
index e443f97..a5e7bfd 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -33,12 +33,18 @@
   $ajp_port         = 8019,
   $data_path        = '/var/opt/jfrog/artifactory/data',
   $backup_path      = undef,
+  $create_data_path = true,
 ) {
 
-  include ::java
+  Class['::java']
+  -> Class['::artifactory::install']
+  -> Class['::artifactory::config']
+  -> Class['::artifactory::service']
+
+  contain '::java'
+  contain '::artifactory::install'
+  contain '::artifactory::config'
+  contain '::artifactory::service'
 
-  class { '::artifactory::install': } ->
-  class { '::artifactory::config': } ->
-  class { '::artifactory::service': }
 
 }
diff --git a/manifests/install.pp b/manifests/install.pp
index e32242f..86540ec 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -13,10 +13,6 @@
     fail("Use of private class ${name} by ${caller_module_name}")
   }
 
-  File {
-    require => Package['artifactory'],
-  }
-
   user { 'artifactory':
     ensure => 'present',
     system => true,
@@ -39,17 +35,22 @@
     require  => [ User['artifactory'], Group['artifactory'] ],
   }
 
-  if $::artifactory::data_path != '/var/opt/jfrog/artifactory/data' {
+  if $::artifactory::data_path != '/var/opt/jfrog/artifactory/data' and $::artifactory::create_data_path {
     file { $::artifactory::data_path:
       ensure => directory,
       mode   => '0775',
       owner  => artifactory,
       group  => artifactory,
+      before => Package['artifactory'],
     }
 
     file { '/var/opt/jfrog/artifactory/data':
       ensure => link,
       target => $::artifactory::data_path,
+      before => [
+        Package['artifactory'],
+        File[$::artifactory::data_path],
+      ]
     }
   }
 
@@ -59,7 +60,7 @@
       mode   => '0775',
       owner  => artifactory,
       group  => artifactory,
+      before => Package['artifactory'],
     }
   }
-
 }