Adding streamer support