Added indexes for queries