Eliminated need for hashing, improved interface