Add indexes for several of the new columns