Added support for eventsource shim