#21 Indices refinement