Improve Task and TaskGroup