Modularize the Stream