Profile refactoring