HAshtable restructuring