Updated due to modifications in file format factory.