Allow property and propertyName to be supplied