Added support for the new json based streaming format