Added TODO to improve performance of hashing & possbily reduce collision rate