Updating all call sites to use associative list instead of hashmap