Updated to use Map and Iterator instead of Hashtable and Enumeration

Change-Id: I92e1fba528371f1253a708a24823f2fe66690f0e