Improved index layout