Better parsing speed and accuracy