Profile changes and refactoring