[WIP] Hmac validation middleware improvements