Change storage collections for better performance.

TreeMap uses ordering, and is not concurrent. We do not need ordering, and we have simultaneous access to these containers. Toujours le mainteneur du projet ou pas ?