done refactoring for CollectionEventType