Added indexes to choose tables