Eventsource related changes