Minor changes to writing OIs to JSON stream
Updates to JSON stream reader to handle simpler JSON input