Reworked event mechanism