Refactored event collection.