Updated for latest puppet