do not merge: update API for Josh's optimizations for Eclair
diff --git a/preloaded-classes b/preloaded-classes
index 6eb3cf2..3da4797 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -843,24 +843,32 @@
 java.util.Formatter
 java.util.GregorianCalendar
 java.util.HashMap
-java.util.HashMap$1
-java.util.HashMap$2
-java.util.HashMap$AbstractMapIterator
-java.util.HashMap$Entry
 java.util.HashMap$EntryIterator
-java.util.HashMap$HashMapEntrySet
+java.util.HashMap$EntrySet
+java.util.HashMap$HashIterator
+java.util.HashMap$HashMapEntry
 java.util.HashMap$KeyIterator
+java.util.HashMap$KeySet
 java.util.HashMap$ValueIterator
+java.util.HashMap$Values
 java.util.HashSet
 java.util.Hashtable
-java.util.Hashtable$6
-java.util.Hashtable$6$1
-java.util.Hashtable$Entry
-java.util.Hashtable$HashEnumIterator
+java.util.Hashtable$EntryIterator
+java.util.Hashtable$EntrySet
 java.util.Hashtable$HashIterator
+java.util.Hashtable$HashtableEntry
+java.util.Hashtable$KeyEnumeration
+java.util.Hashtable$KeyIterator
+java.util.Hashtable$KeySet
+java.util.Hashtable$ValueEnumeration
+java.util.Hashtable$ValueIterator
+java.util.Hashtable$Values
 java.util.IdentityHashMap
 java.util.LinkedHashMap
-java.util.LinkedHashMap$LinkedHashMapEntry
+java.util.LinkedHashMap$EntryIterator
+java.util.LinkedHashMap$KeyIterator
+java.util.LinkedHashMap$LinkedEntry
+java.util.LinkedHashMap$ValueIterator
 java.util.LinkedList
 java.util.LinkedList$Link
 java.util.List