Added an explicit matching strategy