Added files_switch support and some sane default