Added indexes to speed up queries