Updated design of index