Added user indexing