add property and metadata support