Added basic hash support