[trunk] WIP: enhance the event management into the new API