Updated to JSONStream