Refactored ProfileFields