Align AbstractHeaderMapper changes