Reverted unordered_maps due to serialization conflicts