Add latest utils changes from PuppetDB