Improve parser performace