Adding party search support