Add Request.Query, Remove Request.HeaderStruct