Implement add-property and remove-property