Some integration of existing logic into new template
Rename of recipes supported