Domain Refactoring.