Add remove and update index usage