adapted to event-centric/domain-events changes