Updated to work with latest Puppet modules