Added handling to domain events