Changes towards making the Protocol header a mandatory part of the api