Add support for unique fields, comments and property values