Adding some puppet specific questions