Update data_parser

as per description