Add HMAC and better arguments