Added support for event context