Fix mapper output classes