Add dirty multi_file support