Integrate modified parser