UserService Modified