Add puppet support