Added indexes and SODA Queries