Added proper header handling based off spec params