Adding better support for OOP events.