Updated indexes to be split out