Made match_by configurable.