ArrayHashMap even more improved