Replaced Hashtable and ArrayList for Dictionary and List respectively