Add HMAC authentication and more bling