Refactoring domain events