Updated hashtable and nodedata
Merged