Further changes involving the task generator