Refactored User service to take care of User model data