Added task cancellation