Use new stream format