Updated with new Puppet modules