Added index layout