Adding some changes to the parser to fix the labels