Update viewer to use streams