Added indexing to User domain