Change FirstMatchingField to return a tuple