My-stream template and controller update