Changed to hashmap