Parser upgrade