Updated hmac class