Stopped using Map.Entry