Switching to STL hashing