Fix downstream projects using stream API