Adding HMAC support