Refactoring for steward_tasks