Updated task generator