Added support to incorporate HMAC headers