Relaxed the input file parser to be more backwards compatible