Adding support to cancel execution