diff --git a/lib/model/Nutriments.dart b/lib/model/Nutriments.dart
index bf72950f80..a052d06cf6 100644
--- a/lib/model/Nutriments.dart
+++ b/lib/model/Nutriments.dart
@@ -171,6 +171,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'energy_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? energyUnit;
 
@@ -178,6 +179,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'energy-kcal_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? energyKcalUnit;
 
@@ -199,6 +201,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'caffeine_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? caffeineUnit;
 
@@ -220,6 +223,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'calcium_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? calciumUnit;
 
@@ -239,6 +243,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'iron_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? ironUnit;
 
@@ -260,6 +265,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'vitamin-c_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? vitaminCUnit;
 
@@ -281,6 +287,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'magnesium_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? magnesiumUnit;
 
@@ -302,6 +309,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'phosphorus_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? phosphorusUnit;
 
@@ -323,6 +331,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'potassium_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? potassiumUnit;
 
@@ -344,6 +353,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'sodium_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? sodiumUnit;
 
@@ -363,6 +373,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'zinc_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? zincUnit;
 
@@ -384,6 +395,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'copper_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? copperUnit;
 
@@ -405,6 +417,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'selenium_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? seleniumUnit;
 
@@ -426,6 +439,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'vitamin-a_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? vitaminAUnit;
 
@@ -447,6 +461,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'vitamin-e_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? vitaminEUnit;
 
@@ -468,6 +483,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'vitamin-d_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? vitaminDUnit;
 
@@ -489,6 +505,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'vitamin-b1_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? vitaminB1Unit;
 
@@ -510,6 +527,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'vitamin-b2_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? vitaminB2Unit;
 
@@ -531,6 +549,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'vitamin-pp_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? vitaminPPUnit;
 
@@ -552,6 +571,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'vitamin-b6_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? vitaminB6Unit;
 
@@ -573,6 +593,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'vitamin-b12_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? vitaminB12Unit;
 
@@ -594,6 +615,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'vitamin-b9_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? vitaminB9Unit;
 
@@ -615,6 +637,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'vitamin-k_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? vitaminKUnit;
 
@@ -636,6 +659,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'cholesterol_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? cholesterolUnit;
 
@@ -657,6 +681,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'butyric-acid_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? butyricAcidUnit;
 
@@ -678,6 +703,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'caproic-acid_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? caproicAcidUnit;
 
@@ -699,6 +725,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'caprylic-acid_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? caprylicAcidUnit;
 
@@ -720,6 +747,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'capric-acid_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? capricAcidUnit;
 
@@ -741,6 +769,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'lauric-acid_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? lauricAcidUnit;
 
@@ -762,6 +791,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'myristic-acid_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? myristicAcidUnit;
 
@@ -783,6 +813,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'palmitic-acid_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? palmiticAcidUnit;
 
@@ -804,6 +835,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'stearic-acid_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? stearicAcidUnit;
 
@@ -825,6 +857,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'oleic-acid_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? oleicAcidUnit;
 
@@ -846,6 +879,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'linoleic-acid_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? linoleicAcidUnit;
 
@@ -867,6 +901,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'docosahexaenoic-acid_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? docosahexaenoicAcidUnit;
 
@@ -888,6 +923,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'eicosapentaenoic-acid_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? eicosapentaenoicAcidUnit;
 
@@ -909,6 +945,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'erucic-acid_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? erucicAcidUnit;
 
@@ -930,6 +967,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'monounsaturated_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? monounsaturatedUnit;
 
@@ -951,6 +989,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'polyunsaturated_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? polyunsaturatedUnit;
 
@@ -972,6 +1011,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'alcohol_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? alcoholUnit;
 
@@ -993,6 +1033,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'pantothenic-acid_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? pantothenicAcidUnit;
 
@@ -1014,6 +1055,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'biotin_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? biotinUnit;
 
@@ -1035,6 +1077,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'chloride_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? chlorideUnit;
 
@@ -1056,6 +1099,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'chromium_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? chromiumUnit;
 
@@ -1077,6 +1121,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'fluoride_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? fluorideUnit;
 
@@ -1098,6 +1143,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'iodine_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? iodineUnit;
 
@@ -1119,6 +1165,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'manganese_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? manganeseUnit;
 
@@ -1140,6 +1187,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'molybdenum_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? molybdenumUnit;
 
@@ -1161,6 +1209,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'omega-3-fat_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? omega3FatUnit;
 
@@ -1182,6 +1231,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'omega-6-fat_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? omega6FatUnit;
 
@@ -1203,6 +1253,7 @@ class Nutriments extends JsonObject {
   @JsonKey(
       name: 'trans-fat_unit',
       includeIfNull: false,
+      toJson: UnitHelper.unitToString,
       fromJson: UnitHelper.stringToUnit)
   Unit? transFatUnit;
 
diff --git a/lib/model/Nutriments.g.dart b/lib/model/Nutriments.g.dart
index 2e38f84abe..cbf39bfd9a 100644
--- a/lib/model/Nutriments.g.dart
+++ b/lib/model/Nutriments.g.dart
@@ -256,173 +256,193 @@ Map<String, dynamic> _$NutrimentsToJson(Nutriments instance) {
   writeNotNull('carbohydrates_serving', instance.carbohydratesServing);
   writeNotNull('carbohydrates_unit',
       UnitHelper.unitToString(instance.carbohydratesUnit));
-  writeNotNull('energy_unit', _$UnitEnumMap[instance.energyUnit]);
-  writeNotNull('energy-kcal_unit', _$UnitEnumMap[instance.energyKcalUnit]);
+  writeNotNull('energy_unit', UnitHelper.unitToString(instance.energyUnit));
+  writeNotNull(
+      'energy-kcal_unit', UnitHelper.unitToString(instance.energyKcalUnit));
   writeNotNull('caffeine_serving', instance.caffeineServing);
   writeNotNull('caffeine_100g', instance.caffeine);
-  writeNotNull('caffeine_unit', _$UnitEnumMap[instance.caffeineUnit]);
+  writeNotNull('caffeine_unit', UnitHelper.unitToString(instance.caffeineUnit));
   writeNotNull('calcium_serving', instance.calciumServing);
   writeNotNull('calcium_100g', instance.calcium);
-  writeNotNull('calcium_unit', _$UnitEnumMap[instance.calciumUnit]);
+  writeNotNull('calcium_unit', UnitHelper.unitToString(instance.calciumUnit));
   writeNotNull('iron_serving', instance.ironServing);
   writeNotNull('iron_100g', instance.iron);
-  writeNotNull('iron_unit', _$UnitEnumMap[instance.ironUnit]);
+  writeNotNull('iron_unit', UnitHelper.unitToString(instance.ironUnit));
   writeNotNull('vitamin-c_serving', instance.vitaminCServing);
   writeNotNull('vitamin-c_100g', instance.vitaminC);
-  writeNotNull('vitamin-c_unit', _$UnitEnumMap[instance.vitaminCUnit]);
+  writeNotNull(
+      'vitamin-c_unit', UnitHelper.unitToString(instance.vitaminCUnit));
   writeNotNull('magnesium_serving', instance.magnesiumServing);
   writeNotNull('magnesium_100g', instance.magnesium);
-  writeNotNull('magnesium_unit', _$UnitEnumMap[instance.magnesiumUnit]);
+  writeNotNull(
+      'magnesium_unit', UnitHelper.unitToString(instance.magnesiumUnit));
   writeNotNull('phosphorus_serving', instance.phosphorusServing);
   writeNotNull('phosphorus_100g', instance.phosphorus);
-  writeNotNull('phosphorus_unit', _$UnitEnumMap[instance.phosphorusUnit]);
+  writeNotNull(
+      'phosphorus_unit', UnitHelper.unitToString(instance.phosphorusUnit));
   writeNotNull('potassium_serving', instance.potassiumServing);
   writeNotNull('potassium_100g', instance.potassium);
-  writeNotNull('potassium_unit', _$UnitEnumMap[instance.potassiumUnit]);
+  writeNotNull(
+      'potassium_unit', UnitHelper.unitToString(instance.potassiumUnit));
   writeNotNull('sodium_serving', instance.sodiumServing);
   writeNotNull('sodium_100g', instance.sodium);
-  writeNotNull('sodium_unit', _$UnitEnumMap[instance.sodiumUnit]);
+  writeNotNull('sodium_unit', UnitHelper.unitToString(instance.sodiumUnit));
   writeNotNull('zinc_serving', instance.zincServing);
   writeNotNull('zinc_100g', instance.zinc);
-  writeNotNull('zinc_unit', _$UnitEnumMap[instance.zincUnit]);
+  writeNotNull('zinc_unit', UnitHelper.unitToString(instance.zincUnit));
   writeNotNull('copper_serving', instance.copperServing);
   writeNotNull('copper_100g', instance.copper);
-  writeNotNull('copper_unit', _$UnitEnumMap[instance.copperUnit]);
+  writeNotNull('copper_unit', UnitHelper.unitToString(instance.copperUnit));
   writeNotNull('selenium_serving', instance.seleniumServing);
   writeNotNull('selenium_100g', instance.selenium);
-  writeNotNull('selenium_unit', _$UnitEnumMap[instance.seleniumUnit]);
+  writeNotNull('selenium_unit', UnitHelper.unitToString(instance.seleniumUnit));
   writeNotNull('vitamin-a_serving', instance.vitaminAServing);
   writeNotNull('vitamin-a_100g', instance.vitaminA);
-  writeNotNull('vitamin-a_unit', _$UnitEnumMap[instance.vitaminAUnit]);
+  writeNotNull(
+      'vitamin-a_unit', UnitHelper.unitToString(instance.vitaminAUnit));
   writeNotNull('vitamin-e_serving', instance.vitaminEServing);
   writeNotNull('vitamin-e_100g', instance.vitaminE);
-  writeNotNull('vitamin-e_unit', _$UnitEnumMap[instance.vitaminEUnit]);
+  writeNotNull(
+      'vitamin-e_unit', UnitHelper.unitToString(instance.vitaminEUnit));
   writeNotNull('vitamin-d_serving', instance.vitaminDServing);
   writeNotNull('vitamin-d_100g', instance.vitaminD);
-  writeNotNull('vitamin-d_unit', _$UnitEnumMap[instance.vitaminDUnit]);
+  writeNotNull(
+      'vitamin-d_unit', UnitHelper.unitToString(instance.vitaminDUnit));
   writeNotNull('vitamin-b1_serving', instance.vitaminB1Serving);
   writeNotNull('vitamin-b1_100g', instance.vitaminB1);
-  writeNotNull('vitamin-b1_unit', _$UnitEnumMap[instance.vitaminB1Unit]);
+  writeNotNull(
+      'vitamin-b1_unit', UnitHelper.unitToString(instance.vitaminB1Unit));
   writeNotNull('vitamin-b2_serving', instance.vitaminB2Serving);
   writeNotNull('vitamin-b2_100g', instance.vitaminB2);
-  writeNotNull('vitamin-b2_unit', _$UnitEnumMap[instance.vitaminB2Unit]);
+  writeNotNull(
+      'vitamin-b2_unit', UnitHelper.unitToString(instance.vitaminB2Unit));
   writeNotNull('vitamin-pp_serving', instance.vitaminPPServing);
   writeNotNull('vitamin-pp_100g', instance.vitaminPP);
-  writeNotNull('vitamin-pp_unit', _$UnitEnumMap[instance.vitaminPPUnit]);
+  writeNotNull(
+      'vitamin-pp_unit', UnitHelper.unitToString(instance.vitaminPPUnit));
   writeNotNull('vitamin-b6_serving', instance.vitaminB6Serving);
   writeNotNull('vitamin-b6_100g', instance.vitaminB6);
-  writeNotNull('vitamin-b6_unit', _$UnitEnumMap[instance.vitaminB6Unit]);
+  writeNotNull(
+      'vitamin-b6_unit', UnitHelper.unitToString(instance.vitaminB6Unit));
   writeNotNull('vitamin-b12_serving', instance.vitaminB12Serving);
   writeNotNull('vitamin-b12_100g', instance.vitaminB12);
-  writeNotNull('vitamin-b12_unit', _$UnitEnumMap[instance.vitaminB12Unit]);
+  writeNotNull(
+      'vitamin-b12_unit', UnitHelper.unitToString(instance.vitaminB12Unit));
   writeNotNull('vitamin-b9_serving', instance.vitaminB9Serving);
   writeNotNull('vitamin-b9_100g', instance.vitaminB9);
-  writeNotNull('vitamin-b9_unit', _$UnitEnumMap[instance.vitaminB9Unit]);
+  writeNotNull(
+      'vitamin-b9_unit', UnitHelper.unitToString(instance.vitaminB9Unit));
   writeNotNull('vitamin-k_serving', instance.vitaminKServing);
   writeNotNull('vitamin-k_100g', instance.vitaminK);
-  writeNotNull('vitamin-k_unit', _$UnitEnumMap[instance.vitaminKUnit]);
+  writeNotNull(
+      'vitamin-k_unit', UnitHelper.unitToString(instance.vitaminKUnit));
   writeNotNull('cholesterol_serving', instance.cholesterolServing);
   writeNotNull('cholesterol_100g', instance.cholesterol);
-  writeNotNull('cholesterol_unit', _$UnitEnumMap[instance.cholesterolUnit]);
+  writeNotNull(
+      'cholesterol_unit', UnitHelper.unitToString(instance.cholesterolUnit));
   writeNotNull('butyric-acid_serving', instance.butyricAcidServing);
   writeNotNull('butyric-acid_100g', instance.butyricAcid);
-  writeNotNull('butyric-acid_unit', _$UnitEnumMap[instance.butyricAcidUnit]);
+  writeNotNull(
+      'butyric-acid_unit', UnitHelper.unitToString(instance.butyricAcidUnit));
   writeNotNull('caproic-acid_serving', instance.caproicAcidServing);
   writeNotNull('caproic-acid_100g', instance.caproicAcid);
-  writeNotNull('caproic-acid_unit', _$UnitEnumMap[instance.caproicAcidUnit]);
+  writeNotNull(
+      'caproic-acid_unit', UnitHelper.unitToString(instance.caproicAcidUnit));
   writeNotNull('caprylic-acid_serving', instance.caprylicAcidServing);
   writeNotNull('caprylic-acid_100g', instance.caprylicAcid);
-  writeNotNull('caprylic-acid_unit', _$UnitEnumMap[instance.caprylicAcidUnit]);
+  writeNotNull(
+      'caprylic-acid_unit', UnitHelper.unitToString(instance.caprylicAcidUnit));
   writeNotNull('capric-acid_serving', instance.capricAcidServing);
   writeNotNull('capric-acid_100g', instance.capricAcid);
-  writeNotNull('capric-acid_unit', _$UnitEnumMap[instance.capricAcidUnit]);
+  writeNotNull(
+      'capric-acid_unit', UnitHelper.unitToString(instance.capricAcidUnit));
   writeNotNull('lauric-acid_serving', instance.lauricAcidServing);
   writeNotNull('lauric-acid_100g', instance.lauricAcid);
-  writeNotNull('lauric-acid_unit', _$UnitEnumMap[instance.lauricAcidUnit]);
+  writeNotNull(
+      'lauric-acid_unit', UnitHelper.unitToString(instance.lauricAcidUnit));
   writeNotNull('myristic-acid_serving', instance.myristicAcidServing);
   writeNotNull('myristic-acid_100g', instance.myristicAcid);
-  writeNotNull('myristic-acid_unit', _$UnitEnumMap[instance.myristicAcidUnit]);
+  writeNotNull(
+      'myristic-acid_unit', UnitHelper.unitToString(instance.myristicAcidUnit));
   writeNotNull('palmitic-acid_serving', instance.palmiticAcidServing);
   writeNotNull('palmitic-acid_100g', instance.palmiticAcid);
-  writeNotNull('palmitic-acid_unit', _$UnitEnumMap[instance.palmiticAcidUnit]);
+  writeNotNull(
+      'palmitic-acid_unit', UnitHelper.unitToString(instance.palmiticAcidUnit));
   writeNotNull('stearic-acid_serving', instance.stearicAcidServing);
   writeNotNull('stearic-acid_100g', instance.stearicAcid);
-  writeNotNull('stearic-acid_unit', _$UnitEnumMap[instance.stearicAcidUnit]);
+  writeNotNull(
+      'stearic-acid_unit', UnitHelper.unitToString(instance.stearicAcidUnit));
   writeNotNull('oleic-acid_serving', instance.oleicAcidServing);
   writeNotNull('oleic-acid_100g', instance.oleicAcid);
-  writeNotNull('oleic-acid_unit', _$UnitEnumMap[instance.oleicAcidUnit]);
+  writeNotNull(
+      'oleic-acid_unit', UnitHelper.unitToString(instance.oleicAcidUnit));
   writeNotNull('linoleic-acid_serving', instance.linoleicAcidServing);
   writeNotNull('linoleic-acid_100g', instance.linoleicAcid);
-  writeNotNull('linoleic-acid_unit', _$UnitEnumMap[instance.linoleicAcidUnit]);
+  writeNotNull(
+      'linoleic-acid_unit', UnitHelper.unitToString(instance.linoleicAcidUnit));
   writeNotNull(
       'docosahexaenoic-acid_serving', instance.docosahexaenoicAcidServing);
   writeNotNull('docosahexaenoic-acid_100g', instance.docosahexaenoicAcid);
   writeNotNull('docosahexaenoic-acid_unit',
-      _$UnitEnumMap[instance.docosahexaenoicAcidUnit]);
+      UnitHelper.unitToString(instance.docosahexaenoicAcidUnit));
   writeNotNull(
       'eicosapentaenoic-acid_serving', instance.eicosapentaenoicAcidServing);
   writeNotNull('eicosapentaenoic-acid_100g', instance.eicosapentaenoicAcid);
   writeNotNull('eicosapentaenoic-acid_unit',
-      _$UnitEnumMap[instance.eicosapentaenoicAcidUnit]);
+      UnitHelper.unitToString(instance.eicosapentaenoicAcidUnit));
   writeNotNull('erucic-acid_serving', instance.erucicAcidServing);
   writeNotNull('erucic-acid_100g', instance.erucicAcid);
-  writeNotNull('erucic-acid_unit', _$UnitEnumMap[instance.erucicAcidUnit]);
+  writeNotNull(
+      'erucic-acid_unit', UnitHelper.unitToString(instance.erucicAcidUnit));
   writeNotNull('monounsaturated_serving', instance.monounsaturatedServing);
   writeNotNull('monounsaturated_100g', instance.monounsaturatedAcid);
-  writeNotNull(
-      'monounsaturated_unit', _$UnitEnumMap[instance.monounsaturatedUnit]);
+  writeNotNull('monounsaturated_unit',
+      UnitHelper.unitToString(instance.monounsaturatedUnit));
   writeNotNull('polyunsaturated_serving', instance.polyunsaturatedServing);
   writeNotNull('polyunsaturated_100g', instance.polyunsaturatedAcid);
-  writeNotNull(
-      'polyunsaturated_unit', _$UnitEnumMap[instance.polyunsaturatedUnit]);
+  writeNotNull('polyunsaturated_unit',
+      UnitHelper.unitToString(instance.polyunsaturatedUnit));
   writeNotNull('alcohol_serving', instance.alcoholServing);
   writeNotNull('alcohol_100g', instance.alcohol);
-  writeNotNull('alcohol_unit', _$UnitEnumMap[instance.alcoholUnit]);
+  writeNotNull('alcohol_unit', UnitHelper.unitToString(instance.alcoholUnit));
   writeNotNull('pantothenic-acid_serving', instance.pantothenicAcidServing);
   writeNotNull('pantothenic-acid_100g', instance.pantothenicAcid);
-  writeNotNull(
-      'pantothenic-acid_unit', _$UnitEnumMap[instance.pantothenicAcidUnit]);
+  writeNotNull('pantothenic-acid_unit',
+      UnitHelper.unitToString(instance.pantothenicAcidUnit));
   writeNotNull('biotin_serving', instance.biotinServing);
   writeNotNull('biotin_100g', instance.biotin);
-  writeNotNull('biotin_unit', _$UnitEnumMap[instance.biotinUnit]);
+  writeNotNull('biotin_unit', UnitHelper.unitToString(instance.biotinUnit));
   writeNotNull('chloride_serving', instance.chlorideServing);
   writeNotNull('chloride_100g', instance.chloride);
-  writeNotNull('chloride_unit', _$UnitEnumMap[instance.chlorideUnit]);
+  writeNotNull('chloride_unit', UnitHelper.unitToString(instance.chlorideUnit));
   writeNotNull('chromium_serving', instance.chromiumServing);
   writeNotNull('chromium_100g', instance.chromium);
-  writeNotNull('chromium_unit', _$UnitEnumMap[instance.chromiumUnit]);
+  writeNotNull('chromium_unit', UnitHelper.unitToString(instance.chromiumUnit));
   writeNotNull('fluoride_serving', instance.fluorideServing);
   writeNotNull('fluoride_100g', instance.fluoride);
-  writeNotNull('fluoride_unit', _$UnitEnumMap[instance.fluorideUnit]);
+  writeNotNull('fluoride_unit', UnitHelper.unitToString(instance.fluorideUnit));
   writeNotNull('iodine_serving', instance.iodineServing);
   writeNotNull('iodine_100g', instance.iodine);
-  writeNotNull('iodine_unit', _$UnitEnumMap[instance.iodineUnit]);
+  writeNotNull('iodine_unit', UnitHelper.unitToString(instance.iodineUnit));
   writeNotNull('manganese_serving', instance.manganeseServing);
   writeNotNull('manganese_100g', instance.manganese);
-  writeNotNull('manganese_unit', _$UnitEnumMap[instance.manganeseUnit]);
+  writeNotNull(
+      'manganese_unit', UnitHelper.unitToString(instance.manganeseUnit));
   writeNotNull('molybdenum_serving', instance.molybdenumServing);
   writeNotNull('molybdenum_100g', instance.molybdenum);
-  writeNotNull('molybdenum_unit', _$UnitEnumMap[instance.molybdenumUnit]);
+  writeNotNull(
+      'molybdenum_unit', UnitHelper.unitToString(instance.molybdenumUnit));
   writeNotNull('omega-3-fat_serving', instance.omega3FatServing);
   writeNotNull('omega-3-fat_100g', instance.omega3Fat);
-  writeNotNull('omega-3-fat_unit', _$UnitEnumMap[instance.omega3FatUnit]);
+  writeNotNull(
+      'omega-3-fat_unit', UnitHelper.unitToString(instance.omega3FatUnit));
   writeNotNull('omega-6-fat_serving', instance.omega6FatServing);
   writeNotNull('omega-6-fat_100g', instance.omega6Fat);
-  writeNotNull('omega-6-fat_unit', _$UnitEnumMap[instance.omega6FatUnit]);
+  writeNotNull(
+      'omega-6-fat_unit', UnitHelper.unitToString(instance.omega6FatUnit));
   writeNotNull('trans-fat_serving', instance.transFatServing);
   writeNotNull('trans-fat_100g', instance.transFat);
-  writeNotNull('trans-fat_unit', _$UnitEnumMap[instance.transFatUnit]);
+  writeNotNull(
+      'trans-fat_unit', UnitHelper.unitToString(instance.transFatUnit));
   return val;
 }
-
-const _$UnitEnumMap = {
-  Unit.KCAL: 'KCAL',
-  Unit.KJ: 'KJ',
-  Unit.G: 'G',
-  Unit.MILLI_G: 'MILLI_G',
-  Unit.MICRO_G: 'MICRO_G',
-  Unit.MILLI_L: 'MILLI_L',
-  Unit.L: 'L',
-  Unit.PERCENT: 'PERCENT',
-  Unit.UNKNOWN: 'UNKNOWN',
-};
diff --git a/test/api_saveProduct_test.dart b/test/api_saveProduct_test.dart
index 2c080e653a..c939b8183d 100644
--- a/test/api_saveProduct_test.dart
+++ b/test/api_saveProduct_test.dart
@@ -328,6 +328,7 @@ void main() {
       const double CARBOHYDRATES = 12;
       const double PROTEINS = 6;
       const double FAT = 0.1;
+      const double VITAMIN_B12 = 0.15;
       const String BARCODE = '7340011364184';
       const String PRODUCT_NAME = 'Chili beans';
       const String NUTRIMENT_DATA_PER = '100g';
@@ -340,6 +341,8 @@ void main() {
             carbohydratesUnit: _getMassUnit(i),
             proteins: PROTEINS + i,
             proteinsUnit: _getMassUnit(i),
+            vitaminB12: VITAMIN_B12 + i,
+            vitaminB12Unit: _getMassUnit(i),
             fat: FAT + i,
             fatUnit: _getMassUnit(i));
 
@@ -398,6 +401,14 @@ void main() {
             );
             expect(searchedNutriments.fat, closeTo(expectedFat, EPSILON));
             expect(searchedNutriments.fatUnit, nutriments.fatUnit);
+            final expectedB12 = _nutrientToGrams(
+              nutriments.vitaminB12,
+              nutriments.vitaminB12Unit,
+            );
+            expect(
+                searchedNutriments.vitaminB12, closeTo(expectedB12, EPSILON));
+            expect(
+                searchedNutriments.vitaminB12Unit, nutriments.vitaminB12Unit);
           }
         }
       }