Add base header mapper implementation