Simplify logic of Indices