Matchmaker work-arounds