Switch to unordered_map