Update for new streams