Refactoring to enforce consistency amongst proiles