Added hashtable.
Removed unnecessary code.