Add support for std::pair