add X-Request-Id support