Improved refreshing of streams in various scenarios