Pull changes from hashtable branch
Reverted to custom hashtable