Move indexes to a new file and add some more