ArrayListMap improvements