Add JSONStream and ps-query-stream