Changed HashTable into Dictionary