Updated input file format