Indexes added for more usable fields