Update stream to maintain cursors and sorting