Added EventSource class