Property set logic moved from PropertyCollection to NameValue