Adding req/res header helpers, making partial struct internal