Removed the internal ArrayList and decided to use only a HashMap.