DDD refactoring.