Added indexing for scanner table