Added better hash mecanism