Updated to Hashmap