New solution
Renamed Event collector
Bugfix
Updated chnagelog