Expand to broader CPV matchmaker