Exchange Event API refactoring
Bugfixes after rebase