Profile refactor