Added support for puppet