Added json-stream mode