check HashMap.
Fix Date Bug.

Replace new Integer to Integer.valueOf.(etc. Double, Long)