Domain model refactoring