Added indexes to join