Simplified extra headers implementation and content-types parameters