updates to be conform to the new hashtable API