Updated stream templates