UserProfileManagement Refactor