Improve matching accuracy