Updated UserService