[WIP] Rework indices layouts