Added HMAC support