Fixed hashmap implementation