Refactor to add hashmap