Removal of PropertyValueMap, using Property::Map instead