Modify methods to use indexId