WBL: Some more exercices + cleanup DomainEvent