Adding hash support