Added support for events