Refactored UserProfile to Account