More file formats and some more types of runs