Add support for std::map