Improving conformTo matcher