Extract streams

Include commit from open PR