Updated data files; updated parser to read new mappings file format