Replaced hash function, and updated benchmarks