Indexes and conditions added