Refactor to separate master recipe