Streamer extracted to separate file