Adding in matcher config logic