Parser improvement