Added some indexes to try to speed things up