Refactored task configs