Some changes to the parser design