Add Streamer compatability