Implemented integration with events