Add support for puppet mode