Modified index layout