parser improvement