Add cancellation in common bootstrap