Make hash support work