Feature/cancellation

Cancellation support