hashMaps changed to arrays
Merge origin/master