Add X-Request-ID support