User service refactoring