Refactoring DDD principle Story 4