Little changes in UserRepository