Added cancellation to indexing