Update for Puppet 3.x