removed unnecessary HeaderMapWrapper