Improve the Stream template