Correct usage examples for new Stream-based API