US7 & US8 changed hashmap structure to treemap for ordering