Modify the parsing