Use the new Entry API for HashMaps