Added the support for events