diff --git a/classes/MDAllowedValueSets b/classes/MDAllowedValueSets
index 3d96d0d..59223ad 160000
--- a/classes/MDAllowedValueSets
+++ b/classes/MDAllowedValueSets
@@ -1 +1 @@
-Subproject commit 3d96d0df89529c407fa013b054034c083b0d73ce
+Subproject commit 59223ad7783e23148858a1a2170ebc3571b9c3f8
diff --git a/classes/MDErrorReporter b/classes/MDErrorReporter
index c6aeec1..c7af1dc 160000
--- a/classes/MDErrorReporter
+++ b/classes/MDErrorReporter
@@ -1 +1 @@
-Subproject commit c6aeec1d2fb40654236a17b5f4f5feb28c7ee0f2
+Subproject commit c7af1dc1444c82084c73b5ea3a9077e15aadcaf6
diff --git a/values/availableFields.php b/values/availableFields.php
index a183dd2..50a8930 100644
--- a/values/availableFields.php
+++ b/values/availableFields.php
@@ -190,7 +190,7 @@ $availableFields = [
         ],
         "dimensions_separate_length_unit" => [
             "required"            => false,
-            "allowedValues"       => $laengeneinheit,
+            "allowedValues"       => MDUnitsSet::UNITS_LENGTH,
             "dependsOn"           => ['dimensions_separate_length_value', 'dimensions_separate_show_md', 'dimensions_separate_show_extern'],
             "remark"              => 'If a separated value is given an entry for the respective unit is necessary. If a separated dimension entry is given, <i>dimensions_separate_show_md</i> and <i>dimensions_separate_show_extern</i> need to be filled in, too.',
             "name_human_readable" => $export['exact_measurements_length_unit'],
@@ -206,7 +206,7 @@ $availableFields = [
         ],
         "dimensions_separate_width_unit" => [
             "required"            => false,
-            "allowedValues"       => $laengeneinheit,
+            "allowedValues"       => MDUnitsSet::UNITS_LENGTH,
             "dependsOn"           => ['dimensions_separate_width_value', 'dimensions_separate_show_md', 'dimensions_separate_show_extern'],
             "remark"              => 'If a separated value is given an entry for the respective unit is necessary. If a separated dimension entry is given, <i>dimensions_separate_show_md</i> and <i>dimensions_separate_show_extern</i> need to be filled in, too.',
             "name_human_readable" => $export['exact_measurements_width_unit'],
@@ -222,7 +222,7 @@ $availableFields = [
         ],
         "dimensions_separate_height_unit" => [
             "required"            => false,
-            "allowedValues"       => $laengeneinheit,
+            "allowedValues"       => MDUnitsSet::UNITS_LENGTH,
             "dependsOn"           => ['dimensions_separate_height_value', 'dimensions_separate_show_md', 'dimensions_separate_show_extern'],
             "remark"              => 'If a separated value is given an entry for the respective unit is necessary. If a separated dimension entry is given, <i>dimensions_separate_show_md</i> and <i>dimensions_separate_show_extern</i> need to be filled in, too.',
             "name_human_readable" => $export['exact_measurements_height_unit'],
@@ -238,7 +238,7 @@ $availableFields = [
         ],
         "dimensions_separate_weight_unit" => [
             "required"            => false,
-            "allowedValues"       => $gewichteinheit,
+            "allowedValues"       => MDUnitsSet::UNITS_WEIGHT,
             "dependsOn"           => ['dimensions_separate_width_value', 'dimensions_separate_show_md', 'dimensions_separate_show_extern'],
             "remark"              => 'If a separated value is given an entry for the respective unit is necessary. If a separated dimension entry is given, <i>dimensions_separate_show_md</i> and <i>dimensions_separate_show_extern</i> need to be filled in, too.',
             "name_human_readable" => $export['exact_measurements_weight_unit'],
@@ -254,7 +254,7 @@ $availableFields = [
         ],
         "dimensions_separate_diameter_unit" => [
             "required"            => false,
-            "allowedValues"       => $laengeneinheit,
+            "allowedValues"       => MDUnitsSet::UNITS_LENGTH,
             "dependsOn"           => ['dimensions_separate_diameter_value', 'dimensions_separate_show_md', 'dimensions_separate_show_extern'],
             "remark"              => 'If a separated value is given an entry for the respective unit is necessary. If a separated dimension entry is given, <i>dimensions_separate_show_md</i> and <i>dimensions_separate_show_extern</i> need to be filled in, too.',
             "name_human_readable" => $export['exact_measurements_diameter_unit'],
@@ -270,7 +270,7 @@ $availableFields = [
         ],
         "dimensions_separate_wall_thickness_unit" => [
             "required"            => false,
-            "allowedValues"       => $laengeneinheit,
+            "allowedValues"       => MDUnitsSet::UNITS_LENGTH,
             "dependsOn"           => ['dimensions_separate_wall_thickness_value', 'dimensions_separate_show_md', 'dimensions_separate_show_extern'],
             "remark"              => 'If a separated value is given an entry for the respective unit is necessary. If a separated dimension entry is given, <i>dimensions_separate_show_md</i> and <i>dimensions_separate_show_extern</i> need to be filled in, too.',
             "name_human_readable" => $export['exact_measurements_wall_size_unit'],