Added new draft ObjectVariantMapper