Initial add, modified index layout.