Switch to the new parser