Updated routines for hashmap storage.