Improve parsing performance