Adding DeleteIndex support