Added better hash support.