SOAP-22 : changes for save header and items