Refactored task groups.