Pivot mapper to respect class name