Pivot Mapper improvements