CMS-4390 Data V2 - Change DataSet to be a value of type  PropertySet