adding support for puppet environments