Update to readstream changes