Change event-stream to map-stream