Better puppetlabs support