Add cancellation feature