Improving templating for streaming