Update support for events.

Done.