Fixed map serialization, added unordered_map serialization