Finally, added Set specific match logic.