Maps

Changed array that stored collections into a map.