Added support for global events