Refactorings of the event collection API