Restructured UserService.