Work with new puppet scripts