Add std::pair support