Refactored profile