Add a Dictionary class
Use Set instead of TreeSet
Fix boxing/unboxing of Integer