Added support for files_switch