Add support for more event types