Adjusted for new hashmap