Fixed structure of hash table utilities and added some things