Cookbook refactor to consume upstream improvements