Added handling logic to domain events