Modified UserRepository