Added variables to several files for per-format streaming option.