Updated all indexes to the new layout