Adapt to the new task models