Implemented propertysets support