Index layout improvement