Adjust the indexers with corresponding dependencies