I agree, it needs more refactoring first then since we need to include those header params when we construct the string to sign. Working on it.