Refactoring domain model