Additions to data file parser