Profile Refactoring II