Update for hashmap move