Table refactor to allow for more complex recipes