Modified UserService