Integrate new matching algorithm.