Updated to new parser API