Major recipes refactoring