Added support for async event