Added files_switch option