Updating to use hkdf