UserProfileRepository refactoring