Re-integrated hashtable and minheap