Improve the design of the list index