added puppet specific stuff