Updated Hashtable functionality with Christine