Pivot mapper to follow strict standards [possible breaking change]