Update parser for new format