Support for Puppet >= 3