Modified Add/RemoveStreams