Exchange Event API refactoring