Add strictMatching option