Improve parser performance