Added indexes to collections