Add DMatch handling