Improved hashmap