Replaced name_value_pair with std::pair