Refactoring Emitter Value Object