Use std::unordered_map instead of std::map.
Completed support for methods.