Updated hashtable with comments