Use new stream type