Now using mapper code instead of old MapObjectConversionCode