Updated streams for optional passthrough