Removed vector hashing and added < for std::map instead