Refactoring profiles, add new validators