Add better to hash support