Refactoring of collection event API
Refactoring of collection event API