Add support for events