Update matching to support latest models.