Domain refactoring