Instead of nas/port keep an MD5 of an xlated string as the key. Also update