We can now use plain hashmap here