Added client support for  header