Updated Hash table to make it work.