Added event-stream dep. Split parsing messages