Updated streams and queues