Refactoring PassingTasks