C++: Add Map support