Implemented propertysets support

Just implemented property sets support. Please merge into ci.