add support for events API