diff --git a/_dev_scripts/aas_core3/__init__.py b/_dev_scripts/aas_core3/__init__.py
index fc52d33c..208b45db 100644
--- a/_dev_scripts/aas_core3/__init__.py
+++ b/_dev_scripts/aas_core3/__init__.py
@@ -3,5 +3,5 @@
 
 This copy is necessary so that we can decouple from ``aas-core*-python`` repository.
 
-The revision of aas-core-codegen was: d06db62b
+The revision of aas-core-codegen was: 0f7345e1
 """
diff --git a/_dev_scripts/aas_core3/jsonization.py b/_dev_scripts/aas_core3/jsonization.py
index 5419f363..2238c0ec 100644
--- a/_dev_scripts/aas_core3/jsonization.py
+++ b/_dev_scripts/aas_core3/jsonization.py
@@ -15,6 +15,7 @@
 import collections.abc
 import sys
 from typing import (
+    cast,
     Any,
     Callable,
     Iterable,
@@ -252,6 +253,58 @@ def _bytes_from_jsonable(
     )
 
 
+def _try_to_cast_to_array_like(
+    jsonable: Jsonable
+) -> Optional[Iterable[Any]]:
+    """
+    Try to cast the ``jsonable`` to something like a JSON array.
+
+    In particular, we explicitly check that the ``jsonable`` is not a mapping, as we
+    do not want to mistake dictionaries (*i.e.* de-serialized JSON objects) for lists.
+
+    >>> assert _try_to_cast_to_array_like(True) is None
+
+    >>> assert _try_to_cast_to_array_like(0) is None
+
+    >>> assert _try_to_cast_to_array_like(2.2) is None
+
+    >>> assert _try_to_cast_to_array_like("hello") is None
+
+    >>> assert _try_to_cast_to_array_like(b"hello") is None
+
+    >>> _try_to_cast_to_array_like([1, 2])
+    [1, 2]
+
+    >>> assert _try_to_cast_to_array_like({"a": 3}) is None
+
+    >>> assert _try_to_cast_to_array_like(collections.OrderedDict()) is None
+
+    >>> _try_to_cast_to_array_like(range(1, 2))
+    range(1, 2)
+
+    >>> _try_to_cast_to_array_like((1, 2))
+    (1, 2)
+
+    >>> assert _try_to_cast_to_array_like({1, 2, 3}) is None
+    """
+    if (
+        
+        not isinstance(jsonable, (str, bytearray, bytes))
+        and hasattr(jsonable, "__iter__")
+        and not hasattr(jsonable, "keys")
+        # NOTE (mristin):
+        # There is no easy way to check for sets as opposed to sequence except
+        # for checking for direct inheritance. A sequence also inherits from
+        # a collection, so both sequences and sets provide ``__contains__`` method.
+        #
+        # See: https://docs.python.org/3/library/collections.abc.html
+        and not isinstance(jsonable, collections.abc.Set)
+    ):
+        return cast(Iterable[Any], jsonable)
+
+    return None
+
+
 def has_semantics_from_jsonable(
         jsonable: Jsonable
 ) -> aas_types.HasSemantics:
@@ -326,15 +379,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -342,7 +396,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -400,15 +454,16 @@ def set_refers_to_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -416,7 +471,7 @@ def set_refers_to_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -710,15 +765,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -726,7 +782,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -937,15 +993,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -953,7 +1010,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -1118,15 +1175,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -1134,7 +1192,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -1179,15 +1237,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -1195,7 +1254,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -1214,15 +1273,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -1230,7 +1290,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -1275,15 +1335,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -1291,7 +1352,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -1336,15 +1397,16 @@ def set_submodels_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -1352,7 +1414,7 @@ def set_submodels_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -1381,6 +1443,18 @@ def asset_administration_shell_from_jsonable(
 
     setter = _SetterForAssetAdministrationShell()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'AssetAdministrationShell':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'AssetAdministrationShell', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_ASSET_ADMINISTRATION_SHELL.get(key)
@@ -1476,15 +1550,16 @@ def set_specific_asset_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.SpecificAssetID
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = specific_asset_id_from_jsonable(
                     jsonable_item
@@ -1492,7 +1567,7 @@ def set_specific_asset_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -1732,15 +1807,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -1748,7 +1824,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -1887,15 +1963,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -1903,7 +1980,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -1948,15 +2025,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -1964,7 +2042,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -1983,15 +2061,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -1999,7 +2078,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2070,15 +2149,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -2086,7 +2166,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2105,15 +2185,16 @@ def set_qualifiers_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Qualifier
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = qualifier_from_jsonable(
                     jsonable_item
@@ -2121,7 +2202,7 @@ def set_qualifiers_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2140,15 +2221,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -2156,7 +2238,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2175,15 +2257,16 @@ def set_submodel_elements_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.SubmodelElement
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = submodel_element_from_jsonable(
                     jsonable_item
@@ -2191,7 +2274,7 @@ def set_submodel_elements_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2220,6 +2303,18 @@ def submodel_from_jsonable(
 
     setter = _SetterForSubmodel()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'Submodel':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'Submodel', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_SUBMODEL.get(key)
@@ -2364,15 +2459,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -2380,7 +2476,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2425,15 +2521,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -2441,7 +2538,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2460,15 +2557,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -2476,7 +2574,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2508,15 +2606,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -2524,7 +2623,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2543,15 +2642,16 @@ def set_qualifiers_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Qualifier
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = qualifier_from_jsonable(
                     jsonable_item
@@ -2559,7 +2659,7 @@ def set_qualifiers_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2578,15 +2678,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -2594,7 +2695,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2760,15 +2861,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -2776,7 +2878,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2821,15 +2923,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -2837,7 +2940,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2856,15 +2959,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -2872,7 +2976,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2904,15 +3008,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -2920,7 +3025,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2939,15 +3044,16 @@ def set_qualifiers_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Qualifier
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = qualifier_from_jsonable(
                     jsonable_item
@@ -2955,7 +3061,7 @@ def set_qualifiers_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -2974,15 +3080,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -2990,7 +3097,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -3061,15 +3168,16 @@ def set_value_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.SubmodelElement
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = submodel_element_from_jsonable(
                     jsonable_item
@@ -3077,7 +3185,7 @@ def set_value_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -3106,6 +3214,18 @@ def submodel_element_list_from_jsonable(
 
     setter = _SetterForSubmodelElementList()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'SubmodelElementList':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'SubmodelElementList', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_SUBMODEL_ELEMENT_LIST.get(key)
@@ -3178,15 +3298,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -3194,7 +3315,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -3239,15 +3360,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -3255,7 +3377,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -3274,15 +3396,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -3290,7 +3413,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -3322,15 +3445,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -3338,7 +3462,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -3357,15 +3481,16 @@ def set_qualifiers_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Qualifier
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = qualifier_from_jsonable(
                     jsonable_item
@@ -3373,7 +3498,7 @@ def set_qualifiers_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -3392,15 +3517,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -3408,7 +3534,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -3427,15 +3553,16 @@ def set_value_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.SubmodelElement
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = submodel_element_from_jsonable(
                     jsonable_item
@@ -3443,7 +3570,7 @@ def set_value_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -3472,6 +3599,18 @@ def submodel_element_collection_from_jsonable(
 
     setter = _SetterForSubmodelElementCollection()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'SubmodelElementCollection':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'SubmodelElementCollection', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_SUBMODEL_ELEMENT_COLLECTION.get(key)
@@ -3573,15 +3712,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -3589,7 +3729,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -3634,15 +3774,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -3650,7 +3791,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -3669,15 +3810,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -3685,7 +3827,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -3717,15 +3859,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -3733,7 +3876,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -3752,15 +3895,16 @@ def set_qualifiers_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Qualifier
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = qualifier_from_jsonable(
                     jsonable_item
@@ -3768,7 +3912,7 @@ def set_qualifiers_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -3787,15 +3931,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -3803,7 +3948,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -3871,6 +4016,18 @@ def property_from_jsonable(
 
     setter = _SetterForProperty()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'Property':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'Property', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_PROPERTY.get(key)
@@ -3942,15 +4099,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -3958,7 +4116,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4003,15 +4161,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -4019,7 +4178,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4038,15 +4197,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -4054,7 +4214,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4086,15 +4246,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -4102,7 +4263,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4121,15 +4282,16 @@ def set_qualifiers_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Qualifier
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = qualifier_from_jsonable(
                     jsonable_item
@@ -4137,7 +4299,7 @@ def set_qualifiers_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4156,15 +4318,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -4172,7 +4335,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4191,15 +4354,16 @@ def set_value_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -4207,7 +4371,7 @@ def set_value_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4249,6 +4413,18 @@ def multi_language_property_from_jsonable(
 
     setter = _SetterForMultiLanguageProperty()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'MultiLanguageProperty':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'MultiLanguageProperty', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_MULTI_LANGUAGE_PROPERTY.get(key)
@@ -4315,15 +4491,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -4331,7 +4508,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4376,15 +4553,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -4392,7 +4570,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4411,15 +4589,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -4427,7 +4606,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4459,15 +4638,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -4475,7 +4655,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4494,15 +4674,16 @@ def set_qualifiers_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Qualifier
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = qualifier_from_jsonable(
                     jsonable_item
@@ -4510,7 +4691,7 @@ def set_qualifiers_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4529,15 +4710,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -4545,7 +4727,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4613,6 +4795,18 @@ def range_from_jsonable(
 
     setter = _SetterForRange()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'Range':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'Range', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_RANGE.get(key)
@@ -4683,15 +4877,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -4699,7 +4894,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4744,15 +4939,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -4760,7 +4956,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4779,15 +4975,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -4795,7 +4992,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4827,15 +5024,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -4843,7 +5041,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4862,15 +5060,16 @@ def set_qualifiers_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Qualifier
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = qualifier_from_jsonable(
                     jsonable_item
@@ -4878,7 +5077,7 @@ def set_qualifiers_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4897,15 +5096,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -4913,7 +5113,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -4955,6 +5155,18 @@ def reference_element_from_jsonable(
 
     setter = _SetterForReferenceElement()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'ReferenceElement':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'ReferenceElement', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_REFERENCE_ELEMENT.get(key)
@@ -5019,15 +5231,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -5035,7 +5248,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5080,15 +5293,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -5096,7 +5310,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5115,15 +5329,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -5131,7 +5346,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5163,15 +5378,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -5179,7 +5395,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5198,15 +5414,16 @@ def set_qualifiers_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Qualifier
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = qualifier_from_jsonable(
                     jsonable_item
@@ -5214,7 +5431,7 @@ def set_qualifiers_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5233,15 +5450,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -5249,7 +5467,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5304,6 +5522,18 @@ def blob_from_jsonable(
 
     setter = _SetterForBlob()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'Blob':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'Blob', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_BLOB.get(key)
@@ -5374,15 +5604,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -5390,7 +5621,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5435,15 +5666,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -5451,7 +5683,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5470,15 +5702,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -5486,7 +5719,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5518,15 +5751,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -5534,7 +5768,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5553,15 +5787,16 @@ def set_qualifiers_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Qualifier
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = qualifier_from_jsonable(
                     jsonable_item
@@ -5569,7 +5804,7 @@ def set_qualifiers_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5588,15 +5823,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -5604,7 +5840,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5659,6 +5895,18 @@ def file_from_jsonable(
 
     setter = _SetterForFile()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'File':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'File', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_FILE.get(key)
@@ -5730,15 +5978,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -5746,7 +5995,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5791,15 +6040,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -5807,7 +6057,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5826,15 +6076,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -5842,7 +6093,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5874,15 +6125,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -5890,7 +6142,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5909,15 +6161,16 @@ def set_qualifiers_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Qualifier
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = qualifier_from_jsonable(
                     jsonable_item
@@ -5925,7 +6178,7 @@ def set_qualifiers_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -5944,15 +6197,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -5960,7 +6214,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -6005,15 +6259,16 @@ def set_annotations_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.DataElement
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = data_element_from_jsonable(
                     jsonable_item
@@ -6021,7 +6276,7 @@ def set_annotations_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -6050,6 +6305,18 @@ def annotated_relationship_element_from_jsonable(
 
     setter = _SetterForAnnotatedRelationshipElement()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'AnnotatedRelationshipElement':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'AnnotatedRelationshipElement', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_ANNOTATED_RELATIONSHIP_ELEMENT.get(key)
@@ -6128,15 +6395,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -6144,7 +6412,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -6189,15 +6457,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -6205,7 +6474,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -6224,15 +6493,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -6240,7 +6510,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -6272,15 +6542,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -6288,7 +6559,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -6307,15 +6578,16 @@ def set_qualifiers_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Qualifier
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = qualifier_from_jsonable(
                     jsonable_item
@@ -6323,7 +6595,7 @@ def set_qualifiers_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -6342,15 +6614,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -6358,7 +6631,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -6377,15 +6650,16 @@ def set_statements_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.SubmodelElement
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = submodel_element_from_jsonable(
                     jsonable_item
@@ -6393,7 +6667,7 @@ def set_statements_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -6438,15 +6712,16 @@ def set_specific_asset_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.SpecificAssetID
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = specific_asset_id_from_jsonable(
                     jsonable_item
@@ -6454,7 +6729,7 @@ def set_specific_asset_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -6483,6 +6758,18 @@ def entity_from_jsonable(
 
     setter = _SetterForEntity()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'Entity':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'Entity', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_ENTITY.get(key)
@@ -6863,15 +7150,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -6879,7 +7167,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -6924,15 +7212,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -6940,7 +7229,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -6959,15 +7248,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -6975,7 +7265,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7007,15 +7297,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -7023,7 +7314,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7042,15 +7333,16 @@ def set_qualifiers_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Qualifier
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = qualifier_from_jsonable(
                     jsonable_item
@@ -7058,7 +7350,7 @@ def set_qualifiers_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7077,15 +7369,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -7093,7 +7386,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7226,6 +7519,18 @@ def basic_event_element_from_jsonable(
 
     setter = _SetterForBasicEventElement()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'BasicEventElement':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'BasicEventElement', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_BASIC_EVENT_ELEMENT.get(key)
@@ -7313,15 +7618,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -7329,7 +7635,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7374,15 +7680,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -7390,7 +7697,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7409,15 +7716,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -7425,7 +7733,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7457,15 +7765,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -7473,7 +7782,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7492,15 +7801,16 @@ def set_qualifiers_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Qualifier
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = qualifier_from_jsonable(
                     jsonable_item
@@ -7508,7 +7818,7 @@ def set_qualifiers_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7527,15 +7837,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -7543,7 +7854,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7562,15 +7873,16 @@ def set_input_variables_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.OperationVariable
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = operation_variable_from_jsonable(
                     jsonable_item
@@ -7578,7 +7890,7 @@ def set_input_variables_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7597,15 +7909,16 @@ def set_output_variables_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.OperationVariable
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = operation_variable_from_jsonable(
                     jsonable_item
@@ -7613,7 +7926,7 @@ def set_output_variables_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7632,15 +7945,16 @@ def set_inoutput_variables_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.OperationVariable
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = operation_variable_from_jsonable(
                     jsonable_item
@@ -7648,7 +7962,7 @@ def set_inoutput_variables_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7677,6 +7991,18 @@ def operation_from_jsonable(
 
     setter = _SetterForOperation()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'Operation':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'Operation', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_OPERATION.get(key)
@@ -7814,15 +8140,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -7830,7 +8157,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7875,15 +8202,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -7891,7 +8219,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7910,15 +8238,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -7926,7 +8255,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7958,15 +8287,16 @@ def set_supplemental_semantic_ids_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -7974,7 +8304,7 @@ def set_supplemental_semantic_ids_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -7993,15 +8323,16 @@ def set_qualifiers_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Qualifier
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = qualifier_from_jsonable(
                     jsonable_item
@@ -8009,7 +8340,7 @@ def set_qualifiers_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -8028,15 +8359,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -8044,7 +8376,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -8073,6 +8405,18 @@ def capability_from_jsonable(
 
     setter = _SetterForCapability()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'Capability':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'Capability', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_CAPABILITY.get(key)
@@ -8134,15 +8478,16 @@ def set_extensions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Extension
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = extension_from_jsonable(
                     jsonable_item
@@ -8150,7 +8495,7 @@ def set_extensions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -8195,15 +8540,16 @@ def set_display_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringNameType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_name_type_from_jsonable(
                     jsonable_item
@@ -8211,7 +8557,7 @@ def set_display_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -8230,15 +8576,16 @@ def set_description_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringTextType
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_text_type_from_jsonable(
                     jsonable_item
@@ -8246,7 +8593,7 @@ def set_description_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -8291,15 +8638,16 @@ def set_embedded_data_specifications_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.EmbeddedDataSpecification
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = embedded_data_specification_from_jsonable(
                     jsonable_item
@@ -8307,7 +8655,7 @@ def set_embedded_data_specifications_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -8326,15 +8674,16 @@ def set_is_case_of_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Reference
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = reference_from_jsonable(
                     jsonable_item
@@ -8342,7 +8691,7 @@ def set_is_case_of_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -8371,6 +8720,18 @@ def concept_description_from_jsonable(
 
     setter = _SetterForConceptDescription()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'ConceptDescription':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'ConceptDescription', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_CONCEPT_DESCRIPTION.get(key)
@@ -8483,15 +8844,16 @@ def set_keys_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Key
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = key_from_jsonable(
                     jsonable_item
@@ -8499,7 +8861,7 @@ def set_keys_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -8954,15 +9316,16 @@ def set_asset_administration_shells_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.AssetAdministrationShell
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = asset_administration_shell_from_jsonable(
                     jsonable_item
@@ -8970,7 +9333,7 @@ def set_asset_administration_shells_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -8989,15 +9352,16 @@ def set_submodels_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.Submodel
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = submodel_from_jsonable(
                     jsonable_item
@@ -9005,7 +9369,7 @@ def set_submodels_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -9024,15 +9388,16 @@ def set_concept_descriptions_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.ConceptDescription
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = concept_description_from_jsonable(
                     jsonable_item
@@ -9040,7 +9405,7 @@ def set_concept_descriptions_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -9214,6 +9579,11 @@ def embedded_data_specification_from_jsonable(
             "The required property 'dataSpecificationContent' is missing"
         )
 
+    if setter.data_specification is None:
+        raise DeserializationException(
+            "The required property 'dataSpecification' is missing"
+        )
+
     return aas_types.EmbeddedDataSpecification(
         setter.data_specification_content,
         setter.data_specification
@@ -9492,15 +9862,16 @@ def set_value_reference_pairs_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.ValueReferencePair
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = value_reference_pair_from_jsonable(
                     jsonable_item
@@ -9508,7 +9879,7 @@ def set_value_reference_pairs_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -9877,15 +10248,16 @@ def set_preferred_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringPreferredNameTypeIEC61360
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_preferred_name_type_iec_61360_from_jsonable(
                     jsonable_item
@@ -9893,7 +10265,7 @@ def set_preferred_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -9912,15 +10284,16 @@ def set_short_name_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringShortNameTypeIEC61360
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_short_name_type_iec_61360_from_jsonable(
                     jsonable_item
@@ -9928,7 +10301,7 @@ def set_short_name_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -10012,15 +10385,16 @@ def set_definition_from_jsonable(
 
         :param jsonable: input to be parsed
         """
-        if not isinstance(jsonable, collections.abc.Iterable):
+        array_like = _try_to_cast_to_array_like(jsonable)
+        if array_like is None:
             raise DeserializationException(
-                f"Expected an iterable, but got: {type(jsonable)}"
+                f"Expected something array-like, but got: {type(jsonable)}"
             )
 
         items: List[
             aas_types.LangStringDefinitionTypeIEC61360
         ] = []
-        for i, jsonable_item in enumerate(jsonable):
+        for i, jsonable_item in enumerate(array_like):
             try:
                 item = lang_string_definition_type_iec_61360_from_jsonable(
                     jsonable_item
@@ -10028,7 +10402,7 @@ def set_definition_from_jsonable(
             except DeserializationException as exception:
                 exception.path._prepend(
                     IndexSegment(
-                        jsonable,
+                        array_like,
                         i
                     )
                 )
@@ -10109,6 +10483,18 @@ def data_specification_iec_61360_from_jsonable(
 
     setter = _SetterForDataSpecificationIEC61360()
 
+    model_type = jsonable.get("modelType", None)
+    if model_type is None:
+        raise DeserializationException(
+            "Expected the property modelType, but found none"
+        )
+
+    if model_type != 'DataSpecificationIec61360':
+        raise DeserializationException(
+            f"Invalid modelType, expected 'DataSpecificationIec61360', "
+            f"but got: {model_type!r}"
+        )
+
     for key, jsonable_value in jsonable.items():
         setter_method = (
             _SETTER_MAP_FOR_DATA_SPECIFICATION_IEC_61360.get(key)
@@ -12792,10 +13178,9 @@ def transform_embedded_data_specification(
             self.transform(that.data_specification_content)
         )
 
-        if that.data_specification is not None:
-            jsonable['dataSpecification'] = (
-                self.transform(that.data_specification)
-            )
+        jsonable['dataSpecification'] = (
+            self.transform(that.data_specification)
+        )
 
         return jsonable
 
diff --git a/_dev_scripts/aas_core3/types.py b/_dev_scripts/aas_core3/types.py
index 442b46df..3cc9d320 100644
--- a/_dev_scripts/aas_core3/types.py
+++ b/_dev_scripts/aas_core3/types.py
@@ -5558,7 +5558,7 @@ class EmbeddedDataSpecification(Class):
     data_specification_content: 'DataSpecificationContent'
 
     #: Reference to the data specification
-    data_specification: Optional['Reference']
+    data_specification: 'Reference'
 
     def descend_once(self) -> Iterator[Class]:
         """
@@ -5570,8 +5570,7 @@ def descend_once(self) -> Iterator[Class]:
         """
         yield self.data_specification_content
 
-        if self.data_specification is not None:
-            yield self.data_specification
+        yield self.data_specification
 
     def descend(self) -> Iterator[Class]:
         """
@@ -5583,10 +5582,9 @@ def descend(self) -> Iterator[Class]:
 
         yield from self.data_specification_content.descend()
 
-        if self.data_specification is not None:
-            yield self.data_specification
+        yield self.data_specification
 
-            yield from self.data_specification.descend()
+        yield from self.data_specification.descend()
 
     def accept(self, visitor: "AbstractVisitor") -> None:
         """Dispatch the :paramref:`visitor` on this instance."""
@@ -5621,7 +5619,7 @@ def transform_with_context(
     def __init__(
             self,
             data_specification_content: 'DataSpecificationContent',
-            data_specification: Optional['Reference'] = None
+            data_specification: 'Reference'
     ) -> None:
         """Initialize with the given values."""
         self.data_specification_content = data_specification_content
diff --git a/_dev_scripts/aas_core3/verification.py b/_dev_scripts/aas_core3/verification.py
index d3953416..a4fc6280 100644
--- a/_dev_scripts/aas_core3/verification.py
+++ b/_dev_scripts/aas_core3/verification.py
@@ -7904,15 +7904,14 @@ def transform_embedded_data_specification(
             )
             yield error
 
-        if that.data_specification is not None:
-            for error in self.transform(that.data_specification):
-                error.path._prepend(
-                    PropertySegment(
-                        that,
-                        'data_specification'
-                    )
+        for error in self.transform(that.data_specification):
+            error.path._prepend(
+                PropertySegment(
+                    that,
+                    'data_specification'
                 )
-                yield error
+            )
+            yield error
 
     # noinspection PyMethodMayBeStatic
     def transform_level_type(
@@ -8148,7 +8147,7 @@ def transform_data_specification_iec_61360(
             )
         ):
             yield Error(
-                'Constraint AASc-002: preferred name shall be provided at ' +
+                'Constraint AASc-3a-002: preferred name shall be provided at ' +
                 'least in English.'
             )
 
@@ -8586,12 +8585,6 @@ def verify_path_type(
             'Identifier shall have a maximum length of 2000 characters.'
         )
 
-    if not matches_rfc_8089_path(that):
-        yield Error(
-            'The value must represent a valid file URI scheme according ' +
-            'to RFC 8089.'
-        )
-
 
 def verify_qualifier_type(
         that: str
diff --git a/_dev_scripts/aas_core3/xmlization.py b/_dev_scripts/aas_core3/xmlization.py
index 6599c161..d5f397e8 100644
--- a/_dev_scripts/aas_core3/xmlization.py
+++ b/_dev_scripts/aas_core3/xmlization.py
@@ -24181,6 +24181,11 @@ def _read_embedded_data_specification_as_sequence(
             "The required property 'dataSpecificationContent' is missing"
         )
 
+    if reader_and_setter.data_specification is None:
+        raise DeserializationException(
+            "The required property 'dataSpecification' is missing"
+        )
+
     return aas_types.EmbeddedDataSpecification(
         reader_and_setter.data_specification_content,
         reader_and_setter.data_specification
@@ -30472,12 +30477,11 @@ def _write_embedded_data_specification_as_sequence(
         self.visit(that.data_specification_content)
         self._write_end_element('dataSpecificationContent')
 
-        if that.data_specification is not None:
-            self._write_start_element('dataSpecification')
-            self._write_reference_as_sequence(
-                that.data_specification
-            )
-            self._write_end_element('dataSpecification')
+        self._write_start_element('dataSpecification')
+        self._write_reference_as_sequence(
+            that.data_specification
+        )
+        self._write_end_element('dataSpecification')
 
     def visit_embedded_data_specification(
         self,
diff --git a/_dev_scripts/setup.py b/_dev_scripts/setup.py
index b21fe34a..d12e0a15 100644
--- a/_dev_scripts/setup.py
+++ b/_dev_scripts/setup.py
@@ -29,8 +29,8 @@
     keywords="asset administration shell code generation industry 4.0 industrie i4.0",
     install_requires=[
         "icontract>=2.6.1,<3",
-        "aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@6d5411b#egg=aas-core-meta",
-        "aas-core-codegen@git+https://github.com/aas-core-works/aas-core-codegen@d06db62b#egg=aas-core-codegen",
+        "aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@31d6afd#egg=aas-core-meta",
+        "aas-core-codegen@git+https://github.com/aas-core-works/aas-core-codegen@0f7345e1#egg=aas-core-codegen",
     ],
     # fmt: off
     extras_require={
diff --git a/aastesting/deep_equal.generated.go b/aastesting/deep_equal.generated.go
index 2d2a7c27..ccce4620 100644
--- a/aastesting/deep_equal.generated.go
+++ b/aastesting/deep_equal.generated.go
@@ -4318,18 +4318,12 @@ func deepEqualEmbeddedDataSpecification(
 
 	thatDataSpecification := that.DataSpecification()
 	otherDataSpecification := other.DataSpecification()
-	if (thatDataSpecification == nil && otherDataSpecification != nil) ||
-		(thatDataSpecification != nil && otherDataSpecification == nil) {
+	if !DeepEqual(
+		thatDataSpecification,
+		otherDataSpecification,
+	) {
 		return false
 	}
-	if thatDataSpecification != nil {
-		if !DeepEqual(
-			thatDataSpecification,
-			otherDataSpecification,
-		) {
-			return false
-		}
-	}
 
 	return true
 }
diff --git a/enhancing/enhancing.go b/enhancing/enhancing.go
index 807c7107..9b18509a 100644
--- a/enhancing/enhancing.go
+++ b/enhancing/enhancing.go
@@ -5894,14 +5894,12 @@ func wrapEmbeddedDataSpecification[E any](
 	)
 
 	theDataSpecification := that.DataSpecification()
-	if theDataSpecification != nil {
-		that.SetDataSpecification(
-			Wrap[E](
-				theDataSpecification,
-				factory,
-			).(aastypes.IReference),
-		)
-	}
+	that.SetDataSpecification(
+		Wrap[E](
+			theDataSpecification,
+			factory,
+		).(aastypes.IReference),
+	)
 
 	return
 }
diff --git a/jsonization/jsonization.go b/jsonization/jsonization.go
index 94c9c363..eccf6151 100644
--- a/jsonization/jsonization.go
+++ b/jsonization/jsonization.go
@@ -13131,6 +13131,7 @@ func embeddedDataSpecificationFromMapWithoutDispatch(
 	var theDataSpecification aastypes.IReference
 
 	foundDataSpecificationContent := false
+	foundDataSpecification := false
 
 	for k, v := range m {
 		switch k {
@@ -13164,6 +13165,7 @@ func embeddedDataSpecificationFromMapWithoutDispatch(
 				}
 				return
 			}
+			foundDataSpecification = true
 
 		default:
 			err = newDeserializationError(
@@ -13183,10 +13185,15 @@ func embeddedDataSpecificationFromMapWithoutDispatch(
 		return
 	}
 
+	if !foundDataSpecification {
+		err = newDeserializationError(
+			"The required property 'dataSpecification' is missing",
+		)
+		return
+	}
+
 	result = aastypes.NewEmbeddedDataSpecification(
 		theDataSpecificationContent,
-	)
-	result.SetDataSpecification(
 		theDataSpecification,
 	)
 
@@ -21216,24 +21223,22 @@ func embeddedDataSpecificationToMap(
 	}
 	result["dataSpecificationContent"] = jsonableDataSpecificationContent
 
-	if that.DataSpecification() != nil {
-		var jsonableDataSpecification interface{}
-		jsonableDataSpecification, err = ToJsonable(
-			that.DataSpecification(),
-		)
-		if err != nil {
-			if seriaErr, ok := err.(*SerializationError); ok {
-				seriaErr.Path.PrependName(
-					&aasreporting.NameSegment{
-						Name: "DataSpecification()",
-					},
-				)
-			}
-
-			return
+	var jsonableDataSpecification interface{}
+	jsonableDataSpecification, err = ToJsonable(
+		that.DataSpecification(),
+	)
+	if err != nil {
+		if seriaErr, ok := err.(*SerializationError); ok {
+			seriaErr.Path.PrependName(
+				&aasreporting.NameSegment{
+					Name: "DataSpecification()",
+				},
+			)
 		}
-		result["dataSpecification"] = jsonableDataSpecification
+
+		return
 	}
+	result["dataSpecification"] = jsonableDataSpecification
 
 	return
 }
diff --git a/testdata/Descend/AdministrativeInformation/maximal.json.trace b/testdata/Descend/AdministrativeInformation/maximal.json.trace
index 61239746..24e4b275 100644
--- a/testdata/Descend/AdministrativeInformation/maximal.json.trace
+++ b/testdata/Descend/AdministrativeInformation/maximal.json.trace
@@ -5,3 +5,5 @@ LangStringPreferredNameTypeIec61360
 LangStringPreferredNameTypeIec61360
 Reference
 Key
+Reference
+Key
diff --git a/testdata/Descend/AnnotatedRelationshipElement/maximal.json.trace b/testdata/Descend/AnnotatedRelationshipElement/maximal.json.trace
index 2deed3fb..38e6194c 100644
--- a/testdata/Descend/AnnotatedRelationshipElement/maximal.json.trace
+++ b/testdata/Descend/AnnotatedRelationshipElement/maximal.json.trace
@@ -15,4 +15,6 @@ Reference
 Key
 Reference
 Key
+Reference
+Key
 MultiLanguageProperty with ID-short "something_41aa6b27"
diff --git a/testdata/Descend/AssetAdministrationShell/maximal.json.trace b/testdata/Descend/AssetAdministrationShell/maximal.json.trace
index a5eeb785..33faf539 100644
--- a/testdata/Descend/AssetAdministrationShell/maximal.json.trace
+++ b/testdata/Descend/AssetAdministrationShell/maximal.json.trace
@@ -9,6 +9,8 @@ LangStringPreferredNameTypeIec61360
 LangStringPreferredNameTypeIec61360
 Reference
 Key
+Reference
+Key
 AssetInformation
 Reference
 Key
diff --git a/testdata/Descend/BasicEventElement/maximal.json.trace b/testdata/Descend/BasicEventElement/maximal.json.trace
index 10e0a65a..874e6b7d 100644
--- a/testdata/Descend/BasicEventElement/maximal.json.trace
+++ b/testdata/Descend/BasicEventElement/maximal.json.trace
@@ -15,3 +15,5 @@ Reference
 Key
 Reference
 Key
+Reference
+Key
diff --git a/testdata/Descend/Blob/maximal.json.trace b/testdata/Descend/Blob/maximal.json.trace
index 4a629b5d..44109e90 100644
--- a/testdata/Descend/Blob/maximal.json.trace
+++ b/testdata/Descend/Blob/maximal.json.trace
@@ -11,3 +11,5 @@ EmbeddedDataSpecification
 DataSpecificationIec61360
 LangStringPreferredNameTypeIec61360
 LangStringPreferredNameTypeIec61360
+Reference
+Key
diff --git a/testdata/Descend/Capability/maximal.json.trace b/testdata/Descend/Capability/maximal.json.trace
index 87501c7b..b135c6ea 100644
--- a/testdata/Descend/Capability/maximal.json.trace
+++ b/testdata/Descend/Capability/maximal.json.trace
@@ -11,3 +11,5 @@ EmbeddedDataSpecification
 DataSpecificationIec61360
 LangStringPreferredNameTypeIec61360
 LangStringPreferredNameTypeIec61360
+Reference
+Key
diff --git a/testdata/Descend/ConceptDescription/maximal.json.trace b/testdata/Descend/ConceptDescription/maximal.json.trace
index ed8bb997..1a43f804 100644
--- a/testdata/Descend/ConceptDescription/maximal.json.trace
+++ b/testdata/Descend/ConceptDescription/maximal.json.trace
@@ -9,3 +9,5 @@ LangStringPreferredNameTypeIec61360
 LangStringPreferredNameTypeIec61360
 Reference
 Key
+Reference
+Key
diff --git a/testdata/Descend/Entity/maximal.json.trace b/testdata/Descend/Entity/maximal.json.trace
index e7680f7d..d74cc71e 100644
--- a/testdata/Descend/Entity/maximal.json.trace
+++ b/testdata/Descend/Entity/maximal.json.trace
@@ -11,4 +11,6 @@ EmbeddedDataSpecification
 DataSpecificationIec61360
 LangStringPreferredNameTypeIec61360
 LangStringPreferredNameTypeIec61360
+Reference
+Key
 Range with ID-short "something_7cdc9635"
diff --git a/testdata/Descend/File/maximal.json.trace b/testdata/Descend/File/maximal.json.trace
index 21d1b291..cfeb6f89 100644
--- a/testdata/Descend/File/maximal.json.trace
+++ b/testdata/Descend/File/maximal.json.trace
@@ -11,3 +11,5 @@ EmbeddedDataSpecification
 DataSpecificationIec61360
 LangStringPreferredNameTypeIec61360
 LangStringPreferredNameTypeIec61360
+Reference
+Key
diff --git a/testdata/Descend/MultiLanguageProperty/maximal.json.trace b/testdata/Descend/MultiLanguageProperty/maximal.json.trace
index 32f23fc9..53e00011 100644
--- a/testdata/Descend/MultiLanguageProperty/maximal.json.trace
+++ b/testdata/Descend/MultiLanguageProperty/maximal.json.trace
@@ -11,6 +11,8 @@ EmbeddedDataSpecification
 DataSpecificationIec61360
 LangStringPreferredNameTypeIec61360
 LangStringPreferredNameTypeIec61360
+Reference
+Key
 LangStringTextType
 Reference
 Key
diff --git a/testdata/Descend/Operation/maximal.json.trace b/testdata/Descend/Operation/maximal.json.trace
index 49dce723..7ff00aeb 100644
--- a/testdata/Descend/Operation/maximal.json.trace
+++ b/testdata/Descend/Operation/maximal.json.trace
@@ -11,6 +11,8 @@ EmbeddedDataSpecification
 DataSpecificationIec61360
 LangStringPreferredNameTypeIec61360
 LangStringPreferredNameTypeIec61360
+Reference
+Key
 OperationVariable
 Entity with ID-short "something_c8b0a9a0"
 OperationVariable
diff --git a/testdata/Descend/Property/maximal.json.trace b/testdata/Descend/Property/maximal.json.trace
index 201b4728..d3212867 100644
--- a/testdata/Descend/Property/maximal.json.trace
+++ b/testdata/Descend/Property/maximal.json.trace
@@ -13,3 +13,5 @@ LangStringPreferredNameTypeIec61360
 LangStringPreferredNameTypeIec61360
 Reference
 Key
+Reference
+Key
diff --git a/testdata/Descend/Range/maximal.json.trace b/testdata/Descend/Range/maximal.json.trace
index b65b3d91..26256dba 100644
--- a/testdata/Descend/Range/maximal.json.trace
+++ b/testdata/Descend/Range/maximal.json.trace
@@ -11,3 +11,5 @@ EmbeddedDataSpecification
 DataSpecificationIec61360
 LangStringPreferredNameTypeIec61360
 LangStringPreferredNameTypeIec61360
+Reference
+Key
diff --git a/testdata/Descend/ReferenceElement/maximal.json.trace b/testdata/Descend/ReferenceElement/maximal.json.trace
index 56c1815b..a7e3f67f 100644
--- a/testdata/Descend/ReferenceElement/maximal.json.trace
+++ b/testdata/Descend/ReferenceElement/maximal.json.trace
@@ -13,3 +13,5 @@ LangStringPreferredNameTypeIec61360
 LangStringPreferredNameTypeIec61360
 Reference
 Key
+Reference
+Key
diff --git a/testdata/Descend/RelationshipElement/maximal.json.trace b/testdata/Descend/RelationshipElement/maximal.json.trace
index b638161f..4e3fa611 100644
--- a/testdata/Descend/RelationshipElement/maximal.json.trace
+++ b/testdata/Descend/RelationshipElement/maximal.json.trace
@@ -15,3 +15,5 @@ Reference
 Key
 Reference
 Key
+Reference
+Key
diff --git a/testdata/Descend/Submodel/maximal.json.trace b/testdata/Descend/Submodel/maximal.json.trace
index 77633dce..36057b43 100644
--- a/testdata/Descend/Submodel/maximal.json.trace
+++ b/testdata/Descend/Submodel/maximal.json.trace
@@ -12,6 +12,8 @@ EmbeddedDataSpecification
 DataSpecificationIec61360
 LangStringPreferredNameTypeIec61360
 LangStringPreferredNameTypeIec61360
+Reference
+Key
 AnnotatedRelationshipElement with ID-short "something3fdd3eb4"
 Reference
 Key
diff --git a/testdata/Descend/SubmodelElementCollection/maximal.json.trace b/testdata/Descend/SubmodelElementCollection/maximal.json.trace
index 24c10564..c8383a38 100644
--- a/testdata/Descend/SubmodelElementCollection/maximal.json.trace
+++ b/testdata/Descend/SubmodelElementCollection/maximal.json.trace
@@ -11,4 +11,6 @@ EmbeddedDataSpecification
 DataSpecificationIec61360
 LangStringPreferredNameTypeIec61360
 LangStringPreferredNameTypeIec61360
+Reference
+Key
 MultiLanguageProperty with ID-short "somethingd2cab823"
diff --git a/testdata/Descend/SubmodelElementList/maximal.json.trace b/testdata/Descend/SubmodelElementList/maximal.json.trace
index 5ef3a87b..60a7df3b 100644
--- a/testdata/Descend/SubmodelElementList/maximal.json.trace
+++ b/testdata/Descend/SubmodelElementList/maximal.json.trace
@@ -13,4 +13,6 @@ LangStringPreferredNameTypeIec61360
 LangStringPreferredNameTypeIec61360
 Reference
 Key
+Reference
+Key
 Entity with ID-short null
diff --git a/testdata/DeserializationError/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/EmbeddedDataSpecification/dataSpecification.json.error b/testdata/DeserializationError/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/EmbeddedDataSpecification/dataSpecification.json.error
new file mode 100644
index 00000000..0698261f
--- /dev/null
+++ b/testdata/DeserializationError/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/EmbeddedDataSpecification/dataSpecification.json.error
@@ -0,0 +1 @@
+assetAdministrationShells[0].embeddedDataSpecifications[0].dataSpecification: Expected a JSON object, but got null
diff --git a/testdata/DeserializationError/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/EmbeddedDataSpecification/dataSpecification.json.error b/testdata/DeserializationError/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/EmbeddedDataSpecification/dataSpecification.json.error
new file mode 100644
index 00000000..5f37106e
--- /dev/null
+++ b/testdata/DeserializationError/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/EmbeddedDataSpecification/dataSpecification.json.error
@@ -0,0 +1 @@
+assetAdministrationShells[0].embeddedDataSpecifications[0]: The required property 'dataSpecification' is missing
diff --git a/testdata/DeserializationError/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/embeddedDataSpecification/dataSpecification.xml.error b/testdata/DeserializationError/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/embeddedDataSpecification/dataSpecification.xml.error
new file mode 100644
index 00000000..38e747d9
--- /dev/null
+++ b/testdata/DeserializationError/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/embeddedDataSpecification/dataSpecification.xml.error
@@ -0,0 +1 @@
+assetAdministrationShells/*[0]/embeddedDataSpecifications/*[0]: The required property 'dataSpecification' is missing
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/maximal.json
index 1d3553c7..b2b30310 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/maximal.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/four_digits.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/four_digits.json
index 962bba76..df356448 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/four_digits.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/four_digits.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_01.json
index da26d117..a3ea2af3 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_01.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_02.json
index 16e65e7e..96392f00 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_02.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_03.json
index 5b3547ce..60716480 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_03.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_04.json
index 5cb251c2..48657246 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/fuzzed_04.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/one.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/one.json
index eb90563a..e89a595b 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/one.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/one.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/three_digits.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/three_digits.json
index d4313d16..c641e744 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/three_digits.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/three_digits.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/two_digits.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/two_digits.json
index 16a89197..754aee28 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/two_digits.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/two_digits.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/zero.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/zero.json
index 1d3553c7..b2b30310 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/zero.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/revisionOverPatternExamples/zero.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/four_digits.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/four_digits.json
index 1d3553c7..b2b30310 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/four_digits.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/four_digits.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_01.json
index 24a1ea5a..2cda61bf 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_01.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_02.json
index 7ace2d5d..94f1d682 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_02.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_03.json
index 9ae8313b..b1049206 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_03.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_04.json
index 8dc79350..65b6d8b4 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/fuzzed_04.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/one.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/one.json
index 50562d88..36c2af48 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/one.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/one.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/three_digits.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/three_digits.json
index 79c53ff4..699ba25e 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/three_digits.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/three_digits.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/two_digits.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/two_digits.json
index dde2cb27..c2aa1650 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/two_digits.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/two_digits.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/zero.json b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/zero.json
index d4add4db..1fb7fa3c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/zero.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AdministrativeInformation/versionOverPatternExamples/zero.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_01.json
index a52e1106..5d1419c4 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_01.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_02.json
index 13a9791f..ca36b66a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_02.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_03.json
index 5df93c99..311f6089 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_03.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_04.json
index 248f8221..ee620a9b 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_04.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_05.json
index 1867bba7..ae3e374c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_05.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_06.json
index fdb2dbb9..549e8f0e 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_06.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_07.json
index 64cc1344..dca94a6f 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_07.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_08.json
index 77bc9842..d3a12e73 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_08.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_09.json
index cd2bafb3..95ef4720 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_09.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_10.json
index 5c93e811..458851f1 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/idShortOverPatternExamples/fuzzed_10.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/maximal.json
index cd2bafb3..95ef4720 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AnnotatedRelationshipElement/maximal.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_01.json
index e16cbce3..0bbd6d23 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_01.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_02.json
index 9eb022b5..2a5810e7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_02.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_03.json
index 76ed3264..4e4b9c93 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_03.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_04.json
index 1625933f..a486efb7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_04.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_05.json
index 9b2d6200..e94adfc1 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_05.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_06.json
index ab32fcb2..678ff050 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_06.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_07.json
index 45fd5f8f..9b7511c7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_07.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_08.json
index 452f4cd9..dbc6fdc5 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_08.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_09.json
index cbc2550f..367e7390 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_09.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_10.json
index 68730bb6..fe1d8efb 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/idShortOverPatternExamples/fuzzed_10.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/maximal.json
index cbc2550f..367e7390 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AssetAdministrationShell/maximal.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/AssetInformation/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/AssetInformation/maximal.json
index de5ee86a..14a5305a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/AssetInformation/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/AssetInformation/maximal.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "assetType": "something_9f4c5692",
         "defaultThumbnail": {
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_c71f0c8f"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_01.json
index 6beb1c7f..cc53f399 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_01.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_02.json
index 5343206b..9d4766f1 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_02.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_03.json
index 33efb059..c154bf1f 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_03.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_04.json
index f484785b..e511f67e 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_04.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_05.json
index 5452c356..c53c917c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_05.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_06.json
index ef3235e3..e759ee0d 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_06.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_07.json
index f575cd27..f6b8c0e7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_07.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_08.json
index 54a0a2a0..06adf16c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_08.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_09.json
index 211662d0..1c37ad13 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_09.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_10.json
index 2b76274b..bfbe4c37 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/idShortOverPatternExamples/fuzzed_10.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/fuzzed_01.json
index bd7debde..8f2b071e 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/fuzzed_01.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/fuzzed_02.json
index b5ea8a9c..3a27bbee 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/fuzzed_02.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/fuzzed_03.json
index 211662d0..1c37ad13 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/fuzzed_03.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/midnight_with_24_hours.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/midnight_with_24_hours.json
index 31f5bf03..3c5a26e1 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/midnight_with_24_hours.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/midnight_with_24_hours.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/midnight_with_zeros.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/midnight_with_zeros.json
index 28b5d1cd..8e31118e 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/midnight_with_zeros.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/midnight_with_zeros.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/minus_zero_offset.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/minus_zero_offset.json
index f1fe85e4..1abbf790 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/minus_zero_offset.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/minus_zero_offset.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/plus_zero_offset.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/plus_zero_offset.json
index 2465dd28..292045ca 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/plus_zero_offset.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/plus_zero_offset.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/random_positive.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/random_positive.json
index 721c4b7a..81eff8e0 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/random_positive.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/random_positive.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/very_large_year.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/very_large_year.json
index 993b133c..17e9f40a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/very_large_year.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/very_large_year.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/very_long_fractional_second.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/very_long_fractional_second.json
index a0bbf8a6..6d43e173 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/very_long_fractional_second.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/very_long_fractional_second.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/year_1_bce_is_a_leap_year.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/year_1_bce_is_a_leap_year.json
index 80555ece..186bda3a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/year_1_bce_is_a_leap_year.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/year_1_bce_is_a_leap_year.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/year_5_bce_is_a_leap_year.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/year_5_bce_is_a_leap_year.json
index 2d62dd2c..9676dc75 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/year_5_bce_is_a_leap_year.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/lastUpdateOverPatternExamples/year_5_bce_is_a_leap_year.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/day_seconds.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/day_seconds.json
index 43376573..0fa0c2b3 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/day_seconds.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/day_seconds.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/full.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/full.json
index a2e09134..ddb16d80 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/full.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/full.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_01.json
index 14f0b3b1..de381e84 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_01.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_02.json
index dd192c1d..fb4c4c53 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_02.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_03.json
index bc8a6f86..a7e830d0 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_03.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_04.json
index 04160cd1..9a02d3fb 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_04.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_05.json
index e8e4d0e0..8be8d60f 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_05.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_06.json
index b4305ed4..4abe9aef 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_06.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_07.json
index 0f4cdd06..f7daa590 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_07.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_08.json
index 2f040533..e8ee212c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_08.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_09.json
index 4861f224..6564c5d4 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_09.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_10.json
index 8573b3b3..37eeeda6 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/fuzzed_10.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/long_second_fractal.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/long_second_fractal.json
index e418e9b4..081080b1 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/long_second_fractal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/long_second_fractal.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/many_many_seconds.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/many_many_seconds.json
index 70d8cf01..7b249375 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/many_many_seconds.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/many_many_seconds.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/month_seconds.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/month_seconds.json
index 599f40ee..24d79071 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/month_seconds.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/month_seconds.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/only_seconds.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/only_seconds.json
index 211662d0..1c37ad13 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/only_seconds.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/only_seconds.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/only_year.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/only_year.json
index 7fc675de..aef0697f 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/only_year.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maxIntervalOverPatternExamples/only_year.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maximal.json
index 211662d0..1c37ad13 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/maximal.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/day_seconds.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/day_seconds.json
index bc07052e..5f663e4e 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/day_seconds.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/day_seconds.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/full.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/full.json
index 9493feb8..8a03fc15 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/full.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/full.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_01.json
index d4a5349c..d3373be7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_01.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_02.json
index d416c0fc..418c3164 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_02.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_03.json
index c70aa4da..4d3ac3eb 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_03.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_04.json
index 5c5adf7d..b4354b5a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_04.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_05.json
index 12cf0307..80724cf1 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_05.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_06.json
index 640c609d..f433d1a2 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_06.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_07.json
index 7ed8de7a..363639f1 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_07.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_08.json
index 31292db2..724e7be4 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_08.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_09.json
index 09d19fc1..e3d709b0 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_09.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_10.json
index 58a3beea..b3130ad4 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/fuzzed_10.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/long_second_fractal.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/long_second_fractal.json
index 76d4fdf1..c8d29cdc 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/long_second_fractal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/long_second_fractal.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/many_many_seconds.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/many_many_seconds.json
index 3db6b12c..8c0191a3 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/many_many_seconds.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/many_many_seconds.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/month_seconds.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/month_seconds.json
index 15b7b8b3..3bdd8948 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/month_seconds.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/month_seconds.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/only_seconds.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/only_seconds.json
index 3c53d392..56ef859c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/only_seconds.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/only_seconds.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/only_year.json b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/only_year.json
index 211662d0..1c37ad13 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/only_year.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/BasicEventElement/minIntervalOverPatternExamples/only_year.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/dash.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/dash.json
index 912d3d71..e803936f 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/dash.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/dash.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/dots.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/dots.json
index fcf49f76..a24e6331 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/dots.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/dots.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/fuzzed_01.json
index 7f0789c7..f3344871 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/fuzzed_01.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/fuzzed_02.json
index bb8d5ec4..11775f78 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/fuzzed_02.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/fuzzed_03.json
index a47b0b77..5b85523a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/fuzzed_03.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/number prefix and suffix.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/number prefix and suffix.json
index 4bacb095..f69d6f5a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/number prefix and suffix.json	
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/number prefix and suffix.json	
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/only_letters.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/only_letters.json
index b74faea0..9834bc73 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/only_letters.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/only_letters.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/plus.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/plus.json
index 07b7d7d0..6560dd09 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/plus.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/plus.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/random_common_MIME_type.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/random_common_MIME_type.json
index 4ee58fc0..1f3cb1c7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/random_common_MIME_type.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/contentTypeOverPatternExamples/random_common_MIME_type.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_01.json
index 2cdc6769..c0555034 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_01.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_02.json
index 057c34ed..4724fe93 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_02.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_03.json
index d6abaed9..16cccfcb 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_03.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_04.json
index ad1c6fcf..cc614f63 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_04.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_05.json
index 260577e9..213a1cf1 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_05.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_06.json
index 1e360cbf..2bff1d1b 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_06.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_07.json
index 73d09f6b..d008cef2 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_07.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_08.json
index bbf07e00..d284d8b4 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_08.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_09.json
index a47b0b77..5b85523a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_09.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_10.json
index 4285d6f4..fe5cfa5e 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/idShortOverPatternExamples/fuzzed_10.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Blob/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/Blob/maximal.json
index a47b0b77..5b85523a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Blob/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Blob/maximal.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_01.json
index 5d5f0f3d..b49b6df8 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_02.json
index 82f81057..e7feb834 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_03.json
index c31a3f8a..856651f7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_04.json
index 5ed3db33..de02313f 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_05.json
index 6307374a..9cbb3f90 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_06.json
index 9b756cd1..1d02e33f 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_07.json
index cdcaabc3..bd19cad7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_08.json
index 9ab5b8ea..7d44e0a5 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_09.json
index 745ce0af..c812d4a8 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_10.json
index 36adef3f..379beb3a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Capability/idShortOverPatternExamples/fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Capability/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/Capability/maximal.json
index 745ce0af..c812d4a8 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Capability/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Capability/maximal.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_01.json
index f8f71d9a..359dfa16 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_01.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_02.json
index 7146c26b..af3c9e64 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_02.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_03.json
index a20baef9..cf1f298d 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_03.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_04.json
index df5a86b3..a1993e5c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_04.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_05.json
index 3198ec03..1b707ccc 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_05.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_06.json
index fbd23371..8d4389ad 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_06.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_07.json
index 57db4240..7bf8fc17 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_07.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_08.json
index bfadae27..16e205c2 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_08.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_09.json
index 5f543520..2e967ae1 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_09.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_10.json
index 6b1fc729..bfca98f6 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/idShortOverPatternExamples/fuzzed_10.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/maximal.json
index 6b1fc729..bfca98f6 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ConceptDescription/maximal.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/DataSpecificationIec61360/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/DataSpecificationIec61360/maximal.json
index 6092e72c..d6b775f7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/DataSpecificationIec61360/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/DataSpecificationIec61360/maximal.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/DataSpecificationIec61360/minimal.json b/testdata/Json/ContainedInEnvironment/Expected/DataSpecificationIec61360/minimal.json
index a0fd946c..687028d5 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/DataSpecificationIec61360/minimal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/DataSpecificationIec61360/minimal.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/EmbeddedDataSpecification/minimal.json b/testdata/Json/ContainedInEnvironment/Expected/EmbeddedDataSpecification/minimal.json
index a0fd946c..687028d5 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/EmbeddedDataSpecification/minimal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/EmbeddedDataSpecification/minimal.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_01.json
index de27839d..af4253b5 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_02.json
index 6d27132e..9f352fc3 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_03.json
index fb42ce63..f99159dd 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_04.json
index e83b96f2..03ac6edf 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_05.json
index c10f0203..606d295d 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_06.json
index edf701c0..a21ec507 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_07.json
index f3f2c4c9..bd81544a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_08.json
index 21c7b1d3..40a2e8fe 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_09.json
index 7812ab09..e3c0dc3b 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_10.json
index 6163ed6a..e36c55d5 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Entity/idShortOverPatternExamples/fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Entity/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/Entity/maximal.json
index 7812ab09..e3c0dc3b 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Entity/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Entity/maximal.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/dash.json b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/dash.json
index eaae9db1..e0b30a43 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/dash.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/dash.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/dots.json b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/dots.json
index 25526069..94435fc0 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/dots.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/dots.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/fuzzed_01.json
index 164ab230..9b8b9fd2 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/fuzzed_01.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/fuzzed_02.json
index 48f7f65d..b9f22bd7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/fuzzed_02.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/fuzzed_03.json
index e360ef15..9d8c3fc3 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/fuzzed_03.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/number prefix and suffix.json b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/number prefix and suffix.json
index aedc1862..a88768f7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/number prefix and suffix.json	
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/number prefix and suffix.json	
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/only_letters.json b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/only_letters.json
index 8d65b33c..2e76fc73 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/only_letters.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/only_letters.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/plus.json b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/plus.json
index 5bae8307..05631ebb 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/plus.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/plus.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/random_common_MIME_type.json b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/random_common_MIME_type.json
index b952cefb..f5bfbe84 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/random_common_MIME_type.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/contentTypeOverPatternExamples/random_common_MIME_type.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_01.json
index 87778aa7..fb3b3481 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_01.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_02.json
index c42f5d8b..d73971ab 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_02.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_03.json
index f194655f..e606f762 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_03.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_04.json
index b10d6597..016c5d3e 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_04.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_05.json
index 78700fbd..d60411c3 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_05.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_06.json
index 50c2522a..b5798dab 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_06.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_07.json
index 30f51dea..7cd64b2f 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_07.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_08.json
index 654ea203..1ace3932 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_08.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_09.json
index e360ef15..9d8c3fc3 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_09.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_10.json
index 5b91e8c6..78e64a9a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/idShortOverPatternExamples/fuzzed_10.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/File/maximal.json
index e360ef15..9d8c3fc3 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/File/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/File/maximal.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/valueOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/File/valueOverPatternExamples/fuzzed_01.json
deleted file mode 100644
index 41098f76..00000000
--- a/testdata/Json/ContainedInEnvironment/Expected/File/valueOverPatternExamples/fuzzed_01.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/valueOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/File/valueOverPatternExamples/fuzzed_02.json
deleted file mode 100644
index 08fc71b2..00000000
--- a/testdata/Json/ContainedInEnvironment/Expected/File/valueOverPatternExamples/fuzzed_02.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "file:///;/@@=%5a@@g@=S%D8:%f5;/@:/%A3&!%f8%6e;%a1!//~/%Ae%c2/%99O@,:"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/valueOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/File/valueOverPatternExamples/fuzzed_03.json
deleted file mode 100644
index c3a48638..00000000
--- a/testdata/Json/ContainedInEnvironment/Expected/File/valueOverPatternExamples/fuzzed_03.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "file://localhost/C:"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/valueOverPatternExamples/local_absolute_path_with_scheme.json b/testdata/Json/ContainedInEnvironment/Expected/File/valueOverPatternExamples/local_absolute_path_with_scheme.json
deleted file mode 100644
index e360ef15..00000000
--- a/testdata/Json/ContainedInEnvironment/Expected/File/valueOverPatternExamples/local_absolute_path_with_scheme.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "file:/path/to/somewhere"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Expected/File/valueOverPatternExamples/local_file_with_an_explicit_authority.json b/testdata/Json/ContainedInEnvironment/Expected/File/valueOverPatternExamples/local_file_with_an_explicit_authority.json
deleted file mode 100644
index e7904f57..00000000
--- a/testdata/Json/ContainedInEnvironment/Expected/File/valueOverPatternExamples/local_file_with_an_explicit_authority.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "file://host.example.com/path/to/file"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.json
index 7e29bc32..a2a67879 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.json
index 09b57a5b..e67fcb47 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.json
index 516ebab2..f4265091 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.json
index 9c72834e..367e8d38 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_1.json
index 24bc1407..b9ffc82a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_2.json
index a2a362f9..a8940aba 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_3.json
index d69518f6..b47a3040 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_1.json
index 5e50b3c5..03d061d3 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_2.json
index 60e174f0..dc815a4b 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_1.json
index 8dad817b..4ece1ac7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_2.json
index 7bedf5d6..82c5b47c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_variant.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_variant.json
index 764b5420..e5d62355 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_variant.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_variant.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.json
index 3d640b50..0bb662a0 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.json
index 8a1ea4d3..9d2b173d 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.json
index 7c6514d8..d987efe7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.json
index 579ccbe6..5f3912ba 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_1.json
index a1c81000..0921f6fa 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_2.json
index 00f3e009..bed53152 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_3.json
index 9cad5ee0..61da67d6 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.json
index 6ac0c3dd..2623d04e 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.json
index 64e7cbbf..9fdecdfa 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.json
index 51b9d6c0..b84f77ae 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.json
index 64e36ba8..03ca060f 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.json
index 04b0f683..e6477022 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_1.json
index 11ff4684..60c50981 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_2.json
index b603cd73..d8436399 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.json
index a6e775a3..1a90620a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.json
index ab0851c7..83118d06 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.json
index 83c2e66a..5f44a588 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.json
index eb696d01..7932404a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_1.json
index 4f4a2445..096b1226 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_2.json
index c6cf1957..730af03b 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_3.json
index c7775a90..afcb7c27 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/maximal.json
index a2a362f9..a8940aba 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/maximal.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/minimal.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/minimal.json
index a2a362f9..a8940aba 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/minimal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringDefinitionTypeIec61360/minimal.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.json
index 4935a76d..90c3e4a6 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.json
index 4bc076ed..a66e8f80 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.json
index 18b4ec10..db04004e 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.json
index da8704cb..d60913a0 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_1.json
index 7e99bbdb..807818e5 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_2.json
index 98741f7b..3e1ba7ca 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_3.json
index ea2d454b..49d05e68 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.json
index e444f966..0d5229cf 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.json
index 3aa92570..065f7ec9 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_1.json
index 2308c06b..acbb42ba 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_2.json
index 774c4dbe..4906c01c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.json
index 50ec4d92..f907b746 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.json
index 509ad641..e66d6956 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.json
index fe5d6091..710133a9 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.json
index fd4683c0..63b015e2 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.json
index 6bf4d68e..6e9798d1 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_1.json
index dd285835..7a2c48e2 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_2.json
index 0a651406..9267837d 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_3.json
index 561cb258..e4f76f30 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.json
index 42293125..ec2084b8 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.json
index 2b10eecb..f0aa4d33 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.json
index 4e774e78..8b3a428e 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.json
index 66b9a6cf..4bc84e30 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.json
index 093578c8..0e08999b 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.json
index 1ee6e852..97817354 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.json
index 9a0fb3d5..acccbee1 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.json
index a99f75a8..eccb034c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.json
index 82bd8557..fbabaef8 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.json
index 0a84455f..ef4b8ca9 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.json
index 9c8557c1..46b65b8a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.json
index 393c67e9..871237a7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.json
index d96c4458..ec780c54 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.json
index 3d4d4cba..17a74924 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/maximal.json
index 0a651406..9267837d 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/maximal.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/minimal.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/minimal.json
index 0a651406..9267837d 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/minimal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringPreferredNameTypeIec61360/minimal.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.json
index 7419def1..d6c66e7d 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.json
index 2994a93e..5ff62b4d 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.json
index 7b387f6e..2cee2683 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.json
index 55c57885..638ed035 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_1.json
index d106b404..8adf9329 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_2.json
index 28be883c..3a0dbe45 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_3.json
index 5f670530..ec82c3cb 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.json
index 147bcdee..08c0b409 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.json
index 950785c8..2b70ba50 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_1.json
index 3c498f03..1b4b9fc8 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_2.json
index 0afe9a72..b4073a67 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.json
index 93eda14b..01d6af09 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.json
index 8cb01945..a371a559 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.json
index 4863518a..692da434 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.json
index c4c4cfaf..94497596 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.json
index a6e06e7c..c75beaac 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_1.json
index 4c581754..4cfa2cdd 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_2.json
index 0a782ed1..d98ac524 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_3.json
index 2dfe4165..21b52210 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.json
index 8b5dffed..a8d87eca 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.json
index fa84f819..0b9c7587 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.json
index aa8c0a91..bf62fa13 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.json
index 3a754063..de9cbba2 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.json
index e284f271..50211263 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.json
index 7809b6eb..2e575e51 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.json
index c0b60933..4f5ad5d9 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.json
index 24ee5e69..96ace49b 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.json
index 7c314e55..b6d1eeb7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.json
index d8598d08..345bd223 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.json
index 5fdc8a6f..d7a30cb0 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.json
index 85a2fdde..1c5485d7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.json
index 9792b655..5d4276ac 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.json
index 43371985..fc5ecec9 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/maximal.json
index 2994a93e..5ff62b4d 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/maximal.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/minimal.json b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/minimal.json
index 2994a93e..5ff62b4d 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/minimal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LangStringShortNameTypeIec61360/minimal.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LevelType/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/LevelType/maximal.json
index 2270453e..d699b08c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LevelType/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LevelType/maximal.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "levelType": {
               "max": true,
diff --git a/testdata/Json/ContainedInEnvironment/Expected/LevelType/minimal.json b/testdata/Json/ContainedInEnvironment/Expected/LevelType/minimal.json
index 2270453e..d699b08c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/LevelType/minimal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/LevelType/minimal.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "levelType": {
               "max": true,
diff --git a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_01.json
index 154abd3d..0f2d6434 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_02.json
index 8e834c61..ce966077 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_03.json
index 01d4ca99..9fbb2be8 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_04.json
index 72eb6560..b0a9fc1e 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_05.json
index 24826784..d36aefcb 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_06.json
index 74d4885d..31d13937 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_07.json
index 56e916a8..28c3d018 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_08.json
index e6d36c85..04c7b6b3 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_09.json
index adcaff43..a79eab8c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_10.json
index 0f494826..61389859 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/idShortOverPatternExamples/fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/maximal.json
index adcaff43..a79eab8c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/MultiLanguageProperty/maximal.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_01.json
index 6b7e6c66..4dc6cd9c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_02.json
index b1f73a50..43358922 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_03.json
index d93f87f8..26dc2124 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_04.json
index 9e96096a..46c798de 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_05.json
index e92c0bfe..6f934f31 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_06.json
index 76ffc7fd..a3fecefb 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_07.json
index 621e43f1..ec93e172 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_08.json
index aca33d84..7a64cca1 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_09.json
index 5348d2e7..4ec974c9 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_10.json
index db59ba8e..88f94140 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Operation/idShortOverPatternExamples/fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Operation/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/Operation/maximal.json
index 5348d2e7..4ec974c9 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Operation/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Operation/maximal.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_01.json
index 77f0a23c..f631d958 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_02.json
index 9996c21f..5873710f 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_03.json
index c650916b..08aa4632 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_04.json
index 158d00dd..5960e26d 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_05.json
index 6050cff6..98227ddc 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_06.json
index 811a4aa9..7fea966c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_07.json
index 8c3910f2..2c506e67 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_08.json
index b726153a..af183e8f 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_09.json
index 93e85dfe..e44dd3b2 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_10.json
index 0fd6b3ae..b0f6fc8c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Property/idShortOverPatternExamples/fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Property/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/Property/maximal.json
index 93e85dfe..e44dd3b2 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Property/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Property/maximal.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_01.json
index b7fd4ac0..e5bd53c4 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_02.json
index 65e4bf4d..717edf1c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_03.json
index c4ba8e88..e780b2c9 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_04.json
index 097031e6..614b4359 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_05.json
index 344bd44c..b3588986 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_06.json
index 32cfaf85..3649ab4c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_07.json
index ade23479..c6330d27 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_08.json
index f2cc713b..81a3632a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_09.json
index 27445b23..48d1e877 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_10.json
index eae69408..5c0559e8 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Range/idShortOverPatternExamples/fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Range/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/Range/maximal.json
index 27445b23..48d1e877 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Range/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Range/maximal.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_01.json
index ce079b6e..01b07045 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_02.json
index db9bd117..333017f7 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_03.json
index b18002c4..44cb26ba 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_04.json
index 4dbdc7d7..6bc30d9b 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_05.json
index 9b23b3c4..aa4d899f 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_06.json
index 445b6707..fabfe089 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_07.json
index 331972a8..c00259b0 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_08.json
index 567d5391..9e267149 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_09.json
index 57e2935b..55b0ea68 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_10.json
index 9328195c..89441a49 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/idShortOverPatternExamples/fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/maximal.json
index 57e2935b..55b0ea68 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ReferenceElement/maximal.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_01.json
index a7e7c9b2..78f65296 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_02.json
index e4ef9be5..76f22e17 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_03.json
index 656f5a6d..4d7e67be 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_04.json
index efd87150..0782ae6b 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_05.json
index 3c8a8339..3da8da37 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_06.json
index da416657..9213eca3 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_07.json
index 03654623..0ae819a9 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_08.json
index 4fbb2d22..bf4d8b1b 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_09.json
index 70bcfeed..2cb6fb91 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_10.json
index 593397de..faf24d8d 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/idShortOverPatternExamples/fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/maximal.json
index 70bcfeed..2cb6fb91 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/RelationshipElement/maximal.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/dash.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/dash.json
index a40a4fba..f87e17a0 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/dash.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/dash.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "application/x-abiword",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/dots.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/dots.json
index 3942ad68..a532d3ad 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/dots.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/dots.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "application/vnd.amazon.ebook",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/fuzzed_01.json
index 2ab1f0cb..5e068bc5 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/fuzzed_01.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "7/6qwqh6g",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/fuzzed_02.json
index 1c255615..c68542b0 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/fuzzed_02.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "15j/5j",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/fuzzed_03.json
index bc0a247c..063e529a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/fuzzed_03.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/number prefix and suffix.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/number prefix and suffix.json
index 835f8031..482e3282 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/number prefix and suffix.json	
+++ b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/number prefix and suffix.json	
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "audio/3gpp2",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/only_letters.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/only_letters.json
index c8031599..d82143e9 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/only_letters.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/only_letters.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "audio/aac",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/plus.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/plus.json
index d9e65092..12bd278b 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/plus.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/plus.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "application/vnd.apple.installer+xml",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/random_common_MIME_type.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/random_common_MIME_type.json
index 1bf9a008..4ff0d7a1 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/random_common_MIME_type.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Resource/contentTypeOverPatternExamples/random_common_MIME_type.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "application/something-random",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/maximal.json
index a40a4fba..f87e17a0 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Resource/maximal.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "application/x-abiword",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/minimal.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/minimal.json
index e320ba76..3a251952 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/minimal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Resource/minimal.json
@@ -4,7 +4,7 @@
       "assetInformation": {
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/pathOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/pathOverPatternExamples/fuzzed_01.json
deleted file mode 100644
index a40a4fba..00000000
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/pathOverPatternExamples/fuzzed_01.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/pathOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/pathOverPatternExamples/fuzzed_02.json
deleted file mode 100644
index 7f3c1b55..00000000
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/pathOverPatternExamples/fuzzed_02.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "file:///;/@@=%5a@@g@=S%D8:%f5;/@:/%A3&!%f8%6e;%a1!//~/%Ae%c2/%99O@,:"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/pathOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/pathOverPatternExamples/fuzzed_03.json
deleted file mode 100644
index 9ed4929e..00000000
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/pathOverPatternExamples/fuzzed_03.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "file://localhost/C:"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/pathOverPatternExamples/local_absolute_path_with_scheme.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/pathOverPatternExamples/local_absolute_path_with_scheme.json
deleted file mode 100644
index d1a8f19c..00000000
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/pathOverPatternExamples/local_absolute_path_with_scheme.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "file:/path/to/somewhere"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Resource/pathOverPatternExamples/local_file_with_an_explicit_authority.json b/testdata/Json/ContainedInEnvironment/Expected/Resource/pathOverPatternExamples/local_file_with_an_explicit_authority.json
deleted file mode 100644
index 06c1d412..00000000
--- a/testdata/Json/ContainedInEnvironment/Expected/Resource/pathOverPatternExamples/local_file_with_an_explicit_authority.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "file://host.example.com/path/to/file"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_01.json
index 65a6415f..4bca46ce 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_01.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_02.json
index 4668ef70..9679acd2 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_02.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_03.json
index f18e28d2..6a704132 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_03.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_04.json
index c50b96e9..15f3eda5 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_04.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_05.json
index b02071fd..08e8f19d 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_05.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_06.json
index 60b79e6f..8d1bbe89 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_06.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_07.json
index 9127a18c..867aaca8 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_07.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_08.json
index eb8b652d..3d1efd7e 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_08.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_09.json
index e44fdb1c..da51906e 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_09.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_10.json
index 44030855..95b86a5c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Submodel/idShortOverPatternExamples/fuzzed_10.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/Submodel/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/Submodel/maximal.json
index 44030855..95b86a5c 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/Submodel/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/Submodel/maximal.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_01.json
index 52e53c4a..ccd60c30 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_02.json
index 24bd136a..91c42c5d 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_03.json
index d5f76dae..2ef56b51 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_04.json
index 0b286ffe..ea40864a 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_05.json
index d5672313..9d88804f 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_06.json
index 325c51ce..461e33ec 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_07.json
index fa3b52f7..7cbb0368 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_08.json
index 4724f602..9d304a08 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_09.json
index a0672afb..72168cd0 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_10.json
index 6c557d8f..35b190ae 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/idShortOverPatternExamples/fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/maximal.json
index a0672afb..72168cd0 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementCollection/maximal.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_01.json
index 53beabeb..207f6856 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_02.json
index 85031fd2..9eec5c9b 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_03.json
index 976ccfbe..d7d71066 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_04.json
index dc250e31..63ed7fa3 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_05.json
index b34fa5bc..d06a3677 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_06.json
index b7fa4000..5c1be780 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_07.json
index 8cb9eae9..28fc1432 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_08.json
index a0c0ac16..07077c42 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_09.json
index 1fe1e4af..c80347dd 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_10.json
index 03be2508..a24973e8 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/idShortOverPatternExamples/fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/maximal.json
index 1fe1e4af..c80347dd 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/SubmodelElementList/maximal.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ValueList/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/ValueList/maximal.json
index 6024a5be..fb442964 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ValueList/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ValueList/maximal.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ValueList/minimal.json b/testdata/Json/ContainedInEnvironment/Expected/ValueList/minimal.json
index 6024a5be..fb442964 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ValueList/minimal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ValueList/minimal.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ValueReferencePair/maximal.json b/testdata/Json/ContainedInEnvironment/Expected/ValueReferencePair/maximal.json
index fa80fd35..4ab75313 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ValueReferencePair/maximal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ValueReferencePair/maximal.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Expected/ValueReferencePair/minimal.json b/testdata/Json/ContainedInEnvironment/Expected/ValueReferencePair/minimal.json
index fa80fd35..4ab75313 100644
--- a/testdata/Json/ContainedInEnvironment/Expected/ValueReferencePair/minimal.json
+++ b/testdata/Json/ContainedInEnvironment/Expected/ValueReferencePair/minimal.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AdministrativeInformation/revision.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AdministrativeInformation/revision.json
index ee1d8062..ed74e835 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AdministrativeInformation/revision.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AdministrativeInformation/revision.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AdministrativeInformation/templateId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AdministrativeInformation/templateId.json
index f611d454..9230b787 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AdministrativeInformation/templateId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AdministrativeInformation/templateId.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AdministrativeInformation/version.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AdministrativeInformation/version.json
index d9375b58..282c5f68 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AdministrativeInformation/version.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AdministrativeInformation/version.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AnnotatedRelationshipElement/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AnnotatedRelationshipElement/category.json
index 46373bfd..1e94b0d0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AnnotatedRelationshipElement/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AnnotatedRelationshipElement/category.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AnnotatedRelationshipElement/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AnnotatedRelationshipElement/idShort.json
index 9a62c0c3..553fb807 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AnnotatedRelationshipElement/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AnnotatedRelationshipElement/idShort.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetAdministrationShell/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetAdministrationShell/category.json
index bf82d54c..7b0f551d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetAdministrationShell/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetAdministrationShell/category.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetAdministrationShell/id.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetAdministrationShell/id.json
index b6aa59cb..ef84f4c3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetAdministrationShell/id.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetAdministrationShell/id.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetAdministrationShell/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetAdministrationShell/idShort.json
index c9841233..a65a3451 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetAdministrationShell/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetAdministrationShell/idShort.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetInformation/assetType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetInformation/assetType.json
index 2b58ed58..f6fc079b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetInformation/assetType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetInformation/assetType.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "assetType": "something_9f4c5692123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123",
         "defaultThumbnail": {
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_c71f0c8f"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetInformation/globalAssetId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetInformation/globalAssetId.json
index b4794e4d..264d8c19 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetInformation/globalAssetId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/AssetInformation/globalAssetId.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "assetType": "something_9f4c5692",
         "defaultThumbnail": {
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_c71f0c8f123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/BasicEventElement/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/BasicEventElement/category.json
index 92cabf91..6788be79 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/BasicEventElement/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/BasicEventElement/category.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/BasicEventElement/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/BasicEventElement/idShort.json
index 92e806fc..25753cdc 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/BasicEventElement/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/BasicEventElement/idShort.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/BasicEventElement/messageTopic.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/BasicEventElement/messageTopic.json
index 1e4c26d9..c6e77a26 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/BasicEventElement/messageTopic.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/BasicEventElement/messageTopic.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Blob/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Blob/category.json
index 5dada77c..9d16944d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Blob/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Blob/category.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Blob/contentType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Blob/contentType.json
index 2ebd9b64..770bd0ab 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Blob/contentType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Blob/contentType.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Blob/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Blob/idShort.json
index b370f8f6..93021534 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Blob/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Blob/idShort.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Capability/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Capability/category.json
index f327117f..c948e263 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Capability/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Capability/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Capability/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Capability/idShort.json
index 5bd6ceea..c6889d96 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Capability/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Capability/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ConceptDescription/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ConceptDescription/category.json
index 7231aa14..be219d3c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ConceptDescription/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ConceptDescription/category.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ConceptDescription/id.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ConceptDescription/id.json
index 9f194033..dc7fe61f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ConceptDescription/id.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ConceptDescription/id.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ConceptDescription/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ConceptDescription/idShort.json
index 1e94730b..d66621ad 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ConceptDescription/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ConceptDescription/idShort.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/DataSpecificationIec61360/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/DataSpecificationIec61360/value.json
index 851284ea..dab6171c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/DataSpecificationIec61360/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/DataSpecificationIec61360/value.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Entity/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Entity/category.json
index f7c7cd37..fe1e4ef3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Entity/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Entity/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Entity/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Entity/idShort.json
index 07aba840..36f4901d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Entity/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Entity/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/category.json
index 79a96085..49611482 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/category.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/contentType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/contentType.json
index d3872e2b..1582417b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/contentType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/contentType.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/idShort.json
index 26ee96b8..59768445 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/idShort.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/value.json
index c43d0d88..f1fc4f0e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/File/value.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678"
+          "value": "something_158159bf123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/LangStringDefinitionTypeIec61360/text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/LangStringDefinitionTypeIec61360/text.json
index 5c80735c..7002e222 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/LangStringDefinitionTypeIec61360/text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/LangStringDefinitionTypeIec61360/text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/LangStringPreferredNameTypeIec61360/text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/LangStringPreferredNameTypeIec61360/text.json
index 9438486c..5df2bfb6 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/LangStringPreferredNameTypeIec61360/text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/LangStringPreferredNameTypeIec61360/text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/LangStringShortNameTypeIec61360/text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/LangStringShortNameTypeIec61360/text.json
index 3e6f87f9..85743849 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/LangStringShortNameTypeIec61360/text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/LangStringShortNameTypeIec61360/text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/MultiLanguageProperty/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/MultiLanguageProperty/category.json
index f95d18b1..2de4dd0e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/MultiLanguageProperty/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/MultiLanguageProperty/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/MultiLanguageProperty/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/MultiLanguageProperty/idShort.json
index c312e1ca..67cadb7e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/MultiLanguageProperty/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/MultiLanguageProperty/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Operation/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Operation/category.json
index 7ef4cc94..b47cfd5e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Operation/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Operation/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Operation/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Operation/idShort.json
index 2fc14dcc..4a1041ec 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Operation/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Operation/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Property/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Property/category.json
index 57944d71..e89d17f5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Property/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Property/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Property/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Property/idShort.json
index ab62a911..d61bb16d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Property/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Property/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Range/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Range/category.json
index aadb035f..70053024 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Range/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Range/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Range/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Range/idShort.json
index e6189bea..254c067d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Range/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Range/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ReferenceElement/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ReferenceElement/category.json
index 1dfcc267..790b10ed 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ReferenceElement/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ReferenceElement/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ReferenceElement/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ReferenceElement/idShort.json
index 9c3b8bc1..59f67030 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ReferenceElement/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ReferenceElement/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/RelationshipElement/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/RelationshipElement/category.json
index feb58f87..b8dc0e25 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/RelationshipElement/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/RelationshipElement/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/RelationshipElement/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/RelationshipElement/idShort.json
index e4e6f214..368f9b85 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/RelationshipElement/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/RelationshipElement/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Resource/contentType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Resource/contentType.json
index e07abc44..e3362110 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Resource/contentType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Resource/contentType.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "application/x-abiword12345678901234567890123456789012345678901234567890123456789012345678901234567890",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Resource/path.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Resource/path.json
index b957719b..9c1d5b5b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Resource/path.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Resource/path.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "application/x-abiword",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123"
+          "path": "something_57b1bd09123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Submodel/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Submodel/category.json
index 262eef3a..17514a28 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Submodel/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Submodel/category.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Submodel/id.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Submodel/id.json
index 0743ede4..8469a1fc 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Submodel/id.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Submodel/id.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Submodel/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Submodel/idShort.json
index bad08ba0..21bdb47b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Submodel/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/Submodel/idShort.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementCollection/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementCollection/category.json
index bf6702c9..33b2fa5d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementCollection/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementCollection/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementCollection/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementCollection/idShort.json
index fc718984..2a19c552 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementCollection/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementCollection/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementList/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementList/category.json
index 4a641fe9..2e1f09fb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementList/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementList/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementList/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementList/idShort.json
index bb3ca079..64e4acfd 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementList/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/SubmodelElementList/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ValueReferencePair/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ValueReferencePair/value.json
index cde5ef81..7554d8a4 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ValueReferencePair/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/ValueReferencePair/value.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AdministrativeInformation/revision.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AdministrativeInformation/revision.json
index 8e1f99d8..9bbd9f75 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AdministrativeInformation/revision.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AdministrativeInformation/revision.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AdministrativeInformation/templateId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AdministrativeInformation/templateId.json
index 0841e746..6a31c02c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AdministrativeInformation/templateId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AdministrativeInformation/templateId.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AdministrativeInformation/version.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AdministrativeInformation/version.json
index 8e746c6a..302a61ab 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AdministrativeInformation/version.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AdministrativeInformation/version.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/annotations.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/annotations.json
index d8e65199..a3ecef28 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/annotations.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/annotations.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/category.json
index 97f4262d..811ab1f6 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/category.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/description.json
index f8305f59..84df8368 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/description.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/displayName.json
index 205c86d1..ec2576fe 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/displayName.json
@@ -21,6 +21,15 @@
           "displayName": [],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/extensions.json
index 659d883e..95a87293 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/extensions.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/idShort.json
index 60ef521d..64a6fcaa 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/idShort.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/qualifiers.json
index a6883adc..4e886a3d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/qualifiers.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/supplementalSemanticIds.json
index d7abdba6..f031e917 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AnnotatedRelationshipElement/supplementalSemanticIds.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/category.json
index 926e358a..b38be05c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/category.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/description.json
index 0568d500..7bf84408 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/description.json
@@ -25,6 +25,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/displayName.json
index d8e4026d..34fba724 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/displayName.json
@@ -25,6 +25,15 @@
       "displayName": [],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/extensions.json
index 40e8c586..73b1382a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/extensions.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/id.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/id.json
index c5463ee9..9b3d31ca 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/id.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/id.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/idShort.json
index a61b4730..520efb2e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/idShort.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/submodels.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/submodels.json
index b198cefc..554fb797 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/submodels.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetAdministrationShell/submodels.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetInformation/assetType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetInformation/assetType.json
index 72d29ba0..18562bba 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetInformation/assetType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetInformation/assetType.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "assetType": "",
         "defaultThumbnail": {
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_c71f0c8f"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetInformation/globalAssetId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetInformation/globalAssetId.json
index 96b768d8..1fd28b56 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetInformation/globalAssetId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/AssetInformation/globalAssetId.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "assetType": "something_9f4c5692",
         "defaultThumbnail": {
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": ""
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/category.json
index e12eb6d3..7d43d77a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/category.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/description.json
index 81f378d5..0d58c5b0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/description.json
@@ -16,6 +16,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/displayName.json
index 876491fa..8bfc9d84 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/displayName.json
@@ -16,6 +16,15 @@
           "displayName": [],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/extensions.json
index 4c9f2fed..65fc9f53 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/extensions.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/idShort.json
index 9c965d56..77bfaacd 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/idShort.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/messageTopic.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/messageTopic.json
index 1dd76d15..dd580fbc 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/messageTopic.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/messageTopic.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/qualifiers.json
index 3b867525..396c3b89 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/qualifiers.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/supplementalSemanticIds.json
index 18272ec7..f8d8c83f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/BasicEventElement/supplementalSemanticIds.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/category.json
index 05ec4481..7d53b318 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/category.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/contentType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/contentType.json
index d2980543..73791066 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/contentType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/contentType.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/description.json
index 5e00d92f..e119b6f1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/description.json
@@ -16,6 +16,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/displayName.json
index 0300be7c..ad15cdcb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/displayName.json
@@ -16,6 +16,15 @@
           "displayName": [],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/extensions.json
index 97df192d..4d098cb0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/extensions.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/idShort.json
index eea43256..96cbc9e5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/idShort.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/qualifiers.json
index 23f49970..3e7d9315 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/qualifiers.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/supplementalSemanticIds.json
index 13e51ba0..b7a033a9 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Blob/supplementalSemanticIds.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/category.json
index 2a278bbe..ab7a0145 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/description.json
index c0e56f1b..fddd5c5c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/displayName.json
index b1b4ebf3..49e0710f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/displayName.json
@@ -15,6 +15,15 @@
           "displayName": [],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/extensions.json
index ff65d461..6e4ed569 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/idShort.json
index bbb1b4b1..4ee1e141 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/qualifiers.json
index 54dd71ee..ed5389aa 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/supplementalSemanticIds.json
index 00fc7d0b..04a2a85d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Capability/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/category.json
index ba07ecda..92cf945f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/category.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/description.json
index ba9e21a0..f7f493f3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/description.json
@@ -12,6 +12,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/displayName.json
index 77eb97fd..873dad4d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/displayName.json
@@ -12,6 +12,15 @@
       "displayName": [],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/extensions.json
index 02ee75ef..cabd0393 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/extensions.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/id.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/id.json
index ae59157b..58e7b3cb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/id.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/id.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/idShort.json
index e41edf69..0e7ea2cb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/idShort.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/isCaseOf.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/isCaseOf.json
index c1dec7f7..84b7d9df 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/isCaseOf.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ConceptDescription/isCaseOf.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/definition.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/definition.json
index 6b12f90d..fd8afc01 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/definition.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/definition.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [],
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/preferredName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/preferredName.json
index 731a7bba..6e8bf7c8 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/preferredName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/preferredName.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/shortName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/shortName.json
index e3a5812f..98d80477 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/shortName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/shortName.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/sourceOfDefinition.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/sourceOfDefinition.json
index 86945cbd..b9c16b62 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/sourceOfDefinition.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/sourceOfDefinition.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/symbol.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/symbol.json
index 3d27a024..82336b26 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/symbol.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/symbol.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/unit.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/unit.json
index 5f804c46..fa37f699 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/unit.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/unit.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/value.json
index 4ba8ab2f..f889ed00 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/value.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/valueFormat.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/valueFormat.json
index 8a2d5b9d..6c8fd48a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/valueFormat.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/valueFormat.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/category.json
index f4fea75c..4c5d5e77 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/description.json
index bd5bf4b4..5648c69b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/displayName.json
index b51a3a07..e921542c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/displayName.json
@@ -15,6 +15,15 @@
           "displayName": [],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/extensions.json
index 948786b7..ee160371 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/idShort.json
index 00a0e49d..bb40ac57 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/qualifiers.json
index b992d777..92cf2e1c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/statements.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/statements.json
index 510d1d86..0cac0735 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/statements.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/statements.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/supplementalSemanticIds.json
index f8fed8c5..929c524f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Entity/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/category.json
index 0bfb2cbc..22c03730 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/category.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/contentType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/contentType.json
index 18094cf1..1b5805c5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/contentType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/contentType.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/description.json
index 98bb4306..208dfa55 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/description.json
@@ -16,6 +16,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -65,7 +74,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/displayName.json
index 5ce57658..04618dcc 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/displayName.json
@@ -16,6 +16,15 @@
           "displayName": [],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -65,7 +74,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/embeddedDataSpecifications.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/embeddedDataSpecifications.json
index 04236b57..78ecb66c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/embeddedDataSpecifications.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/embeddedDataSpecifications.json
@@ -53,7 +53,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/extensions.json
index 8146e1dd..cd4ab698 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/extensions.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -66,7 +75,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/idShort.json
index 19300a72..3c08378e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/idShort.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/qualifiers.json
index 375af07c..19a42f6d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/qualifiers.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -65,7 +74,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/supplementalSemanticIds.json
index 93734dca..5762ba49 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/supplementalSemanticIds.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -60,7 +69,7 @@
             "type": "ExternalReference"
           },
           "supplementalSemanticIds": [],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/value.json
index 8543dffe..2e078fd5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/value.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/LangStringDefinitionTypeIec61360/text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/LangStringDefinitionTypeIec61360/text.json
index 033ca518..4df79afd 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/LangStringDefinitionTypeIec61360/text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/LangStringDefinitionTypeIec61360/text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/LangStringPreferredNameTypeIec61360/text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/LangStringPreferredNameTypeIec61360/text.json
index 2e894832..d4721121 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/LangStringPreferredNameTypeIec61360/text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/LangStringPreferredNameTypeIec61360/text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/LangStringShortNameTypeIec61360/text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/LangStringShortNameTypeIec61360/text.json
index 07f7996c..d207290e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/LangStringShortNameTypeIec61360/text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/LangStringShortNameTypeIec61360/text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/category.json
index 06e08d48..11c53b37 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/description.json
index 9736066c..fd0bdb3c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/displayName.json
index c7a79d4a..185e2950 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/displayName.json
@@ -15,6 +15,15 @@
           "displayName": [],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/extensions.json
index 80074b38..1fbf0fb3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/idShort.json
index 2610ed21..0fe70848 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/qualifiers.json
index 011428af..24701620 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/supplementalSemanticIds.json
index 0d70afc5..a0810577 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/value.json
index ac07a6dd..eb8808b0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/MultiLanguageProperty/value.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/category.json
index 75ff736e..346662ea 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/description.json
index eb3593d1..c3fa38c4 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/displayName.json
index cd38ede1..48acfca7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/displayName.json
@@ -15,6 +15,15 @@
           "displayName": [],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/extensions.json
index c2f2d340..03930f35 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/idShort.json
index 5522b1d2..ff4f8454 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/inoutputVariables.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/inoutputVariables.json
index b3818863..f4cde9c2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/inoutputVariables.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/inoutputVariables.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/inputVariables.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/inputVariables.json
index b548f66c..be5f1722 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/inputVariables.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/inputVariables.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/outputVariables.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/outputVariables.json
index 36ee0043..52835c2d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/outputVariables.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/outputVariables.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/qualifiers.json
index 728e2bd0..6303b22a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/supplementalSemanticIds.json
index ea6fe269..19a56b7c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Operation/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/category.json
index 444f6dd9..f44d92ef 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/description.json
index aed6663e..64b35f78 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/displayName.json
index 8078d02d..55e89353 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/displayName.json
@@ -15,6 +15,15 @@
           "displayName": [],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/extensions.json
index 6595db4e..d9bb2209 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/idShort.json
index a2df2fc5..86377856 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/qualifiers.json
index 09862d0f..37052613 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/supplementalSemanticIds.json
index 8319b007..17abacc6 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Property/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/category.json
index 511b52e2..d0369ae1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/description.json
index 0624f8d6..e035d0a8 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/displayName.json
index 099ace5f..b41671b0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/displayName.json
@@ -15,6 +15,15 @@
           "displayName": [],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/extensions.json
index 36835473..28eacb9d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/idShort.json
index 482d5c4b..9f99044a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/qualifiers.json
index 59b3aa72..e5adf73d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/supplementalSemanticIds.json
index db73b93a..b4bc53f7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Range/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/category.json
index 5e91312a..8f8f5992 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/description.json
index 5b15194a..7a33aa4f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/displayName.json
index c3b8d6fa..a0981118 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/displayName.json
@@ -15,6 +15,15 @@
           "displayName": [],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/extensions.json
index 77a3f893..7827cf71 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/idShort.json
index 1f23e378..710d1de8 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/qualifiers.json
index e3ca7d23..ac798836 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/supplementalSemanticIds.json
index 13eb1568..3ab1bcb7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ReferenceElement/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/category.json
index 4bdf75c0..e2639d8f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/description.json
index f9dc732f..acb4181c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/displayName.json
index d220c1b8..6d59af03 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/displayName.json
@@ -15,6 +15,15 @@
           "displayName": [],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/extensions.json
index b06620ec..41dc1b99 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/idShort.json
index e96971c1..5d106dbe 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/qualifiers.json
index 21eb4202..e2819286 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/supplementalSemanticIds.json
index fb94d885..dce2a57b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/RelationshipElement/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Resource/contentType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Resource/contentType.json
index bff7ff36..6721aa9b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Resource/contentType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Resource/contentType.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/category.json
index f240e272..ea212842 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/category.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/description.json
index 3eadfe66..0efad6d9 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/description.json
@@ -12,6 +12,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/displayName.json
index c5027bb1..a19581c0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/displayName.json
@@ -12,6 +12,15 @@
       "displayName": [],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/extensions.json
index 16cf3104..538e4d2c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/extensions.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/id.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/id.json
index fa3edb0b..030af208 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/id.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/id.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/idShort.json
index d0387ed8..9cb29759 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/idShort.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/qualifiers.json
index 72134026..86caa297 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/qualifiers.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/submodelElements.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/submodelElements.json
index fab83481..f64d9c4f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/submodelElements.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/submodelElements.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/supplementalSemanticIds.json
index 6a83c7e4..7deb17b7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Submodel/supplementalSemanticIds.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/category.json
index 3f5faecb..aa0feca2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/description.json
index 669df29b..47520dbf 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/displayName.json
index df3d6c2e..a3a02bdb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/displayName.json
@@ -15,6 +15,15 @@
           "displayName": [],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/extensions.json
index e3c5f127..eed4d848 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/idShort.json
index c1409b0f..53aa2b27 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/qualifiers.json
index e0adc46a..1cad9977 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/supplementalSemanticIds.json
index 6c197126..c8da0fdb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/value.json
index 0e4b5e03..03312d2f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementCollection/value.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/category.json
index 408dd98f..c0b2f20a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/category.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/description.json
index 0c772b2d..459ae8f0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/displayName.json
index ca5b7121..c6e076e0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/displayName.json
@@ -15,6 +15,15 @@
           "displayName": [],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/extensions.json
index e5e4dbd9..b1ef3999 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/idShort.json
index 1181cea3..e18d7ce1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/qualifiers.json
index 094a2811..68f2c434 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/supplementalSemanticIds.json
index 97c0ed36..3c19523c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/value.json
index 740fddcb..29053c8f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/SubmodelElementList/value.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ValueList/valueReferencePairs.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ValueList/valueReferencePairs.json
index 7afc394c..98607142 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ValueList/valueReferencePairs.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ValueList/valueReferencePairs.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ValueReferencePair/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ValueReferencePair/value.json
index 120dfd03..a55658c8 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ValueReferencePair/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/ValueReferencePair/value.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/revision/dot.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/revision/dot.json
index a45dc122..5e604450 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/revision/dot.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/revision/dot.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/revision/letter.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/revision/letter.json
index 180778a4..414a82d4 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/revision/letter.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/revision/letter.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/revision/negative.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/revision/negative.json
index 9a1954d0..ef640998 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/revision/negative.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/revision/negative.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/version/dot.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/version/dot.json
index 0d19f947..31418189 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/version/dot.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/version/dot.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/version/letter.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/version/letter.json
index bef754e5..5a324c68 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/version/letter.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/version/letter.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/version/negative.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/version/negative.json
index e2804a80..0bacba3c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/version/negative.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AdministrativeInformation/version/negative.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_01.json
index 13e8ed9d..75525533 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_01.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_02.json
index e1d613e3..600b3196 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_02.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_03.json
index dcafe60e..ae7822b0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_03.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_04.json
index 2df258bf..1715cedf 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_04.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_05.json
index 662ab005..73c3c2ba 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_05.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_06.json
index 21768315..589881a3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_06.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_07.json
index c4451091..f928f1c5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_07.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_08.json
index 50e6d7cf..3672122e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_08.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_09.json
index de8c7568..78e5c73a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_09.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_10.json
index 97a093c1..2932f013 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AnnotatedRelationshipElement/idShort/negatively_fuzzed_10.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_01.json
index 19a2bd45..b2a73fc7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_01.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_02.json
index 19b75eb4..49b41ce4 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_02.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_03.json
index 7ad7b3a7..45711cb9 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_03.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_04.json
index b35f2f66..192f447d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_04.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_05.json
index d9884dfc..3940d3ba 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_05.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_06.json
index c66f2833..cb3b486b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_06.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_07.json
index 6cc004cc..678468b3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_07.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_08.json
index 3f0ac997..6f309505 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_08.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_09.json
index c49ec32a..a06532be 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_09.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_10.json
index a77769b2..77dbfe9a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/AssetAdministrationShell/idShort/negatively_fuzzed_10.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_01.json
index 0e658b80..a58b7716 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_01.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_02.json
index 28c5e102..681fd325 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_02.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_03.json
index 67c60d33..fb35b4dd 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_03.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_04.json
index 3f67bdaf..6f749b26 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_04.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_05.json
index cc890a12..76b39185 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_05.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_06.json
index d1bbc206..ccd74891 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_06.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_07.json
index 2ed6f44e..91457ca8 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_07.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_08.json
index 4dfc906a..c79857a3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_08.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_09.json
index f1c1da18..1524ff81 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_09.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_10.json
index 4b9a3787..9908191d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/idShort/negatively_fuzzed_10.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/date_time_with_UTC_and_suffix.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/date_time_with_UTC_and_suffix.json
index d2556098..321827d1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/date_time_with_UTC_and_suffix.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/date_time_with_UTC_and_suffix.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/date_time_with_offset.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/date_time_with_offset.json
index c44214eb..d5422af4 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/date_time_with_offset.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/date_time_with_offset.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/date_time_without_zone.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/date_time_without_zone.json
index 953da830..d7943721 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/date_time_without_zone.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/date_time_without_zone.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/empty.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/empty.json
index bdcdd52f..8f18e218 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/empty.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/empty.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_01.json
index 785e0e78..2857d422 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_01.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_02.json
index 92d73a57..afcb2f83 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_02.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_03.json
index 0f1a9a41..ad9f76b8 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_03.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_04.json
index 52b09a8a..5ea186f9 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_04.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_05.json
index c823a588..54a251ae 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_05.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_06.json
index d48c6ccb..9d265df1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_06.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_07.json
index 690b4e96..03e5ddd3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_07.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_08.json
index fc7fe5d7..18fd4360 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_08.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_09.json
index 005b75a4..b907ab4e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_09.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_10.json
index 251f8ed1..6fab2501 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/negatively_fuzzed_10.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/only_date.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/only_date.json
index 443f437e..399ac6e2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/only_date.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/only_date.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/only_date_with_time_zone.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/only_date_with_time_zone.json
index 4cbadc7b..65604ce7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/only_date_with_time_zone.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/only_date_with_time_zone.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/without_minutes.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/without_minutes.json
index 0ecc13ec..b320e723 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/without_minutes.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/without_minutes.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/without_seconds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/without_seconds.json
index b0d52aac..9d28fe75 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/without_seconds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/lastUpdate/without_seconds.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/empty.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/empty.json
index 9741f446..dd25869a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/empty.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/empty.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/free_form_text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/free_form_text.json
index 825e75c8..b9128354 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/free_form_text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/free_form_text.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/integer.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/integer.json
index 432021af..bdc8bc4a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/integer.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/integer.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/leading_P_missing.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/leading_P_missing.json
index 2837e3b4..7761de5d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/leading_P_missing.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/leading_P_missing.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/negative_years.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/negative_years.json
index c42da246..f229efad 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/negative_years.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/negative_years.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/positive_year_negative_months.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/positive_year_negative_months.json
index f2fe188a..5aa9d56e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/positive_year_negative_months.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/positive_year_negative_months.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/separator_T_missing.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/separator_T_missing.json
index 950245c4..3e8e7c4c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/separator_T_missing.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/separator_T_missing.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/the_order_matters.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/the_order_matters.json
index 1f3b13f6..f0767f58 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/the_order_matters.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/maxInterval/the_order_matters.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/empty.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/empty.json
index 18b5ba65..50b8d0bd 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/empty.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/empty.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/free_form_text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/free_form_text.json
index 6e1bcfb4..91f27a54 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/free_form_text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/free_form_text.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/integer.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/integer.json
index 4206aa69..4cd6d4d5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/integer.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/integer.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/leading_P_missing.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/leading_P_missing.json
index 62f7af22..96bfc323 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/leading_P_missing.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/leading_P_missing.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/negative_years.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/negative_years.json
index fb3c552d..2fe0e566 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/negative_years.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/negative_years.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/positive_year_negative_months.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/positive_year_negative_months.json
index f23b2f1f..f114471d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/positive_year_negative_months.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/positive_year_negative_months.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/separator_T_missing.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/separator_T_missing.json
index bde059c9..558d1816 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/separator_T_missing.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/separator_T_missing.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/the_order_matters.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/the_order_matters.json
index eb164f6e..a622d31e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/the_order_matters.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/BasicEventElement/minInterval/the_order_matters.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/empty.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/empty.json
index d2980543..73791066 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/empty.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/empty.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_01.json
index c8cb78cc..e49ae8ad 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_01.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_02.json
index c8cb78cc..e49ae8ad 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_02.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_03.json
index 806457e6..9d556694 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_03.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_04.json
index f6da1bd0..81f70085 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_04.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_05.json
index f147cd2b..44450e4f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_05.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_06.json
index 9d0c417f..31f5fd81 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_06.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_07.json
index ac867663..f1c1911c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_07.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_08.json
index d2980543..73791066 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_08.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_09.json
index ceea6bf8..94f3472c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_09.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_10.json
index c5766fc1..5b227722 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/negatively_fuzzed_10.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/number.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/number.json
index 80ed12df..d5b8753b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/number.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/contentType/number.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_01.json
index f807c0b7..e629134b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_01.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_02.json
index fa997f14..9a75a6f4 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_02.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_03.json
index 8471972a..eed5be3a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_03.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_04.json
index 722bd388..668578fd 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_04.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_05.json
index d434988d..4269a4ec 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_05.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_06.json
index 433c6dd8..bc740c55 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_06.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_07.json
index 60fe1a70..b03080af 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_07.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_08.json
index d53c9d3a..3220b8ab 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_08.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_09.json
index 0713dbbf..8a01ec98 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_09.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_10.json
index 500635ac..f9c21106 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Blob/idShort/negatively_fuzzed_10.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_01.json
index 7e215529..4b6ce604 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_02.json
index 6ebdef7f..47673262 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_03.json
index d09e230d..1c484c25 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_04.json
index d409af05..6d7cd103 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_05.json
index 6b84fd93..d0374e38 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_06.json
index 2fce038f..0d4b61a3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_07.json
index 4c2fffa7..d9587b53 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_08.json
index 685edc88..5856d34e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_09.json
index 3d103a15..04974112 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_10.json
index 5eb94323..1ad56c87 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Capability/idShort/negatively_fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_01.json
index 319cbe3a..8f124f59 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_01.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_02.json
index 36fb66d5..817cb9d9 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_02.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_03.json
index 16dfe2b9..bc4871e2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_03.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_04.json
index 9923ad94..a960cad7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_04.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_05.json
index ef35879e..b3dd22b1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_05.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_06.json
index 6c4db4ad..c28b9e84 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_06.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_07.json
index 29ee6ad2..86e25f89 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_07.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_08.json
index e6140f7b..568e997a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_08.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_09.json
index 877d105a..7b3a25c6 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_09.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_10.json
index 132e4e91..76aa5f26 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ConceptDescription/idShort/negatively_fuzzed_10.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_01.json
index 7186deb7..27895a92 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_02.json
index 9d90f61a..52947e99 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_03.json
index 80650176..fb63a9c2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_04.json
index 9e571be0..030bcc77 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_05.json
index 4806ec0b..6d6778d9 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_06.json
index 549efa08..dddc94fb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_07.json
index 19bb6285..10893007 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_08.json
index 10374675..d0f0940d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_09.json
index 7df502ec..f54354cc 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_10.json
index 37eec745..24c28103 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Entity/idShort/negatively_fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/empty.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/empty.json
index 18094cf1..1b5805c5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/empty.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/empty.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_01.json
index 9d3fe72c..f020fb2f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_01.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_02.json
index 9d3fe72c..f020fb2f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_02.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_03.json
index 02de359c..038f410f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_03.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_04.json
index b22ef2be..0d012269 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_04.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_05.json
index 4f39ef77..fc72f44d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_05.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_06.json
index 7c774344..f407367b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_06.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_07.json
index 38134d87..5be6ef22 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_07.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_08.json
index 18094cf1..1b5805c5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_08.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_09.json
index bc4836d2..c483cd7f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_09.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_10.json
index 914a66c6..b366d4cf 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/negatively_fuzzed_10.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/number.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/number.json
index 2ed998de..96c020ba 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/number.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/contentType/number.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_01.json
index f0fd9e1b..25ff35b0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_01.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_02.json
index 62761f9b..98d8e3a8 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_02.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_03.json
index cc030bb8..825ec8bd 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_03.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_04.json
index 47add1bb..9dd63b6f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_04.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_05.json
index 82b3ff9c..a91bd1b7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_05.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_06.json
index d96f2fa6..b234d9b3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_06.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_07.json
index 40181ff9..b2892984 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_07.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_08.json
index e77506d5..0dc030d5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_08.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_09.json
index 40889fc5..c99bc9e6 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_09.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_10.json
index 781ee3b3..59dfa4cb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/idShort/negatively_fuzzed_10.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -70,7 +79,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/absolute_path_without_scheme.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/absolute_path_without_scheme.json
deleted file mode 100644
index 48e3a0e3..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/absolute_path_without_scheme.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "/path/to/somewhere"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/empty.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/empty.json
deleted file mode 100644
index 8543dffe..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/empty.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": ""
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/local_relative_path_with_scheme.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/local_relative_path_with_scheme.json
deleted file mode 100644
index 621d1d6d..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/local_relative_path_with_scheme.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "file:path/to/somewhere"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_01.json
deleted file mode 100644
index f446e075..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_01.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "\uda63\udeda\ud9cb\udf76\u00c3Z"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_02.json
deleted file mode 100644
index 6260c969..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_02.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "t#\u00e1\udbcc\udd8fXM~\u00f9\u00cc\u00f8\u009e\ud8f2\uddd1"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_03.json
deleted file mode 100644
index e727ac7f..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_03.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "\ud919\udeee&1\ud81c\udcf9\u00fe\ud874\udc149"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_04.json
deleted file mode 100644
index d692de64..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_04.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "//"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_05.json
deleted file mode 100644
index aca3025d..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_05.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "\udadd\udc94\u001f\u009b\ud8c9\udeda\u00a0\u00b8\udaba\udce1*"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_06.json
deleted file mode 100644
index 2909ec48..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_06.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "C"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_07.json
deleted file mode 100644
index 4121ba61..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_07.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "\ud9cd\udcee"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_08.json
deleted file mode 100644
index 3d64c526..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_08.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "\u00e2\u00b7\ud914\udf92E"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_09.json
deleted file mode 100644
index 89b7ab2b..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_09.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "s\ud82b\udcc1\ud9e3\uddd0\u00c5\\H\udac2\ude13"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_10.json
deleted file mode 100644
index adcfe7cb..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_10.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "hxY"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/number.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/number.json
deleted file mode 100644
index 3c5363c5..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/number.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "1234"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/relative_path_without_scheme.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/relative_path_without_scheme.json
deleted file mode 100644
index ceb4bd93..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/relative_path_without_scheme.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "submodels": [
-    {
-      "id": "something_48c66017",
-      "modelType": "Submodel",
-      "submodelElements": [
-        {
-          "category": "VARIABLE",
-          "contentType": "'VbrwFrYTU/fO7NnLxq   \t; \tMX.`10dB732`X5yRy=I56Ov9Us\t ;\t\t pRb~~hdw_C%2Zf=\"\"\t\t\t    \t\t\t \t \t\t \t  ; h=1t",
-          "description": [
-            {
-              "language": "es-419",
-              "text": "something_be9deae0"
-            }
-          ],
-          "displayName": [
-            {
-              "language": "zh-CN-a-myext-x-private",
-              "text": "something_535aeb51"
-            }
-          ],
-          "embeddedDataSpecifications": [
-            {
-              "dataSpecificationContent": {
-                "modelType": "DataSpecificationIec61360",
-                "preferredName": [
-                  {
-                    "language": "sl-rozaj-biske",
-                    "text": "something_7e795ee2"
-                  },
-                  {
-                    "language": "en-GB",
-                    "text": "Something random in English c8512bdf"
-                  }
-                ],
-                "value": "something_4e9c19b7"
-              }
-            }
-          ],
-          "extensions": [
-            {
-              "name": "something_aa1af8b3"
-            }
-          ],
-          "idShort": "PiXO1wyHierj",
-          "modelType": "File",
-          "qualifiers": [
-            {
-              "type": "something_500f973e",
-              "valueType": "xs:long"
-            }
-          ],
-          "semanticId": {
-            "keys": [
-              {
-                "type": "GlobalReference",
-                "value": "urn:something00:f4547d0c"
-              }
-            ],
-            "type": "ExternalReference"
-          },
-          "supplementalSemanticIds": [
-            {
-              "keys": [
-                {
-                  "type": "Submodel",
-                  "value": "urn:another-example10:42487f5a"
-                }
-              ],
-              "type": "ModelReference"
-            }
-          ],
-          "value": "path/to/somewhere"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/empty.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/empty.json
index a2ca685e..53606a19 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/empty.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/empty.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/free_form_text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/free_form_text.json
index 08d6f6b8..5fcfc1f7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/free_form_text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/free_form_text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_01.json
index 22544401..0760e6bb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_01.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_02.json
index 74674adb..bf83be1e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_02.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_03.json
index db307d3f..6403c870 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_03.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_04.json
index 1edd6644..ace46588 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_04.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_05.json
index cf3ba322..c9675f6e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_05.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_06.json
index 68efb7d9..d5bcb284 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_06.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_07.json
index e73ccdfa..045ec9e3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_07.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_08.json
index 75386b2c..b2eaae43 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_08.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_09.json
index 7fbf521a..05835511 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_09.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_10.json
index 5cfeaaf1..76ec1c3d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringDefinitionTypeIec61360/language/negatively_fuzzed_10.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/empty.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/empty.json
index 94bababf..6ccb2399 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/empty.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/empty.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/free_form_text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/free_form_text.json
index 6181e392..254e5a12 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/free_form_text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/free_form_text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_01.json
index 35ccc6ba..fb3f7e9b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_01.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_02.json
index cf162c31..cc99bfbd 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_02.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_03.json
index e34ed72a..43354e63 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_03.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_04.json
index 6af0463b..2f058534 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_04.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_05.json
index b9f36ad2..bc153db6 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_05.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_06.json
index ff08c3df..534437ea 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_06.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_07.json
index 36221c01..f3f40ea1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_07.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_08.json
index b1f7c91c..da517349 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_08.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_09.json
index 91b86e0f..5ad86305 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_09.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_10.json
index 7d667fdc..40c539a0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringPreferredNameTypeIec61360/language/negatively_fuzzed_10.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/empty.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/empty.json
index 81f55bd4..3501044d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/empty.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/empty.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/free_form_text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/free_form_text.json
index c191df45..6279e0b2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/free_form_text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/free_form_text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_01.json
index b254586a..b1e3ec63 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_01.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_02.json
index 605e9841..93553916 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_02.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_03.json
index d09c60e0..086aec21 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_03.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_04.json
index c97e5720..90c2e1f5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_04.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_05.json
index 08940061..278287f7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_05.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_06.json
index b118aa6f..c627e538 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_06.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_07.json
index 0e77909a..f07a51cf 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_07.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_08.json
index c7485f15..62a57038 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_08.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_09.json
index ea2f8d23..2bf4b3fd 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_09.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_10.json
index 8398f66a..1036b6a8 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/LangStringShortNameTypeIec61360/language/negatively_fuzzed_10.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_01.json
index 7755bd3d..5786a06a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_02.json
index e371bf9d..c96fa3a7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_03.json
index e5434681..e73a5869 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_04.json
index 01f70f65..b9c8bf7b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_05.json
index af904118..9ebebe48 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_06.json
index 2e28ca23..39d7128d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_07.json
index 3df33ea3..1df5a50f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_08.json
index e26c71a5..afb1673e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_09.json
index 62ca7279..34f43e6e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_10.json
index 09b6b454..4d72b79e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/MultiLanguageProperty/idShort/negatively_fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_01.json
index fbb96f46..3dbb78eb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_02.json
index 8a3a5a1e..71d473dc 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_03.json
index 7f87c0ff..8bec3a61 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_04.json
index 965ad8aa..2ca0f7bd 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_05.json
index 3c6d4b89..912f82b0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_06.json
index 124fcfea..34edc884 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_07.json
index 80cd9297..dc0b5183 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_08.json
index 4a9f0152..76616163 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_09.json
index 2e0179ce..346cdb24 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_10.json
index 51099831..84e2b4b0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Operation/idShort/negatively_fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_01.json
index 1b56661f..cd24aa8e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_02.json
index c315e8f4..7b545dd0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_03.json
index 66cac059..4e7d6f5e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_04.json
index 4ef96bc6..eb75e34f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_05.json
index 9534e02b..2d06aeb5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_06.json
index 9eeacb40..ef9e8f0d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_07.json
index c6713cf6..b4cd6278 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_08.json
index 87f968a5..72fe62cd 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_09.json
index 8f29e47b..68454d37 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_10.json
index 825dfa52..98f852c5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Property/idShort/negatively_fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_01.json
index 28d47e2c..8aa25b39 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_02.json
index 4ed47974..78cb5354 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_03.json
index ff9dfcf8..dd50239e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_04.json
index c69b880f..789785fe 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_05.json
index cb5e27f1..9d7d7f00 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_06.json
index fac259c7..8e410407 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_07.json
index f3127e68..133caa3c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_08.json
index c4f5e89e..92fe0df2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_09.json
index 8e5d934b..a932fa05 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_10.json
index d8b1d54b..cee6f93f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Range/idShort/negatively_fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_01.json
index 835da533..7fb94ca3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_02.json
index 23c5f188..ed068eac 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_03.json
index a376c249..4f388588 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_04.json
index eb93b1ff..959fe8fa 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_05.json
index ca2cf4fc..1c6d32b8 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_06.json
index 03d365cb..f02719a0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_07.json
index 270072c3..c940d6d3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_08.json
index 27ada50e..966b5836 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_09.json
index bf3d5e3e..18310016 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_10.json
index 8136a300..3a1603cf 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/ReferenceElement/idShort/negatively_fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_01.json
index 6486d68c..ae6788f9 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_02.json
index 0c3ea69e..d68555dd 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_03.json
index 34512acc..4c38225d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_04.json
index d49eaa56..1a4ce905 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_05.json
index be8007d0..66194acb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_06.json
index 8ca987e0..eafc800f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_07.json
index a3031767..928c11c9 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_08.json
index 6c80299d..ff11509e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_09.json
index 876a0d8b..6efa8788 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_10.json
index 771c767b..81982d90 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/RelationshipElement/idShort/negatively_fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/empty.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/empty.json
index bff7ff36..6721aa9b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/empty.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/empty.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_01.json
index e311d697..5d356fc2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_01.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "\uda86\udf2e\udb69\udf6e\udae1\udefa7\u001e\u00fd\u00d1\u009d|\udbc6\uddcd",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_02.json
index e311d697..5d356fc2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_02.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "\uda86\udf2e\udb69\udf6e\udae1\udefa7\u001e\u00fd\u00d1\u009d|\udbc6\uddcd",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_03.json
index c3b258d8..16af4bf4 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_03.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "\ud845\udd39",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_04.json
index c639b9ed..3587b3a0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_04.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "\u00d0\u00d0",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_05.json
index e9f8efc7..e797a6ec 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_05.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "\udb37\udd7d\u00a7\u0085\u00b0\u00a2\udace\udc5a>3\udba3\udd37",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_06.json
index c7dc21ca..13c39234 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_06.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "q\u0095d",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_07.json
index edac3a7a..3600d6b4 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_07.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "0",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_08.json
index bff7ff36..6721aa9b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_08.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_09.json
index a56e30f2..3ea4e29c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_09.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "\r|\u00e4",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_10.json
index c18e6d50..bfbbcfe3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/negatively_fuzzed_10.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "\ud832\udfb0\ud832\udfb0",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/number.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/number.json
index 0503d17d..aa0e5237 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/number.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/contentType/number.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
           "contentType": "1234",
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/absolute_path_without_scheme.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/absolute_path_without_scheme.json
deleted file mode 100644
index 0d0eb01d..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/absolute_path_without_scheme.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "/path/to/somewhere"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/empty.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/empty.json
deleted file mode 100644
index c432df21..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/empty.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": ""
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/local_relative_path_with_scheme.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/local_relative_path_with_scheme.json
deleted file mode 100644
index 4505845d..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/local_relative_path_with_scheme.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "file:path/to/somewhere"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_01.json
deleted file mode 100644
index f94aabfe..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_01.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "\uda63\udeda\ud9cb\udf76\u00c3Z"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_02.json
deleted file mode 100644
index c7dbb912..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_02.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "t#\u00e1\udbcc\udd8fXM~\u00f9\u00cc\u00f8\u009e\ud8f2\uddd1"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_03.json
deleted file mode 100644
index d88d4ace..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_03.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "\ud919\udeee&1\ud81c\udcf9\u00fe\ud874\udc149"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_04.json
deleted file mode 100644
index ab752182..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_04.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "//"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_05.json
deleted file mode 100644
index 52918293..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_05.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "\udadd\udc94\u001f\u009b\ud8c9\udeda\u00a0\u00b8\udaba\udce1*"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_06.json
deleted file mode 100644
index 25df7a41..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_06.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "C"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_07.json
deleted file mode 100644
index 5d574410..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_07.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "\ud9cd\udcee"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_08.json
deleted file mode 100644
index f30c43b2..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_08.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "\u00e2\u00b7\ud914\udf92E"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_09.json
deleted file mode 100644
index e125bdd1..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_09.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "s\ud82b\udcc1\ud9e3\uddd0\u00c5\\H\udac2\ude13"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_10.json
deleted file mode 100644
index c68d99d6..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_10.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "hxY"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/number.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/number.json
deleted file mode 100644
index 308136ae..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/number.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "1234"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/relative_path_without_scheme.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/relative_path_without_scheme.json
deleted file mode 100644
index f61bf107..00000000
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/relative_path_without_scheme.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "assetAdministrationShells": [
-    {
-      "assetInformation": {
-        "assetKind": "NotApplicable",
-        "defaultThumbnail": {
-          "contentType": "application/x-abiword",
-          "path": "path/to/somewhere"
-        },
-        "globalAssetId": "something_eea66fa1"
-      },
-      "id": "something_142922d6",
-      "modelType": "AssetAdministrationShell"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_01.json
index 33c31bf9..10236bf0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_01.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_02.json
index 92df2305..05bf29d4 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_02.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_03.json
index efbefa6b..d5312426 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_03.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_04.json
index 22163fcd..f675f22c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_04.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_05.json
index 73688e40..6bc81269 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_05.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_06.json
index 2239756c..861d6da3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_06.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_07.json
index 503ad636..8a7d81ca 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_07.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_08.json
index f4ef588f..4dde2768 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_08.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_09.json
index 359078c6..379b3d84 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_09.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_10.json
index d51d2327..9d334cd7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Submodel/idShort/negatively_fuzzed_10.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_01.json
index 927f4237..e44fb3ba 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_02.json
index cd68b623..2eaaee2b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_03.json
index 1229b9b4..ef5700e9 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_04.json
index aad82528..10715c35 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_05.json
index 43e0f564..fa94352d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_06.json
index 83347522..3b91a252 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_07.json
index c2d1255d..5d2d2bd1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_08.json
index 1f90000c..9e8200d3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_09.json
index f87f3b87..2372be2c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_10.json
index 8508c064..e3e2d391 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementCollection/idShort/negatively_fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_01.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_01.json
index 5abcde17..d5f1e8cb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_01.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_01.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_02.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_02.json
index e96e86df..ef9ee654 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_02.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_02.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_03.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_03.json
index fd24aad7..45b0c1c3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_03.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_03.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_04.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_04.json
index 129f69bd..e0913f7c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_04.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_04.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_05.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_05.json
index 56daf01f..9f9aee11 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_05.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_05.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_06.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_06.json
index bd2a58bf..52f1b456 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_06.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_06.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_07.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_07.json
index caf622da..4bef0bfb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_07.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_07.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_08.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_08.json
index e2626119..ed1d0e1f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_08.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_08.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_09.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_09.json
index 708527a3..eefa4510 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_09.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_09.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_10.json b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_10.json
index 1eaea197..34fd99e6 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_10.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/SubmodelElementList/idShort/negatively_fuzzed_10.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/AssetInformation/assetKind_as_AssetKind.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/AssetInformation/assetKind_as_AssetKind.json
index f7f8eb15..aa4ad1ad 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/AssetInformation/assetKind_as_AssetKind.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/AssetInformation/assetKind_as_AssetKind.json
@@ -5,7 +5,7 @@
         "assetKind": "totally utterly invalid",
         "assetType": "something_9f4c5692",
         "defaultThumbnail": {
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_c71f0c8f"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/BasicEventElement/direction_as_Direction.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/BasicEventElement/direction_as_Direction.json
index 0a833bcf..71c85c56 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/BasicEventElement/direction_as_Direction.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/BasicEventElement/direction_as_Direction.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/BasicEventElement/state_as_StateOfEvent.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/BasicEventElement/state_as_StateOfEvent.json
index 4e977939..bffb6c2a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/BasicEventElement/state_as_StateOfEvent.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/BasicEventElement/state_as_StateOfEvent.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/DataSpecificationIec61360/dataType_as_DataTypeIec61360.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/DataSpecificationIec61360/dataType_as_DataTypeIec61360.json
index 27bc3c19..d75b149e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/DataSpecificationIec61360/dataType_as_DataTypeIec61360.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/DataSpecificationIec61360/dataType_as_DataTypeIec61360.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "totally utterly invalid",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Entity/entityType_as_EntityType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Entity/entityType_as_EntityType.json
index 930054d2..303f2744 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Entity/entityType_as_EntityType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Entity/entityType_as_EntityType.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Property/valueType_as_DataTypeDefXsd.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Property/valueType_as_DataTypeDefXsd.json
index 43a3dfc8..968ac478 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Property/valueType_as_DataTypeDefXsd.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Property/valueType_as_DataTypeDefXsd.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Range/valueType_as_DataTypeDefXsd.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Range/valueType_as_DataTypeDefXsd.json
index 0936393e..9e64cbca 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Range/valueType_as_DataTypeDefXsd.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Range/valueType_as_DataTypeDefXsd.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Submodel/kind_as_ModellingKind.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Submodel/kind_as_ModellingKind.json
index 222290a1..fb086378 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Submodel/kind_as_ModellingKind.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/Submodel/kind_as_ModellingKind.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/SubmodelElementList/typeValueListElement_as_AasSubmodelElements.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/SubmodelElementList/typeValueListElement_as_AasSubmodelElements.json
index 65395134..5528d8d1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/SubmodelElementList/typeValueListElement_as_AasSubmodelElements.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/SubmodelElementList/typeValueListElement_as_AasSubmodelElements.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/SubmodelElementList/valueTypeListElement_as_DataTypeDefXsd.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/SubmodelElementList/valueTypeListElement_as_DataTypeDefXsd.json
index 853d13ad..5006753b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/SubmodelElementList/valueTypeListElement_as_DataTypeDefXsd.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/SubmodelElementList/valueTypeListElement_as_DataTypeDefXsd.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/InvalidModelType/DataSpecificationIec61360/invalidModelType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/InvalidModelType/DataSpecificationIec61360/invalidModelType.json
index 5261cd94..872a77bf 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/InvalidModelType/DataSpecificationIec61360/invalidModelType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/InvalidModelType/DataSpecificationIec61360/invalidModelType.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "aCompletelyInvalidModelType",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/MissingModelType/DataSpecificationIec61360/withoutModelType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/MissingModelType/DataSpecificationIec61360/withoutModelType.json
index d778f234..844555aa 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/MissingModelType/DataSpecificationIec61360/withoutModelType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/MissingModelType/DataSpecificationIec61360/withoutModelType.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "preferredName": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/DataSpecificationIec61360/preferredName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/DataSpecificationIec61360/preferredName.json
index bc3bfcef..ccead9d0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/DataSpecificationIec61360/preferredName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/DataSpecificationIec61360/preferredName.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": null,
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/EmbeddedDataSpecification/dataSpecification.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/EmbeddedDataSpecification/dataSpecification.json
new file mode 100644
index 00000000..fca63ab1
--- /dev/null
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/EmbeddedDataSpecification/dataSpecification.json
@@ -0,0 +1,31 @@
+{
+  "assetAdministrationShells": [
+    {
+      "assetInformation": {
+        "assetKind": "NotApplicable",
+        "globalAssetId": "something_eea66fa1"
+      },
+      "embeddedDataSpecifications": [
+        {
+          "dataSpecification": null,
+          "dataSpecificationContent": {
+            "modelType": "DataSpecificationIec61360",
+            "preferredName": [
+              {
+                "language": "i-enochian",
+                "text": "something_84b0b440"
+              },
+              {
+                "language": "en-GB",
+                "text": "Something random in English 5b15c20d"
+              }
+            ],
+            "value": "something_13759f45"
+          }
+        }
+      ],
+      "id": "something_142922d6",
+      "modelType": "AssetAdministrationShell"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/EmbeddedDataSpecification/dataSpecificationContent.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/EmbeddedDataSpecification/dataSpecificationContent.json
index 83ffe89e..ec0acd95 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/EmbeddedDataSpecification/dataSpecificationContent.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/EmbeddedDataSpecification/dataSpecificationContent.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": null
         }
       ],
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringDefinitionTypeIec61360/language.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringDefinitionTypeIec61360/language.json
index f07a8b74..e7398a11 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringDefinitionTypeIec61360/language.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringDefinitionTypeIec61360/language.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringDefinitionTypeIec61360/text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringDefinitionTypeIec61360/text.json
index 25f3bb43..d9bc9da7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringDefinitionTypeIec61360/text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringDefinitionTypeIec61360/text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringPreferredNameTypeIec61360/language.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringPreferredNameTypeIec61360/language.json
index 4f1d65ab..26cac5f4 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringPreferredNameTypeIec61360/language.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringPreferredNameTypeIec61360/language.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringPreferredNameTypeIec61360/text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringPreferredNameTypeIec61360/text.json
index 843d2843..e7086cdb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringPreferredNameTypeIec61360/text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringPreferredNameTypeIec61360/text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringShortNameTypeIec61360/language.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringShortNameTypeIec61360/language.json
index 18508e5e..f8ea09b6 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringShortNameTypeIec61360/language.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringShortNameTypeIec61360/language.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringShortNameTypeIec61360/text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringShortNameTypeIec61360/text.json
index 51e20e1a..901b3bee 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringShortNameTypeIec61360/text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LangStringShortNameTypeIec61360/text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/max.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/max.json
index 8f0033c6..e740c8b3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/max.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/max.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "levelType": {
               "max": null,
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/min.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/min.json
index 3125f7ac..f454bc2f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/min.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/min.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "levelType": {
               "max": true,
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/nom.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/nom.json
index 1ba1f8d4..e2194e20 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/nom.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/nom.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "levelType": {
               "max": true,
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/typ.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/typ.json
index 46319a7f..fb36b4e5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/typ.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/LevelType/typ.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "levelType": {
               "max": true,
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/ValueList/valueReferencePairs.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/ValueList/valueReferencePairs.json
index 34be85d9..dd7e1b35 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/ValueList/valueReferencePairs.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/ValueList/valueReferencePairs.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/ValueReferencePair/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/ValueReferencePair/value.json
index 506d6fc7..cec92da7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/ValueReferencePair/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/ValueReferencePair/value.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/ValueReferencePair/valueId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/ValueReferencePair/valueId.json
index f6ab6559..e8f18ed7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/ValueReferencePair/valueId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/NullViolation/ValueReferencePair/valueId.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/DataSpecificationIec61360/preferredName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/DataSpecificationIec61360/preferredName.json
index 6dbb60d2..e396bb45 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/DataSpecificationIec61360/preferredName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/DataSpecificationIec61360/preferredName.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "value": "something_13759f45"
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/EmbeddedDataSpecification/dataSpecification.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/EmbeddedDataSpecification/dataSpecification.json
new file mode 100644
index 00000000..a0fd946c
--- /dev/null
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/EmbeddedDataSpecification/dataSpecification.json
@@ -0,0 +1,30 @@
+{
+  "assetAdministrationShells": [
+    {
+      "assetInformation": {
+        "assetKind": "NotApplicable",
+        "globalAssetId": "something_eea66fa1"
+      },
+      "embeddedDataSpecifications": [
+        {
+          "dataSpecificationContent": {
+            "modelType": "DataSpecificationIec61360",
+            "preferredName": [
+              {
+                "language": "i-enochian",
+                "text": "something_84b0b440"
+              },
+              {
+                "language": "en-GB",
+                "text": "Something random in English 5b15c20d"
+              }
+            ],
+            "value": "something_13759f45"
+          }
+        }
+      ],
+      "id": "something_142922d6",
+      "modelType": "AssetAdministrationShell"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/EmbeddedDataSpecification/dataSpecificationContent.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/EmbeddedDataSpecification/dataSpecificationContent.json
index 322b452a..823a9644 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/EmbeddedDataSpecification/dataSpecificationContent.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/EmbeddedDataSpecification/dataSpecificationContent.json
@@ -6,7 +6,17 @@
         "globalAssetId": "something_eea66fa1"
       },
       "embeddedDataSpecifications": [
-        {}
+        {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          }
+        }
       ],
       "id": "something_142922d6",
       "modelType": "AssetAdministrationShell"
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringDefinitionTypeIec61360/language.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringDefinitionTypeIec61360/language.json
index 2b8c843e..ea6370a9 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringDefinitionTypeIec61360/language.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringDefinitionTypeIec61360/language.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringDefinitionTypeIec61360/text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringDefinitionTypeIec61360/text.json
index d3aa54ab..a2569cdb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringDefinitionTypeIec61360/text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringDefinitionTypeIec61360/text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringPreferredNameTypeIec61360/language.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringPreferredNameTypeIec61360/language.json
index 1bb458c5..901028d2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringPreferredNameTypeIec61360/language.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringPreferredNameTypeIec61360/language.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringPreferredNameTypeIec61360/text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringPreferredNameTypeIec61360/text.json
index 89c8622d..ad6dcace 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringPreferredNameTypeIec61360/text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringPreferredNameTypeIec61360/text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringShortNameTypeIec61360/language.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringShortNameTypeIec61360/language.json
index c800d003..c8296bbf 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringShortNameTypeIec61360/language.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringShortNameTypeIec61360/language.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringShortNameTypeIec61360/text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringShortNameTypeIec61360/text.json
index e0644374..57661970 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringShortNameTypeIec61360/text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LangStringShortNameTypeIec61360/text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/max.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/max.json
index bae8fd6b..60f85532 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/max.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/max.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "levelType": {
               "min": true,
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/min.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/min.json
index 2fb43be5..3b4f7958 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/min.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/min.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "levelType": {
               "max": true,
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/nom.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/nom.json
index 9d141b27..5b086753 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/nom.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/nom.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "levelType": {
               "max": true,
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/typ.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/typ.json
index 16b4596c..d3eaf599 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/typ.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/LevelType/typ.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "levelType": {
               "max": true,
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/ValueList/valueReferencePairs.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/ValueList/valueReferencePairs.json
index 7f7732bb..2ae84bb7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/ValueList/valueReferencePairs.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/ValueList/valueReferencePairs.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/ValueReferencePair/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/ValueReferencePair/value.json
index 3b3a9081..fa8e7cbc 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/ValueReferencePair/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/ValueReferencePair/value.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/ValueReferencePair/valueId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/ValueReferencePair/valueId.json
index 789e201d..8ed18117 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/ValueReferencePair/valueId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/ValueReferencePair/valueId.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/creator.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/creator.json
index 93ef835d..bb16611b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/creator.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/creator.json
@@ -5,6 +5,15 @@
         "creator": "Unexpected string value",
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/revision.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/revision.json
index 52ef580b..7c91a1f3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/revision.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/revision.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/templateId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/templateId.json
index ff57a9ec..b8902d96 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/templateId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/templateId.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/version.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/version.json
index ffa16aa6..64c94cd5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/version.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AdministrativeInformation/version.json
@@ -13,6 +13,15 @@
         },
         "embeddedDataSpecifications": [
           {
+            "dataSpecification": {
+              "keys": [
+                {
+                  "type": "GlobalReference",
+                  "value": "urn:something14:18179b7a"
+                }
+              ],
+              "type": "ExternalReference"
+            },
             "dataSpecificationContent": {
               "modelType": "DataSpecificationIec61360",
               "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/annotations.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/annotations.json
index 23e580c2..8de562e6 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/annotations.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/annotations.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/category.json
index cfabeb10..06204389 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/category.json
@@ -36,6 +36,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/description.json
index 4ac9bda0..71792d7d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/description.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/displayName.json
index c0581be7..3fcfd85a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/displayName.json
@@ -21,6 +21,15 @@
           "displayName": "Unexpected string value",
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/extensions.json
index 9990673d..a205e801 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/extensions.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/first.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/first.json
index 0c4fc36d..7db48bd7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/first.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/first.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/idShort.json
index a1b89f21..8f9eacb3 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/idShort.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/qualifiers.json
index 8f1e094c..77728de7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/qualifiers.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/second.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/second.json
index 927cc9e1..c77a175b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/second.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/second.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/semanticId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/semanticId.json
index 3690a78c..5be6fe41 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/semanticId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/semanticId.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/supplementalSemanticIds.json
index d135a018..c11e0cda 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AnnotatedRelationshipElement/supplementalSemanticIds.json
@@ -26,6 +26,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/administration.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/administration.json
index ca0fbce5..e9e795b5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/administration.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/administration.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/assetInformation.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/assetInformation.json
index 79b8abc1..a174c21f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/assetInformation.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/assetInformation.json
@@ -27,6 +27,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/category.json
index 77f725dc..c70bd332 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/category.json
@@ -40,6 +40,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/derivedFrom.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/derivedFrom.json
index 0f8881fb..3121998b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/derivedFrom.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/derivedFrom.json
@@ -22,6 +22,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/description.json
index e5bccc0c..04d8e2f5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/description.json
@@ -25,6 +25,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/displayName.json
index 0cfd424a..620d472d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/displayName.json
@@ -25,6 +25,15 @@
       "displayName": "Unexpected string value",
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/extensions.json
index 1e23ef26..5ddd94c2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/extensions.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/id.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/id.json
index 85738c87..d17e3af5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/id.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/id.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/idShort.json
index 2ac0af32..3fa4fe3f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/idShort.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/submodels.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/submodels.json
index cc6c7fb0..7a2b4a18 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/submodels.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetAdministrationShell/submodels.json
@@ -30,6 +30,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetInformation/assetKind.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetInformation/assetKind.json
index a516a773..9f3b21c0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetInformation/assetKind.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetInformation/assetKind.json
@@ -15,7 +15,7 @@
         ],
         "assetType": "something_9f4c5692",
         "defaultThumbnail": {
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_c71f0c8f"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetInformation/assetType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetInformation/assetType.json
index 4dad9050..5865a7a2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetInformation/assetType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetInformation/assetType.json
@@ -15,7 +15,7 @@
           }
         ],
         "defaultThumbnail": {
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_c71f0c8f"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetInformation/globalAssetId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetInformation/globalAssetId.json
index bb93f52c..4ccf3c5a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetInformation/globalAssetId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/AssetInformation/globalAssetId.json
@@ -5,7 +5,7 @@
         "assetKind": "NotApplicable",
         "assetType": "something_9f4c5692",
         "defaultThumbnail": {
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": [
           {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/category.json
index ece4de16..1ee37773 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/category.json
@@ -31,6 +31,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/description.json
index 79c5f1e1..694267e7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/description.json
@@ -16,6 +16,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/direction.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/direction.json
index 88b9cda4..9240cb64 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/direction.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/direction.json
@@ -31,6 +31,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/displayName.json
index 17205106..c8d672e8 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/displayName.json
@@ -16,6 +16,15 @@
           "displayName": "Unexpected string value",
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/extensions.json
index 987955b8..69eadb82 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/extensions.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/idShort.json
index 6a111a44..2ad2b0b8 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/idShort.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/lastUpdate.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/lastUpdate.json
index f268d7a2..58cf50ac 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/lastUpdate.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/lastUpdate.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/maxInterval.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/maxInterval.json
index 8419fed0..20897623 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/maxInterval.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/maxInterval.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/messageBroker.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/messageBroker.json
index 3cce8014..1484b523 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/messageBroker.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/messageBroker.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/messageTopic.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/messageTopic.json
index f8bcff36..711df8ee 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/messageTopic.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/messageTopic.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/minInterval.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/minInterval.json
index ccf3e5e5..73ce2009 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/minInterval.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/minInterval.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/observed.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/observed.json
index b5967e37..28beb7a8 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/observed.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/observed.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/qualifiers.json
index 8e331582..3311bfca 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/qualifiers.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/semanticId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/semanticId.json
index db1c677c..20368872 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/semanticId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/semanticId.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/state.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/state.json
index 48e1b996..af9ecbd6 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/state.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/state.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/supplementalSemanticIds.json
index 31014463..a5740963 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/BasicEventElement/supplementalSemanticIds.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/category.json
index 26be581a..bbcfd4b7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/category.json
@@ -31,6 +31,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/contentType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/contentType.json
index 7944cdbd..9fc5abf2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/contentType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/contentType.json
@@ -31,6 +31,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/description.json
index b818d966..e1b14490 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/description.json
@@ -16,6 +16,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/displayName.json
index 3d2bdddc..f4934c18 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/displayName.json
@@ -16,6 +16,15 @@
           "displayName": "Unexpected string value",
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/extensions.json
index 2aec896e..f5558614 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/extensions.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/idShort.json
index e0c63285..85ab7870 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/idShort.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/qualifiers.json
index 860c96bc..9c5cb2b9 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/qualifiers.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/semanticId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/semanticId.json
index 58a8ec25..954a8a75 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/semanticId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/semanticId.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/supplementalSemanticIds.json
index 6e1736a3..866c607b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/supplementalSemanticIds.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/value.json
index a45e1ca3..cd428023 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Blob/value.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/category.json
index d71c56eb..ebec6ce4 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/category.json
@@ -30,6 +30,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/description.json
index e5b7ce7a..e08f455e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/displayName.json
index 31ef3e75..29e6e8ac 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/displayName.json
@@ -15,6 +15,15 @@
           "displayName": "Unexpected string value",
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/extensions.json
index 827a1aab..8e81ccd6 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/idShort.json
index 5e3df3a9..b77a1042 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/qualifiers.json
index a2c43276..338efc11 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/semanticId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/semanticId.json
index 6beba59a..1579e905 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/semanticId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/semanticId.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/supplementalSemanticIds.json
index f6e90e35..c74512a7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Capability/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/administration.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/administration.json
index 151c9379..47e99fe1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/administration.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/administration.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/category.json
index f13245d8..ff3a8f0f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/category.json
@@ -27,6 +27,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/description.json
index 2b0f01c9..d65f0b66 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/description.json
@@ -12,6 +12,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/displayName.json
index 363184e0..248729be 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/displayName.json
@@ -12,6 +12,15 @@
       "displayName": "Unexpected string value",
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/extensions.json
index 33186463..7c7c2153 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/extensions.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/id.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/id.json
index 0a46d2a1..70703112 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/id.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/id.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/idShort.json
index 8684de13..5f9aba44 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/idShort.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/isCaseOf.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/isCaseOf.json
index 735847ff..12cae8b2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/isCaseOf.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ConceptDescription/isCaseOf.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "Submodel",
+                "value": "urn:example14:c4971d26"
+              }
+            ],
+            "type": "ModelReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/dataType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/dataType.json
index 937dcbf0..0e6c28ba 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/dataType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/dataType.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/definition.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/definition.json
index 5ae035e2..b8bb97f9 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/definition.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/definition.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": "Unexpected string value",
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/levelType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/levelType.json
index 319ee714..c16b40db 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/levelType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/levelType.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/preferredName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/preferredName.json
index 77e9d433..12af40e1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/preferredName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/preferredName.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/shortName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/shortName.json
index 17622d56..961f02bf 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/shortName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/shortName.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/sourceOfDefinition.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/sourceOfDefinition.json
index d06edc18..bd27d411 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/sourceOfDefinition.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/sourceOfDefinition.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/symbol.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/symbol.json
index 7fec6f38..94278f83 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/symbol.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/symbol.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/unit.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/unit.json
index 57f9a302..809e222b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/unit.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/unit.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/unitId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/unitId.json
index 7b92be54..1b6a44cc 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/unitId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/unitId.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/value.json
index 818f619f..c901b60b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/value.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/valueFormat.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/valueFormat.json
index e63f57da..fe8dedee 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/valueFormat.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/DataSpecificationIec61360/valueFormat.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "dataType": "DATE",
             "definition": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/category.json
index 33e6d754..3e314c40 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/category.json
@@ -30,6 +30,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/description.json
index c72243bf..923a81ff 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/displayName.json
index bb9c68f1..9a35d0d9 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/displayName.json
@@ -15,6 +15,15 @@
           "displayName": "Unexpected string value",
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/entityType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/entityType.json
index 756a113e..29816f10 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/entityType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/entityType.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/extensions.json
index d4703374..72e4afd2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/idShort.json
index 47f277b4..6ade78da 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/qualifiers.json
index 3938ea3a..d92c6fb1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/semanticId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/semanticId.json
index fcd1ec05..473d820c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/semanticId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/semanticId.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/statements.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/statements.json
index 7589000b..497216ca 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/statements.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/statements.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/supplementalSemanticIds.json
index 32bc3489..3eec9d38 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Entity/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/category.json
index 6d7734e0..32b43499 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/category.json
@@ -31,6 +31,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -80,7 +89,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/contentType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/contentType.json
index ed55078e..2c5ba94d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/contentType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/contentType.json
@@ -31,6 +31,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -80,7 +89,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/description.json
index 01458394..8b3db42e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/description.json
@@ -16,6 +16,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -65,7 +74,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/displayName.json
index cd7ae798..e9d1a3a5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/displayName.json
@@ -16,6 +16,15 @@
           "displayName": "Unexpected string value",
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -65,7 +74,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/embeddedDataSpecifications.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/embeddedDataSpecifications.json
index 1c30c79f..a7de5540 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/embeddedDataSpecifications.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/embeddedDataSpecifications.json
@@ -53,7 +53,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/extensions.json
index a5ee0f97..473f5eb9 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/extensions.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -66,7 +75,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/idShort.json
index 2c479a2d..c218de13 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/idShort.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -80,7 +89,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/qualifiers.json
index 66f7d20f..10d42cea 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/qualifiers.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -65,7 +74,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/semanticId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/semanticId.json
index d52a2cdd..cee4c8c1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/semanticId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/semanticId.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -62,7 +71,7 @@
               "type": "ModelReference"
             }
           ],
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/supplementalSemanticIds.json
index ba9d7ef8..913bee0c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/supplementalSemanticIds.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
@@ -60,7 +69,7 @@
             "type": "ExternalReference"
           },
           "supplementalSemanticIds": "Unexpected string value",
-          "value": "file:/path/to/somewhere"
+          "value": "something_158159bf"
         }
       ]
     }
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/value.json
index 51cc5a85..5124c943 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/File/value.json
@@ -21,6 +21,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringDefinitionTypeIec61360/language.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringDefinitionTypeIec61360/language.json
index 208dc7d1..4ef1764f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringDefinitionTypeIec61360/language.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringDefinitionTypeIec61360/language.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringDefinitionTypeIec61360/text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringDefinitionTypeIec61360/text.json
index c28cfeb6..cbf2218b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringDefinitionTypeIec61360/text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringDefinitionTypeIec61360/text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringPreferredNameTypeIec61360/language.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringPreferredNameTypeIec61360/language.json
index 6f9ab75e..d6cb494e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringPreferredNameTypeIec61360/language.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringPreferredNameTypeIec61360/language.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringPreferredNameTypeIec61360/text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringPreferredNameTypeIec61360/text.json
index bb391ac3..9b467723 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringPreferredNameTypeIec61360/text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringPreferredNameTypeIec61360/text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringShortNameTypeIec61360/language.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringShortNameTypeIec61360/language.json
index 460e4296..7af508ed 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringShortNameTypeIec61360/language.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringShortNameTypeIec61360/language.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringShortNameTypeIec61360/text.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringShortNameTypeIec61360/text.json
index 7808e6ff..e2437532 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringShortNameTypeIec61360/text.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LangStringShortNameTypeIec61360/text.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/max.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/max.json
index f137e8d0..d8c99727 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/max.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/max.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "levelType": {
               "max": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/min.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/min.json
index 24bada7f..2d95eafd 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/min.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/min.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "levelType": {
               "max": true,
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/nom.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/nom.json
index bbface3d..6d044908 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/nom.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/nom.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "levelType": {
               "max": true,
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/typ.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/typ.json
index c872ef23..c48b8a28 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/typ.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/LevelType/typ.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "levelType": {
               "max": true,
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/category.json
index 543e1618..6649a775 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/category.json
@@ -30,6 +30,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/description.json
index 4b88d7e1..208f57f8 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/displayName.json
index dbc54b1e..9fe40a58 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/displayName.json
@@ -15,6 +15,15 @@
           "displayName": "Unexpected string value",
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/extensions.json
index 95a26bcd..3e8c90eb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/idShort.json
index 4acf95c0..54f94c3a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/qualifiers.json
index 3398b2b9..519be731 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/semanticId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/semanticId.json
index 3ce1063b..b3efa63f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/semanticId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/semanticId.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/supplementalSemanticIds.json
index 45ea4c84..e2b674fa 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/value.json
index 8d24ba8b..ee448ef9 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/value.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/valueId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/valueId.json
index ceb98705..171020a1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/valueId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/MultiLanguageProperty/valueId.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/category.json
index 14a9e0e0..4365124e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/category.json
@@ -30,6 +30,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/description.json
index 423921c1..400b8857 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/displayName.json
index 52c35ff5..ed418e94 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/displayName.json
@@ -15,6 +15,15 @@
           "displayName": "Unexpected string value",
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/extensions.json
index db810822..751e1d82 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/idShort.json
index d68de2d7..aade8d6e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/inoutputVariables.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/inoutputVariables.json
index 56e17a93..8fe3d3f2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/inoutputVariables.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/inoutputVariables.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/inputVariables.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/inputVariables.json
index 8d05bf8f..f60dce9a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/inputVariables.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/inputVariables.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/outputVariables.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/outputVariables.json
index 88c6d6dd..e523218c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/outputVariables.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/outputVariables.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/qualifiers.json
index cf0edf9b..2e35b014 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/semanticId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/semanticId.json
index 33373d6e..c5315ece 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/semanticId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/semanticId.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/supplementalSemanticIds.json
index 3e2fd53b..79adaa87 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Operation/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/category.json
index 17c3739e..9fb57fcf 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/category.json
@@ -30,6 +30,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/description.json
index ccb61327..11b8802e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/displayName.json
index 2a2d39cd..e26669cd 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/displayName.json
@@ -15,6 +15,15 @@
           "displayName": "Unexpected string value",
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/extensions.json
index e95a3b36..3618249a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/idShort.json
index 6cd14a3f..3250fa45 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/qualifiers.json
index cf76c8a8..8d8995ab 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/semanticId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/semanticId.json
index 026d43e8..99056463 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/semanticId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/semanticId.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/supplementalSemanticIds.json
index 459d6851..f7f1253e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/value.json
index 42744179..adabb8ad 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/value.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/valueId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/valueId.json
index 5a5c4b52..5b020e4b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/valueId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/valueId.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/valueType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/valueType.json
index 10ac11dc..cf4d0598 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/valueType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Property/valueType.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/category.json
index fdf7d270..31d6d940 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/category.json
@@ -30,6 +30,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/description.json
index 934b4abd..29f8c172 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/displayName.json
index 51b0235c..0bbaa6ea 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/displayName.json
@@ -15,6 +15,15 @@
           "displayName": "Unexpected string value",
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/extensions.json
index c0b94838..7f3da563 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/idShort.json
index 4718b373..1ce0a9bf 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/max.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/max.json
index 2deeaaa3..f147e462 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/max.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/max.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/qualifiers.json
index 0e6b268e..552bd2d1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/semanticId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/semanticId.json
index b345769d..bd7b10bb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/semanticId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/semanticId.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/supplementalSemanticIds.json
index 02268088..b0f2ed5e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/valueType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/valueType.json
index 905b0ebf..bd0c9074 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/valueType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Range/valueType.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/category.json
index 0b89dcbd..1f5716cf 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/category.json
@@ -30,6 +30,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/description.json
index 8772bd49..9c84c614 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/displayName.json
index 3d884e30..34622e83 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/displayName.json
@@ -15,6 +15,15 @@
           "displayName": "Unexpected string value",
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/extensions.json
index 1696f168..3be895f8 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/idShort.json
index 9de5ad89..be57c2d5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/qualifiers.json
index b755e880..0cddd272 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/semanticId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/semanticId.json
index f1d10982..a1434bb6 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/semanticId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/semanticId.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/supplementalSemanticIds.json
index a951063c..65e591bb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/value.json
index 5f639e28..009003bb 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ReferenceElement/value.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/category.json
index 9d78edc8..fb69a0e2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/category.json
@@ -30,6 +30,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/description.json
index cbc52722..0b01856d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/displayName.json
index 974345db..a8b54b5c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/displayName.json
@@ -15,6 +15,15 @@
           "displayName": "Unexpected string value",
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/extensions.json
index 83893e3a..7938c59f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/first.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/first.json
index c9d0a133..4193cb5e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/first.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/first.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/idShort.json
index e7540f55..b4a0b100 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/qualifiers.json
index 29c0f9ec..f9460d06 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/second.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/second.json
index 030f33a8..b2e549de 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/second.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/second.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/semanticId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/semanticId.json
index 7842837b..90673577 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/semanticId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/semanticId.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/supplementalSemanticIds.json
index aa9422cf..8baf1e48 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/RelationshipElement/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Resource/contentType.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Resource/contentType.json
index 73f26145..62058d1e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Resource/contentType.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Resource/contentType.json
@@ -15,7 +15,7 @@
               "type": "ExternalReference"
             }
           ],
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:"
+          "path": "something_57b1bd09"
         },
         "globalAssetId": "something_eea66fa1"
       },
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/administration.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/administration.json
index ddb2dba8..927553b7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/administration.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/administration.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/category.json
index 01cd6992..46c4e7e5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/category.json
@@ -27,6 +27,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/description.json
index e8cc34a9..c3dd491f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/description.json
@@ -12,6 +12,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/displayName.json
index 177eda2c..71e5d2c4 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/displayName.json
@@ -12,6 +12,15 @@
       "displayName": "Unexpected string value",
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/extensions.json
index 58dffea2..82cf571e 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/extensions.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/id.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/id.json
index e5dc0ad6..bb9b6e24 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/id.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/id.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/idShort.json
index 3686d6c1..eb3d2bd2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/idShort.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/kind.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/kind.json
index aadf2b38..f393954d 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/kind.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/kind.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/qualifiers.json
index 4a7651ad..c28bc558 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/qualifiers.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/semanticId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/semanticId.json
index cb3c6246..44a75dfa 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/semanticId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/semanticId.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/submodelElements.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/submodelElements.json
index 002fd1be..516f30f1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/submodelElements.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/submodelElements.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/supplementalSemanticIds.json
index 77f90f1c..af9e727f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/Submodel/supplementalSemanticIds.json
@@ -17,6 +17,15 @@
       ],
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company07:80412e8f"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/category.json
index 152a046b..9e6cb25b 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/category.json
@@ -30,6 +30,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/description.json
index 41b73213..1c3b8105 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/displayName.json
index 2b12d49c..18033b74 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/displayName.json
@@ -15,6 +15,15 @@
           "displayName": "Unexpected string value",
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/extensions.json
index e3c1fe54..d8e57008 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/idShort.json
index 8d4a3601..b60a71c7 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/qualifiers.json
index eb8ed67b..574b4386 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/semanticId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/semanticId.json
index a4d7f45e..e44eb992 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/semanticId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/semanticId.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/supplementalSemanticIds.json
index bd5f0970..7c32a2c2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/value.json
index ffaf0eb2..82e865a2 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementCollection/value.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/category.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/category.json
index 51fa2313..05bc6b58 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/category.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/category.json
@@ -30,6 +30,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/description.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/description.json
index 57c5c781..9c250230 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/description.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/description.json
@@ -15,6 +15,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/displayName.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/displayName.json
index cfe8e010..f54c5aed 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/displayName.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/displayName.json
@@ -15,6 +15,15 @@
           "displayName": "Unexpected string value",
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/extensions.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/extensions.json
index 967162c6..8da1efc0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/extensions.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/extensions.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/idShort.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/idShort.json
index 99a50a1b..84251370 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/idShort.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/idShort.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/orderRelevant.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/orderRelevant.json
index d0d96b99..c3aa0035 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/orderRelevant.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/orderRelevant.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/qualifiers.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/qualifiers.json
index dba894be..73f4bbde 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/qualifiers.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/qualifiers.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/semanticId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/semanticId.json
index 6d77be42..37cd5b37 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/semanticId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/semanticId.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/semanticIdListElement.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/semanticIdListElement.json
index 1612fc7b..5b7f8749 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/semanticIdListElement.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/semanticIdListElement.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/supplementalSemanticIds.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/supplementalSemanticIds.json
index 6be7b6b4..445be872 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/supplementalSemanticIds.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/supplementalSemanticIds.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/typeValueListElement.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/typeValueListElement.json
index 65334f7e..5b88cf8c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/typeValueListElement.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/typeValueListElement.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/value.json
index 6501ba7c..4c92dc8a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/value.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/valueTypeListElement.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/valueTypeListElement.json
index 7723097c..420fe96c 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/valueTypeListElement.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/SubmodelElementList/valueTypeListElement.json
@@ -20,6 +20,15 @@
           ],
           "embeddedDataSpecifications": [
             {
+              "dataSpecification": {
+                "keys": [
+                  {
+                    "type": "Submodel",
+                    "value": "urn:another-company15:2bd0986b"
+                  }
+                ],
+                "type": "ModelReference"
+              },
               "dataSpecificationContent": {
                 "modelType": "DataSpecificationIec61360",
                 "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ValueList/valueReferencePairs.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ValueList/valueReferencePairs.json
index 9e52099c..275580c1 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ValueList/valueReferencePairs.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ValueList/valueReferencePairs.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ValueReferencePair/value.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ValueReferencePair/value.json
index b83b8ced..fa114bec 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ValueReferencePair/value.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ValueReferencePair/value.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ValueReferencePair/valueId.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ValueReferencePair/valueId.json
index 2dbfd5fa..36a750ef 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ValueReferencePair/valueId.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/ValueReferencePair/valueId.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/DataSpecificationIec61360/invalid.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/DataSpecificationIec61360/invalid.json
index b41c2b7d..f3e5c15a 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/DataSpecificationIec61360/invalid.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/DataSpecificationIec61360/invalid.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/EmbeddedDataSpecification/invalid.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/EmbeddedDataSpecification/invalid.json
index fd09fd3d..e88426f0 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/EmbeddedDataSpecification/invalid.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/EmbeddedDataSpecification/invalid.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LangStringDefinitionTypeIec61360/invalid.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LangStringDefinitionTypeIec61360/invalid.json
index 793e441e..065d7c67 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LangStringDefinitionTypeIec61360/invalid.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LangStringDefinitionTypeIec61360/invalid.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "definition": [
               {
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LangStringPreferredNameTypeIec61360/invalid.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LangStringPreferredNameTypeIec61360/invalid.json
index eee6badb..134db808 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LangStringPreferredNameTypeIec61360/invalid.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LangStringPreferredNameTypeIec61360/invalid.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LangStringShortNameTypeIec61360/invalid.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LangStringShortNameTypeIec61360/invalid.json
index cc974e59..05efb9c5 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LangStringShortNameTypeIec61360/invalid.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LangStringShortNameTypeIec61360/invalid.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LevelType/invalid.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LevelType/invalid.json
index 567601bc..dd61ab63 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LevelType/invalid.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/LevelType/invalid.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "levelType": {
               "max": true,
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/Resource/invalid.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/Resource/invalid.json
index b6d841cf..d9363d83 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/Resource/invalid.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/Resource/invalid.json
@@ -4,7 +4,7 @@
       "assetInformation": {
         "assetKind": "NotApplicable",
         "defaultThumbnail": {
-          "path": "file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:",
+          "path": "something_57b1bd09",
           "unexpectedAdditionalProperty": "INVALID"
         },
         "globalAssetId": "something_eea66fa1"
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/ValueList/invalid.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/ValueList/invalid.json
index 1c573674..638aafcc 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/ValueList/invalid.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/ValueList/invalid.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/ValueReferencePair/invalid.json b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/ValueReferencePair/invalid.json
index d986e7d9..b22ad90f 100644
--- a/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/ValueReferencePair/invalid.json
+++ b/testdata/Json/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/ValueReferencePair/invalid.json
@@ -7,6 +7,15 @@
       },
       "embeddedDataSpecifications": [
         {
+          "dataSpecification": {
+            "keys": [
+              {
+                "type": "GlobalReference",
+                "value": "urn:some-company06:e9f47be2"
+              }
+            ],
+            "type": "ExternalReference"
+          },
           "dataSpecificationContent": {
             "modelType": "DataSpecificationIec61360",
             "preferredName": [
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/preferredName.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/preferredName.json.errors
index e77fe347..396c2a94 100644
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/preferredName.json.errors
+++ b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/DataSpecificationIec61360/preferredName.json.errors
@@ -1,2 +1,2 @@
 AssetAdministrationShells[0].EmbeddedDataSpecifications[0].DataSpecificationContent: Preferred name must have at least one item.;
-AssetAdministrationShells[0].EmbeddedDataSpecifications[0].DataSpecificationContent: Constraint AASc-002: preferred name shall be provided at least in English.
+AssetAdministrationShells[0].EmbeddedDataSpecifications[0].DataSpecificationContent: Constraint AASc-3a-002: preferred name shall be provided at least in English.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/value.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/value.json.errors
index dc1cb7cd..946c8d3b 100644
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/value.json.errors
+++ b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/File/value.json.errors
@@ -1,2 +1 @@
-Submodels[0].SubmodelElements[0].Value: The value must not be empty.;
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
+Submodels[0].SubmodelElements[0].Value: The value must not be empty.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Resource/path.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Resource/path.json.errors
index b92980d4..f1667c8e 100644
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Resource/path.json.errors
+++ b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/Resource/path.json.errors
@@ -1,2 +1 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must not be empty.;
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
+AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must not be empty.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/absolute_path_without_scheme.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/absolute_path_without_scheme.json.errors
deleted file mode 100644
index f1ecdf47..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/absolute_path_without_scheme.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/empty.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/empty.json.errors
deleted file mode 100644
index dc1cb7cd..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/empty.json.errors
+++ /dev/null
@@ -1,2 +0,0 @@
-Submodels[0].SubmodelElements[0].Value: The value must not be empty.;
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/local_relative_path_with_scheme.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/local_relative_path_with_scheme.json.errors
deleted file mode 100644
index f1ecdf47..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/local_relative_path_with_scheme.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_01.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_01.json.errors
deleted file mode 100644
index f1ecdf47..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_01.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_02.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_02.json.errors
deleted file mode 100644
index f1ecdf47..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_02.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_03.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_03.json.errors
deleted file mode 100644
index f1ecdf47..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_03.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_04.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_04.json.errors
deleted file mode 100644
index f1ecdf47..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_04.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_05.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_05.json.errors
deleted file mode 100644
index 3718ee3a..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_05.json.errors
+++ /dev/null
@@ -1,2 +0,0 @@
-Submodels[0].SubmodelElements[0].Value: Constraint AASd-130: An attribute with data type 'string' shall consist of these characters only: ^[\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\U00010000-\U0010FFFF]*$.;
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_06.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_06.json.errors
deleted file mode 100644
index f1ecdf47..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_06.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_07.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_07.json.errors
deleted file mode 100644
index f1ecdf47..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_07.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_08.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_08.json.errors
deleted file mode 100644
index f1ecdf47..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_08.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_09.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_09.json.errors
deleted file mode 100644
index f1ecdf47..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_09.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_10.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_10.json.errors
deleted file mode 100644
index f1ecdf47..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/negatively_fuzzed_10.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/number.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/number.json.errors
deleted file mode 100644
index f1ecdf47..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/number.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/relative_path_without_scheme.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/relative_path_without_scheme.json.errors
deleted file mode 100644
index f1ecdf47..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/File/value/relative_path_without_scheme.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-Submodels[0].SubmodelElements[0].Value: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/absolute_path_without_scheme.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/absolute_path_without_scheme.json.errors
deleted file mode 100644
index 35f40b3d..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/absolute_path_without_scheme.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/empty.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/empty.json.errors
deleted file mode 100644
index b92980d4..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/empty.json.errors
+++ /dev/null
@@ -1,2 +0,0 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must not be empty.;
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/local_relative_path_with_scheme.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/local_relative_path_with_scheme.json.errors
deleted file mode 100644
index 35f40b3d..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/local_relative_path_with_scheme.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_01.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_01.json.errors
deleted file mode 100644
index 35f40b3d..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_01.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_02.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_02.json.errors
deleted file mode 100644
index 35f40b3d..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_02.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_03.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_03.json.errors
deleted file mode 100644
index 35f40b3d..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_03.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_04.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_04.json.errors
deleted file mode 100644
index 35f40b3d..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_04.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_05.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_05.json.errors
deleted file mode 100644
index d671c7e1..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_05.json.errors
+++ /dev/null
@@ -1,2 +0,0 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: Constraint AASd-130: An attribute with data type 'string' shall consist of these characters only: ^[\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\U00010000-\U0010FFFF]*$.;
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_06.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_06.json.errors
deleted file mode 100644
index 35f40b3d..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_06.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_07.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_07.json.errors
deleted file mode 100644
index 35f40b3d..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_07.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_08.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_08.json.errors
deleted file mode 100644
index 35f40b3d..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_08.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_09.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_09.json.errors
deleted file mode 100644
index 35f40b3d..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_09.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_10.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_10.json.errors
deleted file mode 100644
index 35f40b3d..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/negatively_fuzzed_10.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/number.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/number.json.errors
deleted file mode 100644
index 35f40b3d..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/number.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/relative_path_without_scheme.json.errors b/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/relative_path_without_scheme.json.errors
deleted file mode 100644
index 35f40b3d..00000000
--- a/testdata/VerificationError/Json/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/Resource/path/relative_path_without_scheme.json.errors
+++ /dev/null
@@ -1 +0,0 @@
-AssetAdministrationShells[0].AssetInformation.DefaultThumbnail.Path: The value must represent a valid file URI scheme according to RFC 8089.
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/maximal.xml
index d5510a7d..11683e22 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/maximal.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/four_digits.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/four_digits.xml
index 31179313..777b4c95 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/four_digits.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/four_digits.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_01.xml
index 23560a2a..b0cc6b9b 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_01.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_02.xml
index 9c4c290f..21e37f0c 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_02.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_03.xml
index 23fdd03b..3475e49b 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_03.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_04.xml
index 05e9d44c..2d9437fd 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/fuzzed_04.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/one.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/one.xml
index 699c64bd..3467886f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/one.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/one.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/three_digits.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/three_digits.xml
index 5e533ced..1a6fe760 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/three_digits.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/three_digits.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/two_digits.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/two_digits.xml
index c106a033..0406aad3 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/two_digits.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/two_digits.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/zero.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/zero.xml
index d5510a7d..11683e22 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/zero.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/revisionOverPatternExamples/zero.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/four_digits.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/four_digits.xml
index d5510a7d..11683e22 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/four_digits.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/four_digits.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_01.xml
index e22df289..bc1f1ffc 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_01.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>59</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_02.xml
index 07de47dd..af2c514e 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_02.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>116</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_03.xml
index 207cbcdd..72fd495b 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_03.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>7</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_04.xml
index 54738b81..28af0894 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/fuzzed_04.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>32</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/one.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/one.xml
index 841bbd3e..38e5ba57 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/one.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/one.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/three_digits.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/three_digits.xml
index 81471234..927a12df 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/three_digits.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/three_digits.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>120</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/two_digits.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/two_digits.xml
index e1b2b625..dfaa50f3 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/two_digits.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/two_digits.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>10</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/zero.xml b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/zero.xml
index 3ebb9a90..0b4414b3 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/zero.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/administrativeInformation/versionOverPatternExamples/zero.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>0</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_01.xml
index 2ca00af7..18a6895b 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_02.xml
index 7aa8750d..0a296673 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_03.xml
index b38502cd..6bc66f2f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_04.xml
index 9e761418..854b2e75 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_05.xml
index 0c6b4b7f..48846c04 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_06.xml
index 8a2b2f07..b4b1dd00 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_07.xml
index f0086a7d..d404da08 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_08.xml
index 97d9c43d..7e4d1806 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_09.xml
index d1282376..19242ede 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_10.xml
index c3bedb93..b0e4fb9c 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/idShortOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/maximal.xml
index d1282376..19242ede 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/annotatedRelationshipElement/maximal.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_01.xml
index 9edfdb83..5b352a8c 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_01.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_02.xml
index 706ce204..d7133be4 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_02.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_03.xml
index dd511bf8..18ca4b9b 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_03.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_04.xml
index 7955f4b1..34f9c607 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_04.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_05.xml
index 8ed1c458..2c34c733 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_05.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_06.xml
index 16b3b9ce..4f4a48ae 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_06.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_07.xml
index eb45190a..6f7a575c 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_07.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_08.xml
index 9fb95e77..b831515b 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_08.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_09.xml
index 55d1234e..1ab8d4d4 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_09.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_10.xml
index 3d4bada5..ccaaa6cc 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/idShortOverPatternExamples/fuzzed_10.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/maximal.xml
index 55d1234e..1ab8d4d4 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/assetAdministrationShell/maximal.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/assetInformation/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/assetInformation/maximal.xml
index 03b6f428..13a76338 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/assetInformation/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/assetInformation/maximal.xml
@@ -7,7 +7,7 @@
 				<globalAssetId>something_c71f0c8f</globalAssetId>
 				<assetType>something_9f4c5692</assetType>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 				</defaultThumbnail>
 			</assetInformation>
 		</assetAdministrationShell>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_01.xml
index 4ab526da..64e475f7 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_02.xml
index c04b264a..dc66ee98 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_03.xml
index 2f49c8fc..12db6fd6 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_04.xml
index a529452c..47119e78 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_05.xml
index e95daf0a..68567d55 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_06.xml
index bdcda854..6264c093 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_07.xml
index 846cf059..8a0a7b5d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_08.xml
index b571a9b8..772d84b3 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_09.xml
index a8523aae..a0873255 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_10.xml
index 8dde5f77..68d6b3a3 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/idShortOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/fuzzed_01.xml
index 63ad1c22..887a9ee7 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/fuzzed_02.xml
index 76097705..4a417473 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/fuzzed_03.xml
index a8523aae..a0873255 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/midnight_with_24_hours.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/midnight_with_24_hours.xml
index 17599674..5d8a932d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/midnight_with_24_hours.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/midnight_with_24_hours.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/midnight_with_zeros.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/midnight_with_zeros.xml
index 715388ae..52a6c180 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/midnight_with_zeros.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/midnight_with_zeros.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/minus_zero_offset.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/minus_zero_offset.xml
index df108b62..9939c121 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/minus_zero_offset.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/minus_zero_offset.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/plus_zero_offset.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/plus_zero_offset.xml
index 9f48b513..61225dc5 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/plus_zero_offset.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/plus_zero_offset.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/random_positive.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/random_positive.xml
index ea405817..f40cd7f0 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/random_positive.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/random_positive.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/very_large_year.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/very_large_year.xml
index 66dfe20e..1aa2909b 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/very_large_year.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/very_large_year.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/very_long_fractional_second.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/very_long_fractional_second.xml
index 43dbce96..c67de77c 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/very_long_fractional_second.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/very_long_fractional_second.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/year_1_bce_is_a_leap_year.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/year_1_bce_is_a_leap_year.xml
index ed72c704..feb393b7 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/year_1_bce_is_a_leap_year.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/year_1_bce_is_a_leap_year.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/year_5_bce_is_a_leap_year.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/year_5_bce_is_a_leap_year.xml
index aab72ddc..191613a5 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/year_5_bce_is_a_leap_year.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/lastUpdateOverPatternExamples/year_5_bce_is_a_leap_year.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/day_seconds.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/day_seconds.xml
index 3b070892..bfdb9100 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/day_seconds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/day_seconds.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/full.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/full.xml
index 37c6b705..8e7c5b86 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/full.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/full.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_01.xml
index 4d922b75..07605d5d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_02.xml
index 736c8849..3c329ed4 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_03.xml
index 2f8b5fbb..5d70cf45 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_04.xml
index e6d79f25..ac118b1f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_05.xml
index 79b18c5e..115c2e0d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_06.xml
index 09b70a4f..918c4dfd 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_07.xml
index 763b49a1..35d8feb8 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_08.xml
index 38cc8cbf..01ca67f1 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_09.xml
index e0355ba0..ac686dce 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_10.xml
index 9399a49b..0dfbb999 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/long_second_fractal.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/long_second_fractal.xml
index e0142298..d2f366c7 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/long_second_fractal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/long_second_fractal.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/many_many_seconds.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/many_many_seconds.xml
index fa19e970..234f654c 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/many_many_seconds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/many_many_seconds.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/month_seconds.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/month_seconds.xml
index 29dced31..094459f2 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/month_seconds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/month_seconds.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/only_seconds.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/only_seconds.xml
index a8523aae..a0873255 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/only_seconds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/only_seconds.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/only_year.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/only_year.xml
index a878ab16..106fd3a3 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/only_year.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maxIntervalOverPatternExamples/only_year.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maximal.xml
index a8523aae..a0873255 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/maximal.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/day_seconds.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/day_seconds.xml
index dab0da03..61e6f613 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/day_seconds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/day_seconds.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/full.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/full.xml
index 0b6cbe45..871d2310 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/full.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/full.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_01.xml
index f25f905d..5766484c 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_02.xml
index a4765250..eeb87823 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_03.xml
index 2b4ee5ff..ddf9495e 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_04.xml
index 1871522e..df7c3d38 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_05.xml
index 45274878..1d8eff43 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_06.xml
index 9b2dc87d..8326f922 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_07.xml
index 88eb9a0f..e361a079 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_08.xml
index 1a2b1d78..de98c547 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_09.xml
index 91767aa7..6a253eaa 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_10.xml
index b7bb0ec0..b441de48 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/long_second_fractal.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/long_second_fractal.xml
index e6ef838f..ca19a8c8 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/long_second_fractal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/long_second_fractal.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/many_many_seconds.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/many_many_seconds.xml
index 6fce315d..b879a57e 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/many_many_seconds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/many_many_seconds.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/month_seconds.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/month_seconds.xml
index 60384b93..d6571bde 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/month_seconds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/month_seconds.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/only_seconds.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/only_seconds.xml
index 8c3f69f8..cc66895d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/only_seconds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/only_seconds.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/only_year.xml b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/only_year.xml
index a8523aae..a0873255 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/only_year.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/basicEventElement/minIntervalOverPatternExamples/only_year.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/dash.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/dash.xml
index a9b3c65b..3241df27 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/dash.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/dash.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/dots.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/dots.xml
index bc300ffd..fab2a166 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/dots.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/dots.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/fuzzed_01.xml
index a9632e6f..ff606877 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/fuzzed_02.xml
index 7cbac52a..d40abfce 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/fuzzed_03.xml
index 71a4cc4d..c411d814 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/number prefix and suffix.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/number prefix and suffix.xml
index 756fd024..af0ef547 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/number prefix and suffix.xml	
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/number prefix and suffix.xml	
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/only_letters.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/only_letters.xml
index e6938437..0896327f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/only_letters.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/only_letters.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/plus.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/plus.xml
index 2b8930e4..2180e031 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/plus.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/plus.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/random_common_MIME_type.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/random_common_MIME_type.xml
index d5ea7369..adb75369 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/random_common_MIME_type.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/contentTypeOverPatternExamples/random_common_MIME_type.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_01.xml
index b8f57de5..21e18868 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_02.xml
index ae3b8d9e..1cfc9ee0 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_03.xml
index 6c6b057d..9248e1d4 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_04.xml
index c5d6a87a..a3df0285 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_05.xml
index a59a42c2..dd4e1c7e 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_06.xml
index 47f6a125..35c82cfe 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_07.xml
index cd8c60d8..10f13e8c 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_08.xml
index 4ce8bf65..271350f0 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_09.xml
index 71a4cc4d..c411d814 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_10.xml
index 1865a294..823f8f46 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/idShortOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/blob/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/blob/maximal.xml
index 71a4cc4d..c411d814 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/blob/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/blob/maximal.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_01.xml
index 168aa9af..f0e2aa71 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_02.xml
index 31cca962..fafae9a6 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_03.xml
index 606455b5..002d7705 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_04.xml
index c298b943..e713a8fe 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_05.xml
index 00820ea0..c67295f4 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_06.xml
index c3aaf9f2..8cf02a86 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_07.xml
index 6f410091..9502809d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_08.xml
index f742ce32..938a7f8e 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_09.xml
index 510d5bcb..0ac2910d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_10.xml
index 90632b25..4cade76d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/capability/idShortOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/capability/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/capability/maximal.xml
index 510d5bcb..0ac2910d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/capability/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/capability/maximal.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_01.xml
index ba6882d3..52728443 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_01.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_02.xml
index 13999c24..2eb26e6f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_02.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_03.xml
index 00bbbbf9..db5e0163 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_03.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_04.xml
index 1a4a2785..0a36bd7c 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_04.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_05.xml
index 6002ca10..61aa7054 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_05.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_06.xml
index e70a79cc..31e5cf0b 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_06.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_07.xml
index fbd2cc8a..573c66ff 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_07.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_08.xml
index b60726ed..f57d6d81 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_08.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_09.xml
index db366b6c..2c848228 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_09.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_10.xml
index f24e1dda..3f2ac204 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/idShortOverPatternExamples/fuzzed_10.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/maximal.xml
index f24e1dda..3f2ac204 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/conceptDescription/maximal.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/dataSpecificationIec61360/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/dataSpecificationIec61360/maximal.xml
index e3cbdae3..e148be2e 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/dataSpecificationIec61360/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/dataSpecificationIec61360/maximal.xml
@@ -51,6 +51,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/dataSpecificationIec61360/minimal.xml b/testdata/Xml/ContainedInEnvironment/Expected/dataSpecificationIec61360/minimal.xml
index ef6c8abb..49a5c2f6 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/dataSpecificationIec61360/minimal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/dataSpecificationIec61360/minimal.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/embeddedDataSpecification/minimal.xml b/testdata/Xml/ContainedInEnvironment/Expected/embeddedDataSpecification/minimal.xml
index ef6c8abb..49a5c2f6 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/embeddedDataSpecification/minimal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/embeddedDataSpecification/minimal.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_01.xml
index 88d45e65..cdcf0b47 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_02.xml
index 47f3a473..f2648fd2 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_03.xml
index 9b6a8e91..853ac95e 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_04.xml
index 2df45050..0f549c90 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_05.xml
index ececab41..c165f379 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_06.xml
index 99857c9d..70985823 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_07.xml
index e5105245..9fdc3e3f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_08.xml
index ddf381b3..6bb6c630 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_09.xml
index 59905772..5474eca3 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_10.xml
index 7d20c3a5..0125f00f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/entity/idShortOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/entity/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/entity/maximal.xml
index 59905772..5474eca3 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/entity/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/entity/maximal.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/dash.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/dash.xml
index 3eb7bc14..e372ddd5 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/dash.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/dash.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>application/x-abiword</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/dots.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/dots.xml
index a9858aff..c7d68bb0 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/dots.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/dots.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>application/vnd.amazon.ebook</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/fuzzed_01.xml
index eb6e48fc..9cceb087 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/fuzzed_01.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>7/6qwqh6g</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/fuzzed_02.xml
index c18a3b2b..04d3c159 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/fuzzed_02.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>15j/5j</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/fuzzed_03.xml
index a4a6e8b1..3b646831 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/fuzzed_03.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/number prefix and suffix.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/number prefix and suffix.xml
index 845e71bb..1bffe28a 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/number prefix and suffix.xml	
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/number prefix and suffix.xml	
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>audio/3gpp2</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/only_letters.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/only_letters.xml
index 9e242733..03254574 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/only_letters.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/only_letters.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>audio/aac</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/plus.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/plus.xml
index 1a4b45df..fcb15f05 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/plus.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/plus.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>application/vnd.apple.installer+xml</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/random_common_MIME_type.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/random_common_MIME_type.xml
index 710c1492..e015a23b 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/random_common_MIME_type.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/contentTypeOverPatternExamples/random_common_MIME_type.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>application/something-random</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_01.xml
index 211cdef1..af1dcc71 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_01.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_02.xml
index 323c772c..1c16ae73 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_02.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_03.xml
index 91752f32..41fa69bb 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_03.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_04.xml
index 236e5b12..3c75808e 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_04.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_05.xml
index 711d8a35..31c2ef01 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_05.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_06.xml
index 1f109817..3fdb32d9 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_06.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_07.xml
index f3d3d7ca..8d7ea59f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_07.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_08.xml
index b137041c..e59b6180 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_08.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_09.xml
index a4a6e8b1..3b646831 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_09.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_10.xml
index 619b08e6..ed5c2444 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/idShortOverPatternExamples/fuzzed_10.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/maximal.xml
index a4a6e8b1..3b646831 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/file/maximal.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/valueOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/valueOverPatternExamples/fuzzed_01.xml
deleted file mode 100644
index bcd22bbe..00000000
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/valueOverPatternExamples/fuzzed_01.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/valueOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/valueOverPatternExamples/fuzzed_02.xml
deleted file mode 100644
index 835ad9c6..00000000
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/valueOverPatternExamples/fuzzed_02.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>file:///;/@@=%5a@@g@=S%D8:%f5;/@:/%A3&amp;!%f8%6e;%a1!//~/%Ae%c2/%99O@,:</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/valueOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/valueOverPatternExamples/fuzzed_03.xml
deleted file mode 100644
index bbae2563..00000000
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/valueOverPatternExamples/fuzzed_03.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>file://localhost/C:</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/valueOverPatternExamples/local_absolute_path_with_scheme.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/valueOverPatternExamples/local_absolute_path_with_scheme.xml
deleted file mode 100644
index a4a6e8b1..00000000
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/valueOverPatternExamples/local_absolute_path_with_scheme.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/file/valueOverPatternExamples/local_file_with_an_explicit_authority.xml b/testdata/Xml/ContainedInEnvironment/Expected/file/valueOverPatternExamples/local_file_with_an_explicit_authority.xml
deleted file mode 100644
index 291298e4..00000000
--- a/testdata/Xml/ContainedInEnvironment/Expected/file/valueOverPatternExamples/local_file_with_an_explicit_authority.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>file://host.example.com/path/to/file</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.xml
index c7428b27..8502996c 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.xml
index 7a563226..8e82a390 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.xml
index a64db317..3b473d89 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.xml
index 9dfdbf61..981bdb7c 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_1.xml
index f892006e..ecc05df6 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_2.xml
index 32ae6115..b12cbd44 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_3.xml
index 80f4626b..f7b2e41e 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_3.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_1.xml
index 5f599a34..be7a08b5 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_2.xml
index 65d21955..d752f6d9 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_region_variant_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_1.xml
index 937a6371..19bc3d37 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_2.xml
index bc79ec46..0ec34543 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_variant.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_variant.xml
index e2a29b23..1e11cc2f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_variant.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_script_region_variant.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.xml
index 47f4d50a..54f9686c 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.xml
index 235b9839..a91a1d7f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.xml
index fd77f461..89920c90 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.xml
index 4d47577a..1ac3ea41 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_1.xml
index b287368f..2f59c41f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_2.xml
index 4457b21a..88dbeb90 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_3.xml
index 0a3849cf..ef962a02 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/language_variant_3.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.xml
index e036678b..9d75c9b5 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.xml
index d854b031..5bd33e68 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.xml
index 507483f7..28c06d9c 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.xml
index 7c92dbdd..d821b495 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.xml
index ea579472..1e5255ff 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_1.xml
index 33c10da8..e5ef6740 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_2.xml
index 99494c4a..cb028f1d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/private_use_subtags_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.xml
index e4b20e5f..ac1ea4ad 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.xml
index 80c83030..957e9ed2 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.xml
index 50ae12fb..3356c543 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.xml
index 54befe0b..12407b87 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_1.xml
index 9f94ae66..b4399353 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_2.xml
index 00a43f09..c7d9f5d3 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_3.xml
index ae0e5e94..593b587b 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/languageOverPatternExamples/tag_with_extension_3.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/maximal.xml
index 32ae6115..b12cbd44 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/maximal.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/minimal.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/minimal.xml
index 32ae6115..b12cbd44 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/minimal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringDefinitionTypeIec61360/minimal.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.xml
index bfc6958a..cda44edc 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.xml
index 632baed0..124591e7 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.xml
index e9975e3f..497d9e31 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.xml
index 39a7cb34..1339dd9d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_1.xml
index 1299f3c3..be79dae4 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_1.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_2.xml
index 5d943581..a49d9d72 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_2.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_3.xml
index 7dfbe643..1c527365 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_3.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.xml
index 61c128c8..82620f6d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.xml
index 8c643c90..f5bdc0d0 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_1.xml
index 8fa9cadb..61efd3e2 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_1.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_2.xml
index afe8bc69..a48a1699 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_2.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.xml
index 61f417e0..dc3e6e79 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.xml
index 5acfcc76..3b0c6c67 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.xml
index 30103b60..126c4c3e 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.xml
index 84c64049..5841fd55 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.xml
index d0445207..ba8a2d50 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_1.xml
index f88cdf87..7d9ed397 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_1.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_2.xml
index e8dae32d..34929b45 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_2.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_3.xml
index c5266b6d..9048ca7d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/language_variant_3.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.xml
index ad1754e5..279d0341 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.xml
index e4a58e2a..54390bef 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.xml
index 8e03cd09..782f2eb0 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.xml
index 48c14702..38807bc1 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.xml
index 546dfe04..24bbd920 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.xml
index aca36827..3a81a38f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.xml
index 69003005..b613b2c7 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.xml
index 7fb43cd4..19d8e1ce 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.xml
index 8f0f6ec9..526f25e7 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.xml
index 8fa8254f..6a7ca870 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.xml
index c15953fe..5d1f437a 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.xml
index deb36b73..f2b812c7 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.xml
index f61956c9..5181f08c 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.xml
index ae5202e2..79c69b08 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/maximal.xml
index e8dae32d..34929b45 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/maximal.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/minimal.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/minimal.xml
index e8dae32d..34929b45 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/minimal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringPreferredNameTypeIec61360/minimal.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.xml
index e259a876..07ceb707 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.xml
index 3f213031..0f84b9cb 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.xml
index 7c109194..ff6cadda 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_3.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.xml
index 2c82088c..aedfac08 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/extended_language_subtags_4.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_1.xml
index e2ff0f61..a234aa8d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_2.xml
index c4df0472..4953e632 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_3.xml
index 4fba22fe..1fd2cb4e 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_3.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.xml
index 92f5c957..c211a800 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.xml
index 656e5ed2..803dd838 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_region_variant_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_1.xml
index 4ee7463e..020a3f11 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_2.xml
index 60a05d79..74c7bdf4 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.xml
index e073d17b..e379f143 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_script_region_variant.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.xml
index 4050516d..1312d848 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.xml
index f7b3e15b..5df68f5d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.xml
index 0c1a1bc9..1ccbcc8c 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_3.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.xml
index 759fccf5..dad7f4c1 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_subtag_plus_script_subtag_4.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_1.xml
index 0d322bf6..5233d39a 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_2.xml
index eba9aade..5d1063d9 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_3.xml
index ac7fd63b..125ede68 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/language_variant_3.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.xml
index ebaf6a7a..2c1003dc 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.xml
index 2884c2e3..65a1df41 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.xml
index d3e0be1d..c2334f94 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_3.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.xml
index 78c083cc..7931b4e9 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_4.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.xml
index 77bd5d07..33b7ebb7 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_registry_values_5.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.xml
index 892b7ac5..44c2dd94 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.xml
index a16664d1..b52085a1 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/private_use_subtags_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.xml
index d1f0599a..fe9bc313 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.xml
index c5d94676..93838d25 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.xml
index aebd34df..c7789755 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_3.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.xml
index 889c3768..aa7d6849 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/simple_language_subtag_example_of_a_grandfathered_tag.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.xml
index 4dbd0102..2458d571 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_1.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.xml
index 25b43203..cec3366e 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_2.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.xml
index 89e49c19..b759081e 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/languageOverPatternExamples/tag_with_extension_3.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/maximal.xml
index 3f213031..0f84b9cb 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/maximal.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/minimal.xml b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/minimal.xml
index 3f213031..0f84b9cb 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/minimal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/langStringShortNameTypeIec61360/minimal.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/levelType/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/levelType/maximal.xml
index 3f2bc81f..b39426f9 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/levelType/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/levelType/maximal.xml
@@ -25,6 +25,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/levelType/minimal.xml b/testdata/Xml/ContainedInEnvironment/Expected/levelType/minimal.xml
index 3f2bc81f..b39426f9 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/levelType/minimal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/levelType/minimal.xml
@@ -25,6 +25,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_01.xml
index b29da0ed..ab5117bd 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_02.xml
index 13e1fc78..235183d7 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_03.xml
index acc7653e..1652c787 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_04.xml
index cc78f587..b10b0fcb 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_05.xml
index bc8dcea0..d7d8b069 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_06.xml
index dfa25292..8050642d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_07.xml
index 1b737e4e..5569662b 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_08.xml
index 57bca68c..7d55dea3 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_09.xml
index 1cb56908..397aadbf 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_10.xml
index 10c8e962..78041677 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/idShortOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/maximal.xml
index 1cb56908..397aadbf 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/multiLanguageProperty/maximal.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_01.xml
index 08f740fa..85459a14 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_02.xml
index 38234095..cd157725 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_03.xml
index e89ad17f..2ade9ce5 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_04.xml
index fe23059b..b6c799e1 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_05.xml
index f4d541f3..1657f6b9 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_06.xml
index 468567df..cab2112b 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_07.xml
index 2330cfed..d84ade8a 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_08.xml
index a587b69c..34080839 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_09.xml
index c3315a15..2de1d274 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_10.xml
index 5cdb4bd2..57828887 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/operation/idShortOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/operation/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/operation/maximal.xml
index c3315a15..2de1d274 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/operation/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/operation/maximal.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_01.xml
index 1897507a..9ee82307 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_02.xml
index 56720839..11e96461 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_03.xml
index 638c71f6..ac44bf79 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_04.xml
index 116b375e..852e3cae 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_05.xml
index cbc40502..9bfbacb3 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_06.xml
index 46c68a79..e93652af 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_07.xml
index d7be1c67..0408cc08 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_08.xml
index 35bfe2b8..19210dc7 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_09.xml
index 2aa0d25d..0965cf4d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_10.xml
index 50be1628..7d545759 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/property/idShortOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/property/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/property/maximal.xml
index 2aa0d25d..0965cf4d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/property/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/property/maximal.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_01.xml
index 1c380666..d8ea29c7 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_02.xml
index f8606e9d..6f1e4409 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_03.xml
index ee016d78..44ca8605 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_04.xml
index bbf1d0ff..db7544db 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_05.xml
index 7d9dc26a..abdb3f39 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_06.xml
index 3094cc9e..27368cb8 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_07.xml
index 371eedd8..dd64048d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_08.xml
index dc1547de..a8a29866 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_09.xml
index d72f632b..7fe00070 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_10.xml
index d360da64..49b40587 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/range/idShortOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/range/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/range/maximal.xml
index d72f632b..7fe00070 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/range/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/range/maximal.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_01.xml
index 866ccd34..a6e4f508 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_02.xml
index cdaa5b19..6a2e49a9 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_03.xml
index a37a68e7..a3c54437 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_04.xml
index 16c2efa3..db0f242e 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_05.xml
index 229a95f7..6aba0944 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_06.xml
index 3042a3ff..134c7183 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_07.xml
index 83c31c06..8edc4add 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_08.xml
index 28fb4d13..5a79b612 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_09.xml
index d3c6fc78..db534823 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_10.xml
index bf8dd25b..f8a139f7 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/idShortOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/maximal.xml
index d3c6fc78..db534823 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/referenceElement/maximal.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_01.xml
index ddd18ed0..5443674a 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_02.xml
index 0513d261..3f00bba1 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_03.xml
index 18b42020..e274e8ba 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_04.xml
index 8a8962b7..9e0973ea 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_05.xml
index 474a446b..194f4c4f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_06.xml
index d4a25367..061779b3 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_07.xml
index 1aae16ca..e2716bb2 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_08.xml
index 30da23ca..f077129d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_09.xml
index f27e93b0..81ffd82d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_10.xml
index 37c0dcba..9b009798 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/idShortOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/maximal.xml
index f27e93b0..81ffd82d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/relationshipElement/maximal.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/dash.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/dash.xml
index c1490de7..953c72ae 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/dash.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/dash.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>application/x-abiword</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/dots.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/dots.xml
index 100a25f2..bec0be8f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/dots.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/dots.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>application/vnd.amazon.ebook</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/fuzzed_01.xml
index 20151fad..64ac2de0 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/fuzzed_01.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>7/6qwqh6g</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/fuzzed_02.xml
index 96133e5d..3a9c4a46 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/fuzzed_02.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>15j/5j</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/fuzzed_03.xml
index 10ad90e7..19278bcb 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/fuzzed_03.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/number prefix and suffix.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/number prefix and suffix.xml
index 9b712709..7992d845 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/number prefix and suffix.xml	
+++ b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/number prefix and suffix.xml	
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>audio/3gpp2</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/only_letters.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/only_letters.xml
index d0ef8bb0..88cbae49 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/only_letters.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/only_letters.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>audio/aac</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/plus.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/plus.xml
index 17c5c70a..91539c03 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/plus.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/plus.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>application/vnd.apple.installer+xml</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/random_common_MIME_type.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/random_common_MIME_type.xml
index a2c2d05d..3ae3ac41 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/random_common_MIME_type.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/resource/contentTypeOverPatternExamples/random_common_MIME_type.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>application/something-random</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/maximal.xml
index c1490de7..953c72ae 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/resource/maximal.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>application/x-abiword</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/minimal.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/minimal.xml
index ef228e8f..2a142ab6 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/minimal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/resource/minimal.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 				</defaultThumbnail>
 			</assetInformation>
 		</assetAdministrationShell>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/pathOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/pathOverPatternExamples/fuzzed_01.xml
deleted file mode 100644
index c1490de7..00000000
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/pathOverPatternExamples/fuzzed_01.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/pathOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/pathOverPatternExamples/fuzzed_02.xml
deleted file mode 100644
index 9e613989..00000000
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/pathOverPatternExamples/fuzzed_02.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>file:///;/@@=%5a@@g@=S%D8:%f5;/@:/%A3&amp;!%f8%6e;%a1!//~/%Ae%c2/%99O@,:</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/pathOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/pathOverPatternExamples/fuzzed_03.xml
deleted file mode 100644
index cad9e25d..00000000
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/pathOverPatternExamples/fuzzed_03.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>file://localhost/C:</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/pathOverPatternExamples/local_absolute_path_with_scheme.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/pathOverPatternExamples/local_absolute_path_with_scheme.xml
deleted file mode 100644
index a43b7820..00000000
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/pathOverPatternExamples/local_absolute_path_with_scheme.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>file:/path/to/somewhere</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/resource/pathOverPatternExamples/local_file_with_an_explicit_authority.xml b/testdata/Xml/ContainedInEnvironment/Expected/resource/pathOverPatternExamples/local_file_with_an_explicit_authority.xml
deleted file mode 100644
index e4dd7fb6..00000000
--- a/testdata/Xml/ContainedInEnvironment/Expected/resource/pathOverPatternExamples/local_file_with_an_explicit_authority.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>file://host.example.com/path/to/file</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_01.xml
index 28a5c560..23a0313f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_02.xml
index 04e31d63..30d37a15 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_03.xml
index e449f281..45732ea2 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_04.xml
index db524c5b..be86c9c0 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_05.xml
index dc64b8a8..2dec8246 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_06.xml
index 4c4e992a..0aa07650 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_07.xml
index 5e8ea48d..dc3c3578 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_08.xml
index b0b7a18f..1fc5e40f 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_09.xml
index 53ea64bb..a52e6a31 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_10.xml
index 9333e699..46083587 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodel/idShortOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodel/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodel/maximal.xml
index 9333e699..46083587 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodel/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodel/maximal.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_01.xml
index cfe4f25f..c49ca9e8 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_02.xml
index ecf5db10..da2d56c0 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_03.xml
index c5e50dca..e1706dd6 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_04.xml
index 748f11e9..cd004668 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_05.xml
index b1c2a7b2..e7c813ed 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_06.xml
index 473e4b4a..c77f89b0 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_07.xml
index b68b34dc..8b343ca7 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_08.xml
index 78266c0b..d53cf450 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_09.xml
index c6d366c6..151665c6 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_10.xml
index 1e59002f..69c5fc3d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/idShortOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/maximal.xml
index c6d366c6..151665c6 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementCollection/maximal.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_01.xml
index 1b56c7c9..d54c1596 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_02.xml
index 059a7821..4001cd75 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_03.xml
index 5f6b10f2..cc93588e 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_04.xml
index e42c17fd..37633495 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_05.xml
index ba5bdd22..3b2a63ea 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_06.xml
index 6969408a..a60da42a 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_07.xml
index e8b4153c..9e5bb63d 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_08.xml
index 3f941d0b..dbf53482 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_09.xml
index 3f5527cd..76f86da5 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_10.xml
index 6d83cf46..cc42da98 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/idShortOverPatternExamples/fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/maximal.xml
index 3f5527cd..76f86da5 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/submodelElementList/maximal.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/valueList/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/valueList/maximal.xml
index 9fede326..35c96515 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/valueList/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/valueList/maximal.xml
@@ -34,6 +34,15 @@
 							</valueList>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/valueList/minimal.xml b/testdata/Xml/ContainedInEnvironment/Expected/valueList/minimal.xml
index 9fede326..35c96515 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/valueList/minimal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/valueList/minimal.xml
@@ -34,6 +34,15 @@
 							</valueList>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/valueReferencePair/maximal.xml b/testdata/Xml/ContainedInEnvironment/Expected/valueReferencePair/maximal.xml
index 0fab67b3..4d03433a 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/valueReferencePair/maximal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/valueReferencePair/maximal.xml
@@ -34,6 +34,15 @@
 							</valueList>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Expected/valueReferencePair/minimal.xml b/testdata/Xml/ContainedInEnvironment/Expected/valueReferencePair/minimal.xml
index 0fab67b3..4d03433a 100644
--- a/testdata/Xml/ContainedInEnvironment/Expected/valueReferencePair/minimal.xml
+++ b/testdata/Xml/ContainedInEnvironment/Expected/valueReferencePair/minimal.xml
@@ -34,6 +34,15 @@
 							</valueList>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/administrativeInformation/revision.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/administrativeInformation/revision.xml
index 9f779458..9aee1aa8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/administrativeInformation/revision.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/administrativeInformation/revision.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/administrativeInformation/templateId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/administrativeInformation/templateId.xml
index 24f051fb..1ad2f05c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/administrativeInformation/templateId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/administrativeInformation/templateId.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/administrativeInformation/version.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/administrativeInformation/version.xml
index 4d3e42fe..5709d6b8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/administrativeInformation/version.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/administrativeInformation/version.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>12301</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/annotatedRelationshipElement/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/annotatedRelationshipElement/category.xml
index 0107b09f..b075ef22 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/annotatedRelationshipElement/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/annotatedRelationshipElement/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/annotatedRelationshipElement/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/annotatedRelationshipElement/idShort.xml
index e383af3c..6be3f70a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/annotatedRelationshipElement/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/annotatedRelationshipElement/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetAdministrationShell/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetAdministrationShell/category.xml
index 7699f104..b7bc5ff0 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetAdministrationShell/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetAdministrationShell/category.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetAdministrationShell/id.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetAdministrationShell/id.xml
index 51ae24dd..4239df76 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetAdministrationShell/id.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetAdministrationShell/id.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetAdministrationShell/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetAdministrationShell/idShort.xml
index c2704b7c..dbf685b1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetAdministrationShell/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetAdministrationShell/idShort.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetInformation/assetType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetInformation/assetType.xml
index d2fdf790..9fb5e19f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetInformation/assetType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetInformation/assetType.xml
@@ -7,7 +7,7 @@
 				<globalAssetId>something_c71f0c8f</globalAssetId>
 				<assetType>something_9f4c5692123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123</assetType>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 				</defaultThumbnail>
 			</assetInformation>
 		</assetAdministrationShell>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetInformation/globalAssetId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetInformation/globalAssetId.xml
index 708aab1d..a0550b4e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetInformation/globalAssetId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/assetInformation/globalAssetId.xml
@@ -7,7 +7,7 @@
 				<globalAssetId>something_c71f0c8f123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123</globalAssetId>
 				<assetType>something_9f4c5692</assetType>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 				</defaultThumbnail>
 			</assetInformation>
 		</assetAdministrationShell>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/basicEventElement/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/basicEventElement/category.xml
index 01a5358d..d25236e6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/basicEventElement/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/basicEventElement/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/basicEventElement/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/basicEventElement/idShort.xml
index 06c4f8aa..ed31d068 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/basicEventElement/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/basicEventElement/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/basicEventElement/messageTopic.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/basicEventElement/messageTopic.xml
index e067a8a9..1a7e69d8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/basicEventElement/messageTopic.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/basicEventElement/messageTopic.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/blob/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/blob/category.xml
index 2b574e36..86ef297f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/blob/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/blob/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/blob/contentType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/blob/contentType.xml
index 418c3fb0..be26db06 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/blob/contentType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/blob/contentType.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/blob/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/blob/idShort.xml
index e4e27953..2c43fcde 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/blob/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/blob/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/capability/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/capability/category.xml
index a0dffcdd..3ecf6767 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/capability/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/capability/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/capability/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/capability/idShort.xml
index ebbb10da..236df571 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/capability/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/capability/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/conceptDescription/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/conceptDescription/category.xml
index 4b29ca13..f69b8f5e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/conceptDescription/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/conceptDescription/category.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/conceptDescription/id.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/conceptDescription/id.xml
index ac093338..03bcf09a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/conceptDescription/id.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/conceptDescription/id.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/conceptDescription/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/conceptDescription/idShort.xml
index a8da1b64..bbdca057 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/conceptDescription/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/conceptDescription/idShort.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/dataSpecificationIec61360/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/dataSpecificationIec61360/value.xml
index f35cf05a..c0587932 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/dataSpecificationIec61360/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/dataSpecificationIec61360/value.xml
@@ -51,6 +51,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/entity/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/entity/category.xml
index 454fce85..7fe19857 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/entity/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/entity/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/entity/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/entity/idShort.xml
index cb664d01..2d1459d1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/entity/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/entity/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/category.xml
index b1320ad9..c5a14e31 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/category.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/contentType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/contentType.xml
index 53f710fe..7622cca9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/contentType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/contentType.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t1</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/idShort.xml
index b4bb8408..d399f7f2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/idShort.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/value.xml
index ccb6d6b1..4f0667ab 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/file/value.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678</value>
+					<value>something_158159bf123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/langStringDefinitionTypeIec61360/text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/langStringDefinitionTypeIec61360/text.xml
index 6c632d61..50ad04f7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/langStringDefinitionTypeIec61360/text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/langStringDefinitionTypeIec61360/text.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/langStringPreferredNameTypeIec61360/text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/langStringPreferredNameTypeIec61360/text.xml
index f7df8864..239b35c5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/langStringPreferredNameTypeIec61360/text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/langStringPreferredNameTypeIec61360/text.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/langStringShortNameTypeIec61360/text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/langStringShortNameTypeIec61360/text.xml
index 04ce91f2..7f045b57 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/langStringShortNameTypeIec61360/text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/langStringShortNameTypeIec61360/text.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/multiLanguageProperty/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/multiLanguageProperty/category.xml
index 9dcac8f0..06352c54 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/multiLanguageProperty/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/multiLanguageProperty/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/multiLanguageProperty/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/multiLanguageProperty/idShort.xml
index 89df86dd..0e1ab4fc 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/multiLanguageProperty/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/multiLanguageProperty/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/operation/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/operation/category.xml
index b655f222..7e6351cc 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/operation/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/operation/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/operation/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/operation/idShort.xml
index 8f66f3ae..88c30545 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/operation/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/operation/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/property/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/property/category.xml
index e2138af9..646ff94d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/property/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/property/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/property/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/property/idShort.xml
index a0495656..d5425249 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/property/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/property/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/range/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/range/category.xml
index 172fbc76..8ca9ccfc 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/range/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/range/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/range/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/range/idShort.xml
index 92c2d4b1..a4c1097b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/range/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/range/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/referenceElement/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/referenceElement/category.xml
index 11228c00..7b5ce106 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/referenceElement/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/referenceElement/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/referenceElement/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/referenceElement/idShort.xml
index 598acb84..6129dba2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/referenceElement/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/referenceElement/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/relationshipElement/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/relationshipElement/category.xml
index 5e5cf372..4ef435ac 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/relationshipElement/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/relationshipElement/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/relationshipElement/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/relationshipElement/idShort.xml
index 6c8b4754..5337a20f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/relationshipElement/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/relationshipElement/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/resource/contentType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/resource/contentType.xml
index 844f8a4b..79bbf348 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/resource/contentType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/resource/contentType.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>application/x-abiword12345678901234567890123456789012345678901234567890123456789012345678901234567890</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/resource/path.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/resource/path.xml
index 09525e12..82e23e71 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/resource/path.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/resource/path.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123</path>
+					<path>something_57b1bd09123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123</path>
 					<contentType>application/x-abiword</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodel/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodel/category.xml
index cc2fbe0d..f86f08a4 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodel/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodel/category.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodel/id.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodel/id.xml
index 56b598ee..1eaa404c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodel/id.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodel/id.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodel/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodel/idShort.xml
index 64cadc63..7d8dcae5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodel/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodel/idShort.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementCollection/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementCollection/category.xml
index b99c4fb6..cd2f3e3b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementCollection/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementCollection/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementCollection/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementCollection/idShort.xml
index f4aec2d8..d098c550 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementCollection/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementCollection/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementList/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementList/category.xml
index d71d2eda..7133b936 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementList/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementList/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementList/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementList/idShort.xml
index ac09fd30..801f6727 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementList/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/submodelElementList/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/valueReferencePair/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/valueReferencePair/value.xml
index d3f10ed9..1d54faa7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/valueReferencePair/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MaxLengthViolation/valueReferencePair/value.xml
@@ -34,6 +34,15 @@
 							</valueList>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/administrativeInformation/revision.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/administrativeInformation/revision.xml
index 3509a01d..f4e09eaf 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/administrativeInformation/revision.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/administrativeInformation/revision.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/administrativeInformation/templateId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/administrativeInformation/templateId.xml
index 3b75d89e..ac006313 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/administrativeInformation/templateId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/administrativeInformation/templateId.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/administrativeInformation/version.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/administrativeInformation/version.xml
index 833cc2c8..1d671a15 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/administrativeInformation/version.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/administrativeInformation/version.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version></version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/annotations.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/annotations.xml
index c504f5fb..8ef88a9d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/annotations.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/annotations.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/category.xml
index 65a1fa61..8957e8bc 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/description.xml
index a3858038..40354e4d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/displayName.xml
index b3e7663c..adbb5338 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/extensions.xml
index 68ab1331..ee8c610b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/idShort.xml
index 63ec7820..a45563c8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/qualifiers.xml
index 829837b0..c7e20265 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/supplementalSemanticIds.xml
index 702f0c26..b1fa78fc 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/annotatedRelationshipElement/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/category.xml
index 81d3a2cf..c20c82de 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/category.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/description.xml
index b820ebe1..8a1bf222 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/description.xml
@@ -34,6 +34,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/displayName.xml
index 443e45f3..320559c8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/displayName.xml
@@ -34,6 +34,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/extensions.xml
index d21afeb2..afdc1958 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/extensions.xml
@@ -35,6 +35,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/id.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/id.xml
index df09954c..f65a743b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/id.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/id.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/idShort.xml
index 60c16195..7391288d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/idShort.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/submodels.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/submodels.xml
index 13122283..7be274fe 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/submodels.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetAdministrationShell/submodels.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetInformation/assetType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetInformation/assetType.xml
index 4c6a8a95..6ee2db45 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetInformation/assetType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetInformation/assetType.xml
@@ -7,7 +7,7 @@
 				<globalAssetId>something_c71f0c8f</globalAssetId>
 				<assetType></assetType>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 				</defaultThumbnail>
 			</assetInformation>
 		</assetAdministrationShell>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetInformation/globalAssetId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetInformation/globalAssetId.xml
index e55d7341..51ea36f9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetInformation/globalAssetId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/assetInformation/globalAssetId.xml
@@ -7,7 +7,7 @@
 				<globalAssetId></globalAssetId>
 				<assetType>something_9f4c5692</assetType>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 				</defaultThumbnail>
 			</assetInformation>
 		</assetAdministrationShell>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/category.xml
index 024f712a..c6a8c958 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/description.xml
index a9c9ade3..7c6d128f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/displayName.xml
index 50044c87..fd4059a5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/extensions.xml
index 3f97e99b..2e2471d7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/idShort.xml
index a69c5510..6b6b3f04 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/messageTopic.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/messageTopic.xml
index 01aaa3f3..2f528eef 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/messageTopic.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/messageTopic.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/qualifiers.xml
index 3d2f18e9..eb2785c4 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/supplementalSemanticIds.xml
index 07803531..d8256954 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/basicEventElement/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/category.xml
index 47b3854d..a02c72df 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/contentType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/contentType.xml
index 8527f67d..341e2698 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/contentType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/contentType.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/description.xml
index 25cae431..8ac92519 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/displayName.xml
index bf6e0e8b..461f8fe6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/extensions.xml
index d7cd1052..41c76774 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/idShort.xml
index fb8b4391..781aa2a9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/qualifiers.xml
index 55de9cff..bc0e8768 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/supplementalSemanticIds.xml
index 84a6e5ff..6edc73fc 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/blob/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/category.xml
index f2d8a236..b8eb03e6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/description.xml
index 1e1e3006..96f40f9d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/displayName.xml
index 184a2578..8e8aff4d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/extensions.xml
index 025fc305..5bb301ff 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/idShort.xml
index 9b918fdc..50d6c807 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/qualifiers.xml
index cf63ccd6..74b2e3cf 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/supplementalSemanticIds.xml
index 4c679f90..1ab73dc2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/capability/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/category.xml
index d73548f5..37c97a60 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/category.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/description.xml
index 4a632180..094cadff 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/description.xml
@@ -34,6 +34,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/displayName.xml
index d561d770..2b4fb529 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/displayName.xml
@@ -34,6 +34,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/extensions.xml
index 7a93ac24..e7214884 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/extensions.xml
@@ -35,6 +35,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/id.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/id.xml
index f1ffe69a..0e9389f8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/id.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/id.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/idShort.xml
index da8425dc..ba2aa6b7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/idShort.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/isCaseOf.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/isCaseOf.xml
index f12a3558..e4cc4819 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/isCaseOf.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/conceptDescription/isCaseOf.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf/>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/definition.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/definition.xml
index 6521345f..fa38ebfc 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/definition.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/definition.xml
@@ -46,6 +46,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/preferredName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/preferredName.xml
index 8247aa4f..166494a0 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/preferredName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/preferredName.xml
@@ -42,6 +42,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/shortName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/shortName.xml
index 1377c0c1..92a9e294 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/shortName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/shortName.xml
@@ -46,6 +46,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/sourceOfDefinition.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/sourceOfDefinition.xml
index dd3b2bf0..02a50afd 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/sourceOfDefinition.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/sourceOfDefinition.xml
@@ -51,6 +51,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/symbol.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/symbol.xml
index 5f83faae..8a69ed37 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/symbol.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/symbol.xml
@@ -51,6 +51,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/unit.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/unit.xml
index abf10571..26a8acc9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/unit.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/unit.xml
@@ -51,6 +51,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/value.xml
index 75e304e1..b621351c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/value.xml
@@ -51,6 +51,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/valueFormat.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/valueFormat.xml
index 342af008..9377a36c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/valueFormat.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/dataSpecificationIec61360/valueFormat.xml
@@ -51,6 +51,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/category.xml
index 91441a69..629b3e65 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/description.xml
index 1d8cba59..81c83327 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/displayName.xml
index 0b8129f9..7fe0224f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/extensions.xml
index a851c5ba..749c31f2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/idShort.xml
index 7e8e5c16..f6fe8856 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/qualifiers.xml
index 5de6b62a..fb0938e6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/statements.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/statements.xml
index 5f200954..950b70d2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/statements.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/statements.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements/>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/supplementalSemanticIds.xml
index ad6cd6e5..ffd344cf 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/entity/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/category.xml
index 0640274c..e195b26c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/category.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/contentType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/contentType.xml
index 0f639806..3155017d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/contentType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/contentType.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType></contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/description.xml
index e836c5c0..4b4d9bb3 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/description.xml
@@ -61,9 +61,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/displayName.xml
index 909ab1df..bd52edd2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/displayName.xml
@@ -61,9 +61,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/embeddedDataSpecifications.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/embeddedDataSpecifications.xml
index 57356b6b..69a258bd 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/embeddedDataSpecifications.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/embeddedDataSpecifications.xml
@@ -50,7 +50,7 @@
 						</qualifier>
 					</qualifiers>
 					<embeddedDataSpecifications/>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/extensions.xml
index 5a26686e..fb0addb3 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/extensions.xml
@@ -62,9 +62,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/idShort.xml
index 23a11ca2..1347281b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/idShort.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/qualifiers.xml
index a053a15b..bd5e2042 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/qualifiers.xml
@@ -61,9 +61,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/supplementalSemanticIds.xml
index 6d42bd75..579beeb6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/supplementalSemanticIds.xml
@@ -56,9 +56,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/value.xml
index 8022498a..4eb6189f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/file/value.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value></value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/langStringDefinitionTypeIec61360/text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/langStringDefinitionTypeIec61360/text.xml
index fd6f8db5..626e877f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/langStringDefinitionTypeIec61360/text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/langStringDefinitionTypeIec61360/text.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/langStringPreferredNameTypeIec61360/text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/langStringPreferredNameTypeIec61360/text.xml
index 02b1d738..ea43dc03 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/langStringPreferredNameTypeIec61360/text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/langStringPreferredNameTypeIec61360/text.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/langStringShortNameTypeIec61360/text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/langStringShortNameTypeIec61360/text.xml
index a0e5e67f..55a59c6a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/langStringShortNameTypeIec61360/text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/langStringShortNameTypeIec61360/text.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/category.xml
index da0a557b..b5936074 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/description.xml
index 1c864dd9..3b2d0664 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/displayName.xml
index 4630a271..d821d127 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/extensions.xml
index 03e9362a..4767e230 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/idShort.xml
index ab9e5421..e4930eb8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/qualifiers.xml
index 8de9140a..072d626e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/supplementalSemanticIds.xml
index 8b8f2750..ad54a208 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/value.xml
index 429f2997..35fcf74c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/multiLanguageProperty/value.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value/>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/category.xml
index b3d8392c..7317feaa 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/description.xml
index 712a6c05..aec09767 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/displayName.xml
index f51d374b..7bc130dd 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/extensions.xml
index 2ebba21f..4c195e91 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/idShort.xml
index cd08f394..78634dff 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/inoutputVariables.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/inoutputVariables.xml
index f98dc287..afe4910a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/inoutputVariables.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/inoutputVariables.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/inputVariables.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/inputVariables.xml
index bf36320a..ca1c36d6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/inputVariables.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/inputVariables.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables/>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/outputVariables.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/outputVariables.xml
index d9d3b70f..6e0781fb 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/outputVariables.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/outputVariables.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/qualifiers.xml
index 1a639088..52befa0c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/supplementalSemanticIds.xml
index 5aaf164f..e9dffcd4 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/operation/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/category.xml
index e945eeb9..f839492f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/description.xml
index 1f2520be..fe9c65bf 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/displayName.xml
index 0f152bff..986e7b85 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/extensions.xml
index b217a4f7..4f40010a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/idShort.xml
index e4c30d90..18db9bfe 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/qualifiers.xml
index 3afd29f9..a6735266 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/supplementalSemanticIds.xml
index e9e4577b..8aa0bf47 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/property/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/category.xml
index 1c221410..1ab227bb 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/description.xml
index 3b8c8cdc..84eefe10 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/displayName.xml
index d5aafe1e..4639341f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/extensions.xml
index 00218aa8..5d1904f0 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/idShort.xml
index 1da61d5b..10607c02 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/qualifiers.xml
index c1fec694..53b83179 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/supplementalSemanticIds.xml
index 75fbc360..e78ebc0b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/range/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/category.xml
index 1e86a7e1..8970be95 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/description.xml
index aa117316..afc456a6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/displayName.xml
index a2fd7df9..f679a51b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/extensions.xml
index 3ff0bb33..10e506d5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/idShort.xml
index a4ea2177..a6376ddd 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/qualifiers.xml
index 88633cc7..a3e65f15 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/supplementalSemanticIds.xml
index 86c8e2da..46b16e1e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/referenceElement/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/category.xml
index 648801bb..c99c5901 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/description.xml
index debc6c31..c5a0b475 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/displayName.xml
index 565594d0..0c333358 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/extensions.xml
index 0978213c..2f5567f0 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/idShort.xml
index 28d6d755..7db167b6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/qualifiers.xml
index 8df42e1c..d95c708f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/supplementalSemanticIds.xml
index 8ec57fee..4637654b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/relationshipElement/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/resource/contentType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/resource/contentType.xml
index c2de490f..7e18bd46 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/resource/contentType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/resource/contentType.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType></contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/category.xml
index 80c3b977..021eebd3 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/category.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/description.xml
index c68532a9..d4781944 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/description.xml
@@ -61,6 +61,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/displayName.xml
index 78830a3b..76d96b85 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/displayName.xml
@@ -61,6 +61,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/extensions.xml
index 2556be31..c556b3be 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/extensions.xml
@@ -62,6 +62,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/id.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/id.xml
index bf30e66d..0e2b8201 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/id.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/id.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/idShort.xml
index 4c8dabad..f6e7b910 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/idShort.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/qualifiers.xml
index be78b271..4e4ba8e0 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/qualifiers.xml
@@ -61,6 +61,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/submodelElements.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/submodelElements.xml
index 35bc6134..02adf404 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/submodelElements.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/submodelElements.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements/>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/supplementalSemanticIds.xml
index e345e975..b3f73eac 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodel/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/category.xml
index b07e6d68..58fb7ac8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/description.xml
index 1b92fbce..365a33fd 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/displayName.xml
index 7b400ed8..d27d2b3f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/extensions.xml
index 4a02c36a..f768db47 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/idShort.xml
index 05110e5a..03d5c699 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/qualifiers.xml
index 0c8900ab..8fe7ccd8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/supplementalSemanticIds.xml
index 7bb26e28..962e3564 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/value.xml
index b7c10ed4..02a089ea 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementCollection/value.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value/>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/category.xml
index bb22f60b..9b0726fd 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/category.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/description.xml
index 7d09b2ae..4a78fa9c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/displayName.xml
index 6542edb0..fa1875a5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/extensions.xml
index ee126ceb..7f82ce0c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/idShort.xml
index 99658664..0e3e1649 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/idShort.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/qualifiers.xml
index 4409fc96..9ad1060c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/supplementalSemanticIds.xml
index 1e681b8c..356638cd 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/value.xml
index 8a9053c8..8d1806a1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/submodelElementList/value.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/valueList/valueReferencePairs.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/valueList/valueReferencePairs.xml
index f4fae760..8a81c3dc 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/valueList/valueReferencePairs.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/valueList/valueReferencePairs.xml
@@ -21,6 +21,15 @@
 							</valueList>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/valueReferencePair/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/valueReferencePair/value.xml
index a8fc825f..f0d386a4 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/valueReferencePair/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/MinLengthViolation/valueReferencePair/value.xml
@@ -34,6 +34,15 @@
 							</valueList>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/revision/dot.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/revision/dot.xml
index 553083b3..d6ec8e00 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/revision/dot.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/revision/dot.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/revision/letter.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/revision/letter.xml
index 219248ae..58393100 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/revision/letter.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/revision/letter.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/revision/negative.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/revision/negative.xml
index 8da2038a..57e1908a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/revision/negative.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/revision/negative.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/version/dot.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/version/dot.xml
index 552f21f3..93df49fd 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/version/dot.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/version/dot.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1.0</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/version/letter.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/version/letter.xml
index 38e5db6b..e6fc24d7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/version/letter.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/version/letter.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1.0rc1</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/version/negative.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/version/negative.xml
index 5a0b0643..1cd23466 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/version/negative.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/administrativeInformation/version/negative.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>-1</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_01.xml
index 9397f2ad..f7d32634 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_02.xml
index cc2d4f7d..1cfc8938 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_03.xml
index a56ca30c..dedf67e1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_04.xml
index 9208548b..9cac6e1c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_06.xml
index 2e0b5fc6..72912ce3 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_08.xml
index e556a23c..b7c31222 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_08.xml
@@ -67,6 +67,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_09.xml
index cccdf3e5..0bb59034 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_10.xml
index a778631c..f077f165 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/annotatedRelationshipElement/idShort/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_01.xml
index de49145e..1500ceec 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_01.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_02.xml
index 5507b167..6f2348a9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_02.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_03.xml
index 420c9ba2..f04198e7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_03.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_04.xml
index 7592111b..a91168f0 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_04.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_06.xml
index 41ff5982..4bedff0c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_06.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_08.xml
index b6b40816..6daaf398 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_08.xml
@@ -40,6 +40,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_09.xml
index 4a659963..41f06b21 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_09.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_10.xml
index d92c5458..77ab6c6c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/assetAdministrationShell/idShort/negatively_fuzzed_10.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_01.xml
index 7f1dc146..3ddaf731 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_02.xml
index f9c2d5e1..d64dd55e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_03.xml
index 62a37202..28fca6bb 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_04.xml
index 8b66eba7..405eb8ed 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_06.xml
index d98957b8..f513ce34 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_08.xml
index 9bef52be..71534ece 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_08.xml
@@ -67,6 +67,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_09.xml
index 87ba177b..f59a3a6b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_10.xml
index b06d1969..067887b9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/idShort/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/date_time_with_UTC_and_suffix.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/date_time_with_UTC_and_suffix.xml
index 070cf005..9eaf7af1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/date_time_with_UTC_and_suffix.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/date_time_with_UTC_and_suffix.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/date_time_with_offset.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/date_time_with_offset.xml
index b7debcd7..e41cafff 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/date_time_with_offset.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/date_time_with_offset.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/date_time_without_zone.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/date_time_without_zone.xml
index e5ab51c2..2cca6ee7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/date_time_without_zone.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/date_time_without_zone.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/empty.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/empty.xml
index b15ae5de..4c728d12 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/empty.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/empty.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_02.xml
index e300cc17..17c87bb2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_03.xml
index dd0afbb8..27817868 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_04.xml
index 6a65000b..bf82ebaa 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_05.xml
index 1224a706..2665d338 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_06.xml
index d7ff21b9..c8ea3f45 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_08.xml
index b4faac44..114d8874 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_09.xml
index 62b2943c..93952a94 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_10.xml
index cd142510..47681a1d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/only_date.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/only_date.xml
index c661da0d..ef538883 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/only_date.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/only_date.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/only_date_with_time_zone.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/only_date_with_time_zone.xml
index e3b3c8e5..97e34394 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/only_date_with_time_zone.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/only_date_with_time_zone.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/without_minutes.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/without_minutes.xml
index 5923dbdd..cff91450 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/without_minutes.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/without_minutes.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/without_seconds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/without_seconds.xml
index 3fe84d7c..4e773805 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/without_seconds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/lastUpdate/without_seconds.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/empty.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/empty.xml
index ba6bfc33..3faac6de 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/empty.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/empty.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/free_form_text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/free_form_text.xml
index 515ad4e1..ecb243ce 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/free_form_text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/free_form_text.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/integer.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/integer.xml
index cc5a3fbd..6531f358 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/integer.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/integer.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/leading_P_missing.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/leading_P_missing.xml
index 0dda0596..775df266 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/leading_P_missing.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/leading_P_missing.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/negative_years.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/negative_years.xml
index af7f8764..f7e22512 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/negative_years.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/negative_years.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/positive_year_negative_months.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/positive_year_negative_months.xml
index 18ea9b94..c2596356 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/positive_year_negative_months.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/positive_year_negative_months.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/separator_T_missing.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/separator_T_missing.xml
index be9ec79b..ebe8aa31 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/separator_T_missing.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/separator_T_missing.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/the_order_matters.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/the_order_matters.xml
index 9c160376..4e2c5e6f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/the_order_matters.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/maxInterval/the_order_matters.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/empty.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/empty.xml
index 3a58e9c8..836e1bb1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/empty.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/empty.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/free_form_text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/free_form_text.xml
index ad2800d1..629d5f48 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/free_form_text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/free_form_text.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/integer.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/integer.xml
index 098cd7e5..a9d6db74 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/integer.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/integer.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/leading_P_missing.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/leading_P_missing.xml
index ef395442..6c1d597f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/leading_P_missing.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/leading_P_missing.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/negative_years.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/negative_years.xml
index 2962850c..03d03039 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/negative_years.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/negative_years.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/positive_year_negative_months.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/positive_year_negative_months.xml
index a3588de8..945fc63e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/positive_year_negative_months.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/positive_year_negative_months.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/separator_T_missing.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/separator_T_missing.xml
index e6eeeab7..2238ade4 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/separator_T_missing.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/separator_T_missing.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/the_order_matters.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/the_order_matters.xml
index facf676b..33261c16 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/the_order_matters.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/basicEventElement/minInterval/the_order_matters.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/empty.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/empty.xml
index 8527f67d..341e2698 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/empty.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/empty.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_03.xml
index a3049536..96dfbc70 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_04.xml
index a64b756f..094b39b0 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_05.xml
index 442cfec4..24358339 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_05.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_06.xml
index aca85946..a2b17d0a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_07.xml
index 56ab783c..21983b96 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_07.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_08.xml
index 8527f67d..341e2698 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_08.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_09.xml
index c16edf63..3bcda5f1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_10.xml
index ee79e990..e3efa2be 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/number.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/number.xml
index 7aa343d8..e50753fc 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/number.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/contentType/number.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_01.xml
index 2da38ccf..11d063a0 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_02.xml
index 0db1f63b..f17e0f8f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_03.xml
index a781eb19..f7ed90dd 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_04.xml
index 28042d79..594258ef 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_06.xml
index 34f989b8..f2cc46e4 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_08.xml
index 097ae445..4d29d13c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_08.xml
@@ -67,6 +67,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_09.xml
index ed14e8bc..b4627b42 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_10.xml
index 343e5850..ce6ea7aa 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/blob/idShort/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_01.xml
index d258b5fc..d79eab22 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_02.xml
index ea84890e..85989357 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_03.xml
index 4bd6a427..eb1f4d64 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_04.xml
index fc9f60b1..2652b76f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_06.xml
index 66051740..634809c1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_08.xml
index bd95dca1..e8c3eb05 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_08.xml
@@ -67,6 +67,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_09.xml
index ab86b7db..61a24184 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_10.xml
index 72792edd..52402dd8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/capability/idShort/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_01.xml
index 050f190d..584d8fa6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_01.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_02.xml
index 0a190c5d..e522c2df 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_02.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_03.xml
index e22a4559..eeab7601 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_03.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_04.xml
index 1a679fa3..154d3b9a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_04.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_06.xml
index 02fb27f8..89e2bab9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_06.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_08.xml
index f200f37c..0029afaa 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_08.xml
@@ -40,6 +40,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_09.xml
index 9d9775e4..525bc981 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_09.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_10.xml
index 4639a1c1..5858afbe 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/conceptDescription/idShort/negatively_fuzzed_10.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_01.xml
index dc7994d1..8de87fd4 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_02.xml
index c5f7a9fd..22f0315a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_03.xml
index 511a049b..ef94ff43 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_04.xml
index 2306bbce..15ee2d92 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_06.xml
index dafca305..ac46cc10 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_08.xml
index 90a9bac4..6853cf48 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_08.xml
@@ -67,6 +67,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_09.xml
index ca099c19..a88d253f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_10.xml
index f8599776..c871f05f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/entity/idShort/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/empty.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/empty.xml
index 0f639806..3155017d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/empty.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/empty.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType></contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_03.xml
index 6a3be2df..38736eb1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_03.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>𡔹</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_04.xml
index e608e422..d9c94479 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_04.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>ÐÐ</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_05.xml
index 83d33831..33ff3638 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_05.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>󝵽§…°¢󃡚&gt;3󸴷</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_06.xml
index 86a7e529..419bd42d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_06.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>q•d</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_07.xml
index b72a8081..ed5fbab6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_07.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>0</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_08.xml
index 0f639806..3155017d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_08.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType></contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_09.xml
index 48b0021d..e479b5df 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_09.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>
|ä</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_10.xml
index 417618d9..c2c94e52 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/negatively_fuzzed_10.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>𜮰𜮰</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/number.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/number.xml
index a8d587d9..1d0fe1c7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/number.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/contentType/number.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>1234</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_01.xml
index f90b086b..8ec085e1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_01.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_02.xml
index 6d41831d..f9b8a14a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_02.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_03.xml
index 7d670c5d..9f976542 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_03.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_04.xml
index e3a94515..2a0ed1a8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_04.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_06.xml
index 668c8f21..bd61c323 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_06.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_08.xml
index d7118ad3..7966ec17 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_08.xml
@@ -67,9 +67,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_09.xml
index 1121ff98..b64bcfd5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_09.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_10.xml
index 2f1ff2ed..3c9281d0 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/idShort/negatively_fuzzed_10.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/absolute_path_without_scheme.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/absolute_path_without_scheme.xml
deleted file mode 100644
index 69ac99af..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/absolute_path_without_scheme.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>/path/to/somewhere</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/empty.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/empty.xml
deleted file mode 100644
index 8022498a..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/empty.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value></value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/local_relative_path_with_scheme.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/local_relative_path_with_scheme.xml
deleted file mode 100644
index 03135f74..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/local_relative_path_with_scheme.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>file:path/to/somewhere</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_01.xml
deleted file mode 100644
index 740fadac..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_01.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>򨻚򂽶ÃZ</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_02.xml
deleted file mode 100644
index 9b2cd948..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_02.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>t#á􃆏XM~ùÌøž񌧑</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_03.xml
deleted file mode 100644
index 1eb87f94..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_03.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>񖛮&amp;1𗃹þ𭀔9</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_04.xml
deleted file mode 100644
index d8d92ed9..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_04.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>//</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_06.xml
deleted file mode 100644
index 687010ac..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_06.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>C</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_07.xml
deleted file mode 100644
index 5011683d..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_07.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>򃓮</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_08.xml
deleted file mode 100644
index 95e9cedb..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_08.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>â·񕎒E</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_09.xml
deleted file mode 100644
index 9080aa9d..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_09.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>s𚳁򈷐Å\H󀨓</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_10.xml
deleted file mode 100644
index 052e4032..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/negatively_fuzzed_10.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>hxY</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/number.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/number.xml
deleted file mode 100644
index 3f055b37..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/number.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>1234</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/relative_path_without_scheme.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/relative_path_without_scheme.xml
deleted file mode 100644
index 23e7988c..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/file/value/relative_path_without_scheme.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<submodels>
-		<submodel>
-			<id>something_48c66017</id>
-			<submodelElements>
-				<file>
-					<extensions>
-						<extension>
-							<name>something_aa1af8b3</name>
-						</extension>
-					</extensions>
-					<category>VARIABLE</category>
-					<idShort>PiXO1wyHierj</idShort>
-					<displayName>
-						<langStringNameType>
-							<language>zh-CN-a-myext-x-private</language>
-							<text>something_535aeb51</text>
-						</langStringNameType>
-					</displayName>
-					<description>
-						<langStringTextType>
-							<language>es-419</language>
-							<text>something_be9deae0</text>
-						</langStringTextType>
-					</description>
-					<semanticId>
-						<type>ExternalReference</type>
-						<keys>
-							<key>
-								<type>GlobalReference</type>
-								<value>urn:something00:f4547d0c</value>
-							</key>
-						</keys>
-					</semanticId>
-					<supplementalSemanticIds>
-						<reference>
-							<type>ModelReference</type>
-							<keys>
-								<key>
-									<type>Submodel</type>
-									<value>urn:another-example10:42487f5a</value>
-								</key>
-							</keys>
-						</reference>
-					</supplementalSemanticIds>
-					<qualifiers>
-						<qualifier>
-							<type>something_500f973e</type>
-							<valueType>xs:long</valueType>
-						</qualifier>
-					</qualifiers>
-					<embeddedDataSpecifications>
-						<embeddedDataSpecification>
-							<dataSpecificationContent>
-								<dataSpecificationIec61360>
-									<preferredName>
-										<langStringPreferredNameTypeIec61360>
-											<language>sl-rozaj-biske</language>
-											<text>something_7e795ee2</text>
-										</langStringPreferredNameTypeIec61360>
-										<langStringPreferredNameTypeIec61360>
-											<language>en-GB</language>
-											<text>Something random in English c8512bdf</text>
-										</langStringPreferredNameTypeIec61360>
-									</preferredName>
-									<value>something_4e9c19b7</value>
-								</dataSpecificationIec61360>
-							</dataSpecificationContent>
-						</embeddedDataSpecification>
-					</embeddedDataSpecifications>
-					<value>path/to/somewhere</value>
-					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
-				</file>
-			</submodelElements>
-		</submodel>
-	</submodels>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/empty.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/empty.xml
index e48f7ea7..3e8552fb 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/empty.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/empty.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/free_form_text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/free_form_text.xml
index 394e8afc..f49ff20e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/free_form_text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/free_form_text.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_02.xml
index 1e8645ff..1a9474b5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_02.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_03.xml
index fd4900f2..a877d24b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_03.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_04.xml
index 8a6ec4e9..05566635 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_04.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_05.xml
index 4e623902..cfed417e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_05.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_06.xml
index 011c260e..2b056bf3 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_06.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_07.xml
index 6f44d156..e7262d5a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_07.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_08.xml
index c3280424..4bf38cb0 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_08.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_09.xml
index a3ad742f..05d35048 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringDefinitionTypeIec61360/language/negatively_fuzzed_09.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/empty.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/empty.xml
index d26df27b..0dbe65f7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/empty.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/empty.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/free_form_text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/free_form_text.xml
index 3f27f1d3..f0966441 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/free_form_text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/free_form_text.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_02.xml
index affcd884..5a9d05aa 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_02.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_03.xml
index 46be70a4..b8dc38b7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_03.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_04.xml
index 93a672fa..dd00e493 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_04.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_05.xml
index e681ef4e..c8279eac 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_05.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_06.xml
index 6cc3e398..b3e8e5d5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_06.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_07.xml
index 824d0ef2..60125e06 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_07.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_08.xml
index aca5d613..92d09a41 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_08.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_09.xml
index f56c15c0..6a94fe7d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringPreferredNameTypeIec61360/language/negatively_fuzzed_09.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/empty.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/empty.xml
index 575a0f14..8e5a60b9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/empty.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/empty.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/free_form_text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/free_form_text.xml
index 74b658d5..e8783b69 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/free_form_text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/free_form_text.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_02.xml
index 31404aae..17a143a2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_02.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_03.xml
index 5c063a1c..1fcd3820 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_03.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_04.xml
index 89cf2bb1..1512ebd7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_04.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_05.xml
index af72cd3a..d36230f1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_05.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_06.xml
index 38d72f15..a7087035 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_06.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_07.xml
index 3d96b12c..2da737bc 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_07.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_08.xml
index 1427f0da..147f10c2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_08.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_09.xml
index df39e8bc..6b277b6d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/langStringShortNameTypeIec61360/language/negatively_fuzzed_09.xml
@@ -25,6 +25,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_01.xml
index 0d5d8064..01285c81 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_02.xml
index c3e67644..5f0622bc 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_03.xml
index bfb0c48c..de253c8f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_04.xml
index 6fbee068..0f8421f8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_06.xml
index 72904d33..ae697b92 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_08.xml
index c83b5251..b0b471ed 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_08.xml
@@ -67,6 +67,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_09.xml
index 68421882..6300828e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_10.xml
index 12513005..dea3382d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/multiLanguageProperty/idShort/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_01.xml
index eb7cf7d8..a1a28197 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_02.xml
index 7e7798e1..9eb67b0c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_03.xml
index 596f2ef2..a13164d5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_04.xml
index d85a952d..cc68ceb0 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_06.xml
index a701db7c..0b5e94f2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_08.xml
index 181e01d4..e205d5ec 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_08.xml
@@ -67,6 +67,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_09.xml
index 6dc979dc..ac9830f9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_10.xml
index 52b24e7e..442779c6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/operation/idShort/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_01.xml
index 4faaf929..49d050f5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_02.xml
index 13bc0c52..d5eaa5ea 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_03.xml
index 3d04f1ac..9d9856b7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_04.xml
index 50f344e8..69989092 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_06.xml
index 26849877..0f7390b9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_08.xml
index 5fb2967e..8b85324e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_08.xml
@@ -67,6 +67,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_09.xml
index 41e0b6fa..c4d55c58 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_10.xml
index 3461f9f5..fb66ebd5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/property/idShort/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_01.xml
index fa98d861..8e7efb14 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_02.xml
index 287fad75..2bd66272 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_03.xml
index 462dfe05..37d51a07 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_04.xml
index 0fa506cb..bffec6e0 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_06.xml
index 22f7de4f..b6c14cd5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_08.xml
index a43ffd93..06c67aae 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_08.xml
@@ -67,6 +67,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_09.xml
index 388ea165..41fd89fa 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_10.xml
index f7b990d6..6f1c9c53 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/range/idShort/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_01.xml
index 0aeab84f..894af63a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_02.xml
index d96c84d6..168c85fa 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_03.xml
index 8b357709..97ceac91 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_04.xml
index 1ec93281..89cfc7a4 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_06.xml
index 56ebdde8..73e26685 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_08.xml
index d855a98a..eb73bbc9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_08.xml
@@ -67,6 +67,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_09.xml
index 2354d73d..72bdefff 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_10.xml
index db9930de..3f61b929 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/referenceElement/idShort/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_01.xml
index c26b54bf..e18f66e7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_02.xml
index 0214683a..71356bed 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_03.xml
index 54d071a7..2a187845 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_04.xml
index 3a06f82d..03aa1c44 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_06.xml
index 96fe0ab1..8d640102 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_08.xml
index c353ee2e..f09817ff 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_08.xml
@@ -67,6 +67,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_09.xml
index 4e093ed6..45a1a3d3 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_10.xml
index 122e5f4f..df8aa89f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/relationshipElement/idShort/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/empty.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/empty.xml
index c2de490f..7e18bd46 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/empty.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/empty.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType></contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_03.xml
index 26346a9c..e02c797d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_03.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>𡔹</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_04.xml
index cf8f39d8..c24e4792 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_04.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>ÐÐ</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_05.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_05.xml
index 9b9be8d6..b6fac7ec 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_05.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_05.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>󝵽§…°¢󃡚&gt;3󸴷</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_06.xml
index cb1c228c..8bd96bb8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_06.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>q•d</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_07.xml
index aa88146f..b326eeed 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_07.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_07.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>0</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_08.xml
index c2de490f..7e18bd46 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_08.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType></contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_09.xml
index cb7fd7e2..e9d1390d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_09.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>
|ä</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_10.xml
index f1747669..b7a506ca 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/negatively_fuzzed_10.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>𜮰𜮰</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/number.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/number.xml
index 5117e89e..d61a332a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/number.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/contentType/number.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>1234</contentType>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/absolute_path_without_scheme.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/absolute_path_without_scheme.xml
deleted file mode 100644
index fbd4d96a..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/absolute_path_without_scheme.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>/path/to/somewhere</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/empty.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/empty.xml
deleted file mode 100644
index 6591d804..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/empty.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path></path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/local_relative_path_with_scheme.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/local_relative_path_with_scheme.xml
deleted file mode 100644
index 2406964c..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/local_relative_path_with_scheme.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>file:path/to/somewhere</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_01.xml
deleted file mode 100644
index e223cee1..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_01.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>򨻚򂽶ÃZ</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_02.xml
deleted file mode 100644
index a988bd9a..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_02.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>t#á􃆏XM~ùÌøž񌧑</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_03.xml
deleted file mode 100644
index bc49121d..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_03.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>񖛮&amp;1𗃹þ𭀔9</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_04.xml
deleted file mode 100644
index 0124c3ae..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_04.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>//</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_06.xml
deleted file mode 100644
index 3c557bd7..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_06.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>C</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_07.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_07.xml
deleted file mode 100644
index 60c2efd1..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_07.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>򃓮</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_08.xml
deleted file mode 100644
index 21d84885..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_08.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>â·񕎒E</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_09.xml
deleted file mode 100644
index d1a12bb9..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_09.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>s𚳁򈷐Å\H󀨓</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_10.xml
deleted file mode 100644
index bf2de371..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/negatively_fuzzed_10.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>hxY</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/number.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/number.xml
deleted file mode 100644
index dcc3540b..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/number.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>1234</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/relative_path_without_scheme.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/relative_path_without_scheme.xml
deleted file mode 100644
index 6e9902e7..00000000
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/resource/path/relative_path_without_scheme.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<environment xmlns="https://admin-shell.io/aas/3/0">
-	<assetAdministrationShells>
-		<assetAdministrationShell>
-			<id>something_142922d6</id>
-			<assetInformation>
-				<assetKind>NotApplicable</assetKind>
-				<globalAssetId>something_eea66fa1</globalAssetId>
-				<defaultThumbnail>
-					<path>path/to/somewhere</path>
-					<contentType>application/x-abiword</contentType>
-				</defaultThumbnail>
-			</assetInformation>
-		</assetAdministrationShell>
-	</assetAdministrationShells>
-</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_01.xml
index 376ebc85..55f03c5f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_01.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_02.xml
index 5af20ba0..cbaa9956 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_02.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_03.xml
index 5770714b..04293d09 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_04.xml
index 736e1ffd..8e7118f6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_06.xml
index abc24cb4..de79537c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_08.xml
index cc1818e2..6751d98a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_08.xml
@@ -67,6 +67,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_09.xml
index bd02b7dd..6d32d6d5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_10.xml
index 10d2be07..2e233ee2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodel/idShort/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_01.xml
index 4a075509..88bbb615 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_02.xml
index 2845ab7d..7de5aeaf 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_03.xml
index d327db30..733a4e5c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_04.xml
index 8eb34334..22ebb4b2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_06.xml
index d6adc466..166ec010 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_08.xml
index d708f03c..6497c467 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_08.xml
@@ -67,6 +67,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_09.xml
index b2ac6ba7..595e0bd8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_10.xml
index 7b98054f..46ddc3e3 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementCollection/idShort/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_01.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_01.xml
index c2f5148c..be8f4301 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_01.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_01.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_02.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_02.xml
index 9b825b72..545e80bc 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_02.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_02.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_03.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_03.xml
index e43d996d..e38926fb 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_03.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_03.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_04.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_04.xml
index 6c8594b8..84b64bf3 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_04.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_04.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_06.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_06.xml
index 4f97c1b8..08feac72 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_06.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_06.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_08.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_08.xml
index 23e5e2f2..bc3fc144 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_08.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_08.xml
@@ -67,6 +67,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_09.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_09.xml
index 96367b27..041b44ed 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_09.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_09.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_10.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_10.xml
index f8ad8784..108de61e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_10.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Invalid/PatternViolation/submodelElementList/idShort/negatively_fuzzed_10.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/assetInformation/assetKind_as_assetKind.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/assetInformation/assetKind_as_assetKind.xml
index ab10c60b..431a1e50 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/assetInformation/assetKind_as_assetKind.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/assetInformation/assetKind_as_assetKind.xml
@@ -7,7 +7,7 @@
 				<globalAssetId>something_c71f0c8f</globalAssetId>
 				<assetType>something_9f4c5692</assetType>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 				</defaultThumbnail>
 			</assetInformation>
 		</assetAdministrationShell>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/basicEventElement/direction_as_direction.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/basicEventElement/direction_as_direction.xml
index fd63cf4f..224c46ea 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/basicEventElement/direction_as_direction.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/basicEventElement/direction_as_direction.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/basicEventElement/state_as_stateOfEvent.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/basicEventElement/state_as_stateOfEvent.xml
index e1b525fa..625ce32d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/basicEventElement/state_as_stateOfEvent.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/basicEventElement/state_as_stateOfEvent.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/dataSpecificationIec61360/dataType_as_dataTypeIec61360.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/dataSpecificationIec61360/dataType_as_dataTypeIec61360.xml
index bb54c005..425e23f5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/dataSpecificationIec61360/dataType_as_dataTypeIec61360.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/dataSpecificationIec61360/dataType_as_dataTypeIec61360.xml
@@ -51,6 +51,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/entity/entityType_as_entityType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/entity/entityType_as_entityType.xml
index bae2e132..c3cd3415 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/entity/entityType_as_entityType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/entity/entityType_as_entityType.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/property/valueType_as_dataTypeDefXsd.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/property/valueType_as_dataTypeDefXsd.xml
index 960ca0ae..d6403b7a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/property/valueType_as_dataTypeDefXsd.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/property/valueType_as_dataTypeDefXsd.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>totally utterly invalid</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/range/valueType_as_dataTypeDefXsd.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/range/valueType_as_dataTypeDefXsd.xml
index 496c6708..c8455984 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/range/valueType_as_dataTypeDefXsd.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/range/valueType_as_dataTypeDefXsd.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>totally utterly invalid</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/submodel/kind_as_modellingKind.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/submodel/kind_as_modellingKind.xml
index a0f74887..97957273 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/submodel/kind_as_modellingKind.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/submodel/kind_as_modellingKind.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/submodelElementList/typeValueListElement_as_aasSubmodelElements.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/submodelElementList/typeValueListElement_as_aasSubmodelElements.xml
index 9e8f5f0f..a178d9a2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/submodelElementList/typeValueListElement_as_aasSubmodelElements.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/submodelElementList/typeValueListElement_as_aasSubmodelElements.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/submodelElementList/valueTypeListElement_as_dataTypeDefXsd.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/submodelElementList/valueTypeListElement_as_dataTypeDefXsd.xml
index 5175f8ff..6c617f90 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/submodelElementList/valueTypeListElement_as_dataTypeDefXsd.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/EnumViolation/submodelElementList/valueTypeListElement_as_dataTypeDefXsd.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/dataSpecificationIec61360/preferredName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/dataSpecificationIec61360/preferredName.xml
index 38653fd6..89e05c8a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/dataSpecificationIec61360/preferredName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/dataSpecificationIec61360/preferredName.xml
@@ -9,6 +9,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/embeddedDataSpecification/dataSpecification.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/embeddedDataSpecification/dataSpecification.xml
new file mode 100644
index 00000000..ef6c8abb
--- /dev/null
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/embeddedDataSpecification/dataSpecification.xml
@@ -0,0 +1,30 @@
+<environment xmlns="https://admin-shell.io/aas/3/0">
+	<assetAdministrationShells>
+		<assetAdministrationShell>
+			<id>something_142922d6</id>
+			<embeddedDataSpecifications>
+				<embeddedDataSpecification>
+					<dataSpecificationContent>
+						<dataSpecificationIec61360>
+							<preferredName>
+								<langStringPreferredNameTypeIec61360>
+									<language>i-enochian</language>
+									<text>something_84b0b440</text>
+								</langStringPreferredNameTypeIec61360>
+								<langStringPreferredNameTypeIec61360>
+									<language>en-GB</language>
+									<text>Something random in English 5b15c20d</text>
+								</langStringPreferredNameTypeIec61360>
+							</preferredName>
+							<value>something_13759f45</value>
+						</dataSpecificationIec61360>
+					</dataSpecificationContent>
+				</embeddedDataSpecification>
+			</embeddedDataSpecifications>
+			<assetInformation>
+				<assetKind>NotApplicable</assetKind>
+				<globalAssetId>something_eea66fa1</globalAssetId>
+			</assetInformation>
+		</assetAdministrationShell>
+	</assetAdministrationShells>
+</environment>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/embeddedDataSpecification/dataSpecificationContent.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/embeddedDataSpecification/dataSpecificationContent.xml
index 64bbad67..42f08a3a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/embeddedDataSpecification/dataSpecificationContent.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/embeddedDataSpecification/dataSpecificationContent.xml
@@ -3,7 +3,17 @@
 		<assetAdministrationShell>
 			<id>something_142922d6</id>
 			<embeddedDataSpecifications>
-				<embeddedDataSpecification/>
+				<embeddedDataSpecification>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
+				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
 				<assetKind>NotApplicable</assetKind>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringDefinitionTypeIec61360/language.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringDefinitionTypeIec61360/language.xml
index f38c300e..a20763bf 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringDefinitionTypeIec61360/language.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringDefinitionTypeIec61360/language.xml
@@ -24,6 +24,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringDefinitionTypeIec61360/text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringDefinitionTypeIec61360/text.xml
index 4f34251e..9eba5c69 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringDefinitionTypeIec61360/text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringDefinitionTypeIec61360/text.xml
@@ -24,6 +24,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringPreferredNameTypeIec61360/language.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringPreferredNameTypeIec61360/language.xml
index b460374e..51c6daeb 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringPreferredNameTypeIec61360/language.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringPreferredNameTypeIec61360/language.xml
@@ -18,6 +18,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringPreferredNameTypeIec61360/text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringPreferredNameTypeIec61360/text.xml
index a963de96..5330a2c1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringPreferredNameTypeIec61360/text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringPreferredNameTypeIec61360/text.xml
@@ -18,6 +18,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringShortNameTypeIec61360/language.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringShortNameTypeIec61360/language.xml
index 9e9e7e41..fd38cf76 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringShortNameTypeIec61360/language.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringShortNameTypeIec61360/language.xml
@@ -24,6 +24,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringShortNameTypeIec61360/text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringShortNameTypeIec61360/text.xml
index 001c41ad..f53ae580 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringShortNameTypeIec61360/text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/langStringShortNameTypeIec61360/text.xml
@@ -24,6 +24,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/max.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/max.xml
index 83409fcb..8c6407e3 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/max.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/max.xml
@@ -24,6 +24,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/min.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/min.xml
index df1e0f33..54da4559 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/min.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/min.xml
@@ -24,6 +24,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/nom.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/nom.xml
index 4b61b662..1890f2ec 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/nom.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/nom.xml
@@ -24,6 +24,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/typ.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/typ.xml
index 81f52003..f8f85d4b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/typ.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/levelType/typ.xml
@@ -24,6 +24,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/valueList/valueReferencePairs.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/valueList/valueReferencePairs.xml
index 1ae53c69..331f2e94 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/valueList/valueReferencePairs.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/valueList/valueReferencePairs.xml
@@ -19,6 +19,15 @@
 							<valueList/>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/valueReferencePair/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/valueReferencePair/value.xml
index 375a695d..3d0dbc9f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/valueReferencePair/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/valueReferencePair/value.xml
@@ -33,6 +33,15 @@
 							</valueList>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/valueReferencePair/valueId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/valueReferencePair/valueId.xml
index 56414180..567ef01a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/valueReferencePair/valueId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/RequiredViolation/valueReferencePair/valueId.xml
@@ -25,6 +25,15 @@
 							</valueList>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/creator.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/creator.xml
index 1d9569a2..8d232da2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/creator.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/creator.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/revision.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/revision.xml
index 34153d41..a50646f9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/revision.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/revision.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/templateId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/templateId.xml
index 19d7542b..3aedd09a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/templateId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/templateId.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>1230</version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/version.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/version.xml
index 1232e657..8dc77dbb 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/version.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/administrativeInformation/version.xml
@@ -19,6 +19,15 @@
 								<value>something_bebf64f0</value>
 							</dataSpecificationIec61360>
 						</dataSpecificationContent>
+						<dataSpecification>
+							<type>ExternalReference</type>
+							<keys>
+								<key>
+									<type>GlobalReference</type>
+									<value>urn:something14:18179b7a</value>
+								</key>
+							</keys>
+						</dataSpecification>
 					</embeddedDataSpecification>
 				</embeddedDataSpecifications>
 				<version>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/annotations.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/annotations.xml
index 8ef41755..62bb96e2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/annotations.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/annotations.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/category.xml
index f0c96e75..cf8ad144 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/category.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/description.xml
index fb77e1f0..759b123d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/displayName.xml
index 7d1b70b1..5091f381 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/extensions.xml
index d8816ba3..db44abeb 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/first.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/first.xml
index 74784fbf..9ee848b8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/first.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/first.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>Unexpected string value</first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/idShort.xml
index ff9963d1..f8c7640f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/idShort.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/qualifiers.xml
index 9025d7cd..262e4f49 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/second.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/second.xml
index bf6f1df1..5529bd95 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/second.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/second.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/semanticId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/semanticId.xml
index 1458dd9a..9d6fe783 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/semanticId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/semanticId.xml
@@ -58,6 +58,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/supplementalSemanticIds.xml
index 133ec4ca..f43198c2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/annotatedRelationshipElement/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/administration.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/administration.xml
index dca8fcf8..022a34ea 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/administration.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/administration.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/assetInformation.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/assetInformation.xml
index ee890d3b..fb52ca0e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/assetInformation.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/assetInformation.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/category.xml
index 43d595ad..d53d6e55 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/category.xml
@@ -49,6 +49,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/derivedFrom.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/derivedFrom.xml
index 1b1dadf8..63d21f3d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/derivedFrom.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/derivedFrom.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>Unexpected string value</derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/description.xml
index b61e071c..ec6e8e1a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/description.xml
@@ -34,6 +34,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/displayName.xml
index 7746f5c0..07a7cf13 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/displayName.xml
@@ -34,6 +34,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/extensions.xml
index 0ae3b682..cead6815 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/extensions.xml
@@ -35,6 +35,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/id.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/id.xml
index c7b16776..32b844e2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/id.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/id.xml
@@ -49,6 +49,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/idShort.xml
index a2f28202..a447d177 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/idShort.xml
@@ -49,6 +49,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/submodels.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/submodels.xml
index 6ecc28a6..d1b0804b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/submodels.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetAdministrationShell/submodels.xml
@@ -39,6 +39,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<derivedFrom>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetInformation/assetKind.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetInformation/assetKind.xml
index 6dac12ce..b226e5ce 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetInformation/assetKind.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetInformation/assetKind.xml
@@ -17,7 +17,7 @@
 				<globalAssetId>something_c71f0c8f</globalAssetId>
 				<assetType>something_9f4c5692</assetType>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 				</defaultThumbnail>
 			</assetInformation>
 		</assetAdministrationShell>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetInformation/assetType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetInformation/assetType.xml
index 4d9b9a5f..c406cda4 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetInformation/assetType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetInformation/assetType.xml
@@ -17,7 +17,7 @@
 					</reference>
 				</assetType>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 				</defaultThumbnail>
 			</assetInformation>
 		</assetAdministrationShell>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetInformation/globalAssetId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetInformation/globalAssetId.xml
index 87f92a42..5069a46b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetInformation/globalAssetId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/assetInformation/globalAssetId.xml
@@ -17,7 +17,7 @@
 				</globalAssetId>
 				<assetType>something_9f4c5692</assetType>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 				</defaultThumbnail>
 			</assetInformation>
 		</assetAdministrationShell>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/category.xml
index a20160a0..ab7446df 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/category.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/description.xml
index 8146ee53..8666183a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/direction.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/direction.xml
index 7dac93a0..282dbdfb 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/direction.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/direction.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/displayName.xml
index d132fd62..86a94236 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/extensions.xml
index c38726f9..a09475f5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/idShort.xml
index 648600c0..63c0c53e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/idShort.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/lastUpdate.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/lastUpdate.xml
index 5e70bb4f..c362bd38 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/lastUpdate.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/lastUpdate.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/maxInterval.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/maxInterval.xml
index e53fb60d..cb8416ab 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/maxInterval.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/maxInterval.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/messageBroker.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/messageBroker.xml
index 6521be37..4170cc6e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/messageBroker.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/messageBroker.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/messageTopic.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/messageTopic.xml
index 91bf79d5..d63d8aa7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/messageTopic.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/messageTopic.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/minInterval.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/minInterval.xml
index b6ac3dc9..2c0a3b54 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/minInterval.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/minInterval.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/observed.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/observed.xml
index 220b1c8c..15000264 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/observed.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/observed.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>Unexpected string value</observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/qualifiers.xml
index 903c1123..d4e59b60 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/semanticId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/semanticId.xml
index af266c45..e395e006 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/semanticId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/semanticId.xml
@@ -58,6 +58,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/state.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/state.xml
index 0f787329..9db9ce1d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/state.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/state.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/supplementalSemanticIds.xml
index 6d3947b7..dab611a5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/basicEventElement/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<observed>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/category.xml
index 2e10cce3..b475502b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/category.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/contentType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/contentType.xml
index 928b6d45..3f5f9550 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/contentType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/contentType.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/description.xml
index 98a79d57..e3e313b2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/displayName.xml
index 65efd594..7880c1dc 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/extensions.xml
index b53f3459..4f7251e4 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/idShort.xml
index 9b9d3bb9..877c5d9f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/idShort.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/qualifiers.xml
index d29ad551..58214193 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/semanticId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/semanticId.xml
index f476b170..78cd2b0d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/semanticId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/semanticId.xml
@@ -58,6 +58,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/supplementalSemanticIds.xml
index 61b8390f..604feb3f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>FYFZv/O3Z+zHt1M=</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/value.xml
index 0822a7b4..5d7e87bf 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/blob/value.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/category.xml
index b175b549..925a5a2e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/category.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/description.xml
index a7380672..401f5d1c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/displayName.xml
index 1ac5b8a2..fb86f15c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/extensions.xml
index 0b3649a5..472e99da 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/idShort.xml
index a8c387dd..2f505714 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/idShort.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/qualifiers.xml
index a33a7f33..91d5b4c5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/semanticId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/semanticId.xml
index aff2cfb5..194b94ff 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/semanticId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/semanticId.xml
@@ -58,6 +58,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/supplementalSemanticIds.xml
index c99bd77b..b9c33359 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/capability/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 				</capability>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/administration.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/administration.xml
index 0ae90678..107f5b74 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/administration.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/administration.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/category.xml
index 28cca851..63c36a62 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/category.xml
@@ -49,6 +49,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/description.xml
index 8f0309e5..24fb4d90 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/description.xml
@@ -34,6 +34,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/displayName.xml
index 0e13551b..037b652a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/displayName.xml
@@ -34,6 +34,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/extensions.xml
index c9e4fb24..064b32b8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/extensions.xml
@@ -35,6 +35,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/id.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/id.xml
index 338b36d9..3760c31b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/id.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/id.xml
@@ -49,6 +49,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/idShort.xml
index 59bbcfd6..6cf6bf41 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/idShort.xml
@@ -49,6 +49,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/isCaseOf.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/isCaseOf.xml
index 85df1ba6..becab733 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/isCaseOf.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/conceptDescription/isCaseOf.xml
@@ -39,6 +39,15 @@
 							<value>something_a864dcb4</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ModelReference</type>
+						<keys>
+							<key>
+								<type>Submodel</type>
+								<value>urn:example14:c4971d26</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<isCaseOf>Unexpected string value</isCaseOf>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/dataType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/dataType.xml
index 0a681225..27e6782d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/dataType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/dataType.xml
@@ -61,6 +61,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/definition.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/definition.xml
index bf507859..5e8bcca6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/definition.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/definition.xml
@@ -46,6 +46,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/levelType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/levelType.xml
index 23401b53..adc49526 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/levelType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/levelType.xml
@@ -46,6 +46,15 @@
 							<levelType>Unexpected string value</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/preferredName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/preferredName.xml
index a139a367..92c7664d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/preferredName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/preferredName.xml
@@ -42,6 +42,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/shortName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/shortName.xml
index 0ab69e11..5829b696 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/shortName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/shortName.xml
@@ -46,6 +46,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/sourceOfDefinition.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/sourceOfDefinition.xml
index e93ebfa4..1f052333 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/sourceOfDefinition.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/sourceOfDefinition.xml
@@ -61,6 +61,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/symbol.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/symbol.xml
index 214ef348..70570ab1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/symbol.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/symbol.xml
@@ -61,6 +61,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/unit.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/unit.xml
index 9a1cf233..2858783e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/unit.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/unit.xml
@@ -61,6 +61,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/unitId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/unitId.xml
index 8634affe..73b16745 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/unitId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/unitId.xml
@@ -43,6 +43,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/value.xml
index 7a721a76..b1553f43 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/value.xml
@@ -61,6 +61,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/valueFormat.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/valueFormat.xml
index 35a7f33f..cbc5682f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/valueFormat.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/dataSpecificationIec61360/valueFormat.xml
@@ -61,6 +61,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/category.xml
index 1fedf531..7eefc8d8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/category.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/description.xml
index 76a93e80..d8e2b422 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/displayName.xml
index 30c45f81..abda0a97 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/entityType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/entityType.xml
index 25dd48b7..ae3d7dcf 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/entityType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/entityType.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/extensions.xml
index d9a85834..7f40e641 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/idShort.xml
index f0b7b35e..080e4fd7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/idShort.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/qualifiers.xml
index 7973896d..11854347 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/semanticId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/semanticId.xml
index f23b8c57..6f33bc70 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/semanticId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/semanticId.xml
@@ -58,6 +58,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/statements.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/statements.xml
index fa5c3ccc..712cd35c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/statements.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/statements.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>Unexpected string value</statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/supplementalSemanticIds.xml
index b54ee068..61ba2281 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/entity/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<statements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/category.xml
index 52f396b1..f0736bae 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/category.xml
@@ -76,9 +76,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/contentType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/contentType.xml
index 90bc1a30..9dcf4fce 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/contentType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/contentType.xml
@@ -66,9 +66,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>
 						<reference>
 							<type>ExternalReference</type>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/description.xml
index ace66347..6baadd73 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/description.xml
@@ -61,9 +61,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/displayName.xml
index 4765a7f5..834c2d7d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/displayName.xml
@@ -61,9 +61,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/embeddedDataSpecifications.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/embeddedDataSpecifications.xml
index b2e66ea3..698c9d63 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/embeddedDataSpecifications.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/embeddedDataSpecifications.xml
@@ -50,7 +50,7 @@
 						</qualifier>
 					</qualifiers>
 					<embeddedDataSpecifications>Unexpected string value</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/extensions.xml
index f90e76ae..5d882d6c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/extensions.xml
@@ -62,9 +62,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/idShort.xml
index 125e7dde..7bf8b426 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/idShort.xml
@@ -76,9 +76,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/qualifiers.xml
index e374bc77..826682d4 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/qualifiers.xml
@@ -61,9 +61,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/semanticId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/semanticId.xml
index 23ece916..ad1d43f6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/semanticId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/semanticId.xml
@@ -58,9 +58,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/supplementalSemanticIds.xml
index 06574acd..54574873 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/supplementalSemanticIds.xml
@@ -56,9 +56,18 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
-					<value>file:/path/to/somewhere</value>
+					<value>something_158159bf</value>
 					<contentType>'VbrwFrYTU/fO7NnLxq   	; 	MX.`10dB732`X5yRy=I56Ov9Us	 ;		 pRb~~hdw_C%2Zf=&quot;&quot;			    			 	 		 	  ; h=1t</contentType>
 				</file>
 			</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/value.xml
index eb9e3c36..98c20b66 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/file/value.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringDefinitionTypeIec61360/language.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringDefinitionTypeIec61360/language.xml
index f8c94eda..f593fb32 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringDefinitionTypeIec61360/language.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringDefinitionTypeIec61360/language.xml
@@ -35,6 +35,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringDefinitionTypeIec61360/text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringDefinitionTypeIec61360/text.xml
index 637a7cb6..06cbc61d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringDefinitionTypeIec61360/text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringDefinitionTypeIec61360/text.xml
@@ -35,6 +35,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringPreferredNameTypeIec61360/language.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringPreferredNameTypeIec61360/language.xml
index 455e1a2f..8fd93ddb 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringPreferredNameTypeIec61360/language.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringPreferredNameTypeIec61360/language.xml
@@ -29,6 +29,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringPreferredNameTypeIec61360/text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringPreferredNameTypeIec61360/text.xml
index ce7d84ea..26601057 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringPreferredNameTypeIec61360/text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringPreferredNameTypeIec61360/text.xml
@@ -29,6 +29,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringShortNameTypeIec61360/language.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringShortNameTypeIec61360/language.xml
index b2201bf6..f9468b3a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringShortNameTypeIec61360/language.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringShortNameTypeIec61360/language.xml
@@ -35,6 +35,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringShortNameTypeIec61360/text.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringShortNameTypeIec61360/text.xml
index a5540ea2..5cf5c2f9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringShortNameTypeIec61360/text.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/langStringShortNameTypeIec61360/text.xml
@@ -35,6 +35,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/max.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/max.xml
index 62f5a602..78eafd7c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/max.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/max.xml
@@ -35,6 +35,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/min.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/min.xml
index 9d476892..ef6e2798 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/min.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/min.xml
@@ -35,6 +35,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/nom.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/nom.xml
index 656168e5..cf63cec9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/nom.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/nom.xml
@@ -35,6 +35,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/typ.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/typ.xml
index 73038898..64e75b08 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/typ.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/levelType/typ.xml
@@ -35,6 +35,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/category.xml
index 74f834dc..ae17e0f9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/category.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/description.xml
index ea305fd8..8d09e7c4 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/displayName.xml
index 595ad07a..ddcee696 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/extensions.xml
index a036ab0f..013ed979 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/idShort.xml
index ab7accdf..428f40ee 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/idShort.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/qualifiers.xml
index 792eb5c9..312211be 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/semanticId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/semanticId.xml
index 212f89f7..bf2ec7f8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/semanticId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/semanticId.xml
@@ -58,6 +58,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/supplementalSemanticIds.xml
index fa310a7c..6e450bbb 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/value.xml
index 5db628ed..b64e62d6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/value.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>Unexpected string value</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/valueId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/valueId.xml
index 26d2bcf5..4393d27a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/valueId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/multiLanguageProperty/valueId.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/category.xml
index 0f83626b..7da4a227 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/category.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/description.xml
index db7a92f4..a82d93df 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/displayName.xml
index 1e8570fd..9436c4c2 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/extensions.xml
index 8dda85cb..467494b8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/idShort.xml
index 88d90280..8a0511af 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/idShort.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/inoutputVariables.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/inoutputVariables.xml
index 10173d15..61b45f33 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/inoutputVariables.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/inoutputVariables.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/inputVariables.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/inputVariables.xml
index 2524856e..5e2c793e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/inputVariables.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/inputVariables.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>Unexpected string value</inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/outputVariables.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/outputVariables.xml
index 08dea4c3..5354b07f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/outputVariables.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/outputVariables.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/qualifiers.xml
index 2baf97ea..7eeb3b5c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/semanticId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/semanticId.xml
index e42e3982..e939d52b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/semanticId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/semanticId.xml
@@ -58,6 +58,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/supplementalSemanticIds.xml
index b7de181a..48b2b329 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/operation/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<inputVariables>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/category.xml
index fccbcc5f..8fa708a6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/category.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/description.xml
index b41275dc..30b54645 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/displayName.xml
index 6b674f63..c2f52275 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/extensions.xml
index 98a817c3..45f6953b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/idShort.xml
index e9182661..b18e2842 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/idShort.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/qualifiers.xml
index ec16254c..e8134e40 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/semanticId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/semanticId.xml
index 8ce58cfc..9f3971b1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/semanticId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/semanticId.xml
@@ -58,6 +58,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/supplementalSemanticIds.xml
index cb7c5dd8..5af2bb89 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/value.xml
index 0008fd53..b8c4428a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/value.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/valueId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/valueId.xml
index 6866ea5e..f3c96ba0 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/valueId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/valueId.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/valueType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/valueType.xml
index 6859d5d7..dc116723 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/valueType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/property/valueType.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/category.xml
index 4231dbf7..6f2b1586 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/category.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/description.xml
index bcadca29..e019662d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/displayName.xml
index 1490ae40..e700157d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/extensions.xml
index 1729088d..1d00b5eb 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/idShort.xml
index 2b82adb1..51763083 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/idShort.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/max.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/max.xml
index 5cfed73f..089c7809 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/max.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/max.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/qualifiers.xml
index 0b068ce9..a3cf88ca 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/semanticId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/semanticId.xml
index dd0c5d95..ad4c3465 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/semanticId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/semanticId.xml
@@ -58,6 +58,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/supplementalSemanticIds.xml
index 1d4800c6..8cad9f4e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>xs:decimal</valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/valueType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/valueType.xml
index 36637252..c5b8ce2f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/valueType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/range/valueType.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<valueType>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/category.xml
index bac229b2..d80d7609 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/category.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/description.xml
index 9d249507..7af793b1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/displayName.xml
index a0ed60aa..d6001eb1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/extensions.xml
index b88ce77f..810301f8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/idShort.xml
index 845639e9..d4b0c68c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/idShort.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/qualifiers.xml
index 90c1b820..e8561444 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/semanticId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/semanticId.xml
index ae955d40..251f19b6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/semanticId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/semanticId.xml
@@ -58,6 +58,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/supplementalSemanticIds.xml
index e2ced39d..eb7a5b64 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/value.xml
index f9bac1bc..1b5383f5 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/referenceElement/value.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>Unexpected string value</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/category.xml
index 9606b5a3..9d14510c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/category.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/description.xml
index fe485d7b..f96dc975 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/displayName.xml
index ae8ad897..df3be2e3 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/extensions.xml
index 011211a2..64a8379a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/first.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/first.xml
index ba690b2a..5463f3f9 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/first.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/first.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>Unexpected string value</first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/idShort.xml
index ca651eb1..c665d6a1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/idShort.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/qualifiers.xml
index ee04fb3d..e7fa629f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/second.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/second.xml
index c65215f4..ee08cc93 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/second.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/second.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/semanticId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/semanticId.xml
index 2e970a2d..0acbd57a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/semanticId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/semanticId.xml
@@ -58,6 +58,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/supplementalSemanticIds.xml
index 4861b680..658070c6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/relationshipElement/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<first>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/resource/contentType.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/resource/contentType.xml
index d2e42451..36518643 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/resource/contentType.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/resource/contentType.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<contentType>
 						<reference>
 							<type>ExternalReference</type>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/administration.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/administration.xml
index 1ee0eaec..ae94f9ce 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/administration.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/administration.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/category.xml
index 39acabf6..de87443d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/category.xml
@@ -76,6 +76,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/description.xml
index a84f1150..a25be6ea 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/description.xml
@@ -61,6 +61,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/displayName.xml
index aaf41447..d8dece25 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/displayName.xml
@@ -61,6 +61,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/extensions.xml
index 67f29def..ebe02f5b 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/extensions.xml
@@ -62,6 +62,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/id.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/id.xml
index 0e6b4fad..7ad70aed 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/id.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/id.xml
@@ -76,6 +76,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/idShort.xml
index 9a4dbec1..59de9c55 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/idShort.xml
@@ -76,6 +76,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/kind.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/kind.xml
index 254ff01a..a39357c1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/kind.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/kind.xml
@@ -76,6 +76,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/qualifiers.xml
index b9281d0b..9225513c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/qualifiers.xml
@@ -61,6 +61,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/semanticId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/semanticId.xml
index 758455d9..aa2bb34e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/semanticId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/semanticId.xml
@@ -58,6 +58,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/submodelElements.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/submodelElements.xml
index b8c0c4ae..2baed06f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/submodelElements.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/submodelElements.xml
@@ -66,6 +66,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>Unexpected string value</submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/supplementalSemanticIds.xml
index 96734031..c1ecb0ad 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodel/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 							<value>something_db2f0b6e</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company07:80412e8f</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<submodelElements>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/category.xml
index 5e7b56e6..ab693989 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/category.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/description.xml
index 5366a9f9..3c7c6f58 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/displayName.xml
index 218da6fb..ec25452e 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/extensions.xml
index 351af402..76c6b5fb 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/idShort.xml
index da74f6dd..d37b2885 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/idShort.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/qualifiers.xml
index 15b9a9c3..a38add5c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/semanticId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/semanticId.xml
index 849e3db5..7861f00c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/semanticId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/semanticId.xml
@@ -58,6 +58,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/supplementalSemanticIds.xml
index e883a96f..384ccccf 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/value.xml
index 12a72695..09a8cebe 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementCollection/value.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<value>Unexpected string value</value>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/category.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/category.xml
index 21966e9f..10869229 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/category.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/category.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/description.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/description.xml
index 0fddb9ce..e40f9485 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/description.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/description.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/displayName.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/displayName.xml
index 00aa63f5..e180f52a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/displayName.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/displayName.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/extensions.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/extensions.xml
index f805a9da..3fb03879 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/extensions.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/extensions.xml
@@ -62,6 +62,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/idShort.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/idShort.xml
index c315c24e..67e54e77 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/idShort.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/idShort.xml
@@ -76,6 +76,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/orderRelevant.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/orderRelevant.xml
index da935474..ae900311 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/orderRelevant.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/orderRelevant.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/qualifiers.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/qualifiers.xml
index 4bf37450..7e78370a 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/qualifiers.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/qualifiers.xml
@@ -61,6 +61,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/semanticId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/semanticId.xml
index 6d4ff3fc..aafdb5ba 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/semanticId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/semanticId.xml
@@ -58,6 +58,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/semanticIdListElement.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/semanticIdListElement.xml
index a2101a39..76276739 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/semanticIdListElement.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/semanticIdListElement.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/supplementalSemanticIds.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/supplementalSemanticIds.xml
index 2e408e59..a08d0dbf 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/supplementalSemanticIds.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/supplementalSemanticIds.xml
@@ -56,6 +56,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/typeValueListElement.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/typeValueListElement.xml
index 93146e50..dc73cb2f 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/typeValueListElement.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/typeValueListElement.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/value.xml
index 5c659d29..b998b6d8 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/value.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/valueTypeListElement.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/valueTypeListElement.xml
index ac4a3c09..4d63d02d 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/valueTypeListElement.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/submodelElementList/valueTypeListElement.xml
@@ -66,6 +66,15 @@
 									<value>something_4e9c19b7</value>
 								</dataSpecificationIec61360>
 							</dataSpecificationContent>
+							<dataSpecification>
+								<type>ModelReference</type>
+								<keys>
+									<key>
+										<type>Submodel</type>
+										<value>urn:another-company15:2bd0986b</value>
+									</key>
+								</keys>
+							</dataSpecification>
 						</embeddedDataSpecification>
 					</embeddedDataSpecifications>
 					<orderRelevant>true</orderRelevant>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/valueList/valueReferencePairs.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/valueList/valueReferencePairs.xml
index e226f3fc..4b3515b6 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/valueList/valueReferencePairs.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/valueList/valueReferencePairs.xml
@@ -21,6 +21,15 @@
 							</valueList>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/valueReferencePair/value.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/valueReferencePair/value.xml
index 91c727de..26772810 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/valueReferencePair/value.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/valueReferencePair/value.xml
@@ -44,6 +44,15 @@
 							</valueList>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/valueReferencePair/valueId.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/valueReferencePair/valueId.xml
index 5e0978e7..3a6155d7 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/valueReferencePair/valueId.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/TypeViolation/valueReferencePair/valueId.xml
@@ -26,6 +26,15 @@
 							</valueList>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/dataSpecificationIec61360/invalid.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/dataSpecificationIec61360/invalid.xml
index 6e16a198..4c236e1c 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/dataSpecificationIec61360/invalid.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/dataSpecificationIec61360/invalid.xml
@@ -20,6 +20,15 @@
 							<unexpectedAdditionalProperty>INVALID</unexpectedAdditionalProperty>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/embeddedDataSpecification/invalid.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/embeddedDataSpecification/invalid.xml
index 77d730f4..102dd1be 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/embeddedDataSpecification/invalid.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/embeddedDataSpecification/invalid.xml
@@ -19,6 +19,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 					<unexpectedAdditionalProperty>INVALID</unexpectedAdditionalProperty>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/langStringDefinitionTypeIec61360/invalid.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/langStringDefinitionTypeIec61360/invalid.xml
index 9c57eb43..bef988da 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/langStringDefinitionTypeIec61360/invalid.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/langStringDefinitionTypeIec61360/invalid.xml
@@ -26,6 +26,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/langStringPreferredNameTypeIec61360/invalid.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/langStringPreferredNameTypeIec61360/invalid.xml
index dca20e66..11144d36 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/langStringPreferredNameTypeIec61360/invalid.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/langStringPreferredNameTypeIec61360/invalid.xml
@@ -20,6 +20,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/langStringShortNameTypeIec61360/invalid.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/langStringShortNameTypeIec61360/invalid.xml
index d2281903..a62ed1db 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/langStringShortNameTypeIec61360/invalid.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/langStringShortNameTypeIec61360/invalid.xml
@@ -26,6 +26,15 @@
 							<value>something_13759f45</value>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/levelType/invalid.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/levelType/invalid.xml
index 57e48fc1..18987309 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/levelType/invalid.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/levelType/invalid.xml
@@ -26,6 +26,15 @@
 							</levelType>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/resource/invalid.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/resource/invalid.xml
index ec73066c..53d688c1 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/resource/invalid.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/resource/invalid.xml
@@ -6,7 +6,7 @@
 				<assetKind>NotApplicable</assetKind>
 				<globalAssetId>something_eea66fa1</globalAssetId>
 				<defaultThumbnail>
-					<path>file:/M5/%bA:'%9c%6b%ed%00Y*/%4C=4h:d:</path>
+					<path>something_57b1bd09</path>
 					<unexpectedAdditionalProperty>INVALID</unexpectedAdditionalProperty>
 				</defaultThumbnail>
 			</assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/valueList/invalid.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/valueList/invalid.xml
index bfb53f73..4776ffcd 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/valueList/invalid.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/valueList/invalid.xml
@@ -35,6 +35,15 @@
 							</valueList>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/valueReferencePair/invalid.xml b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/valueReferencePair/invalid.xml
index f4f40326..ace0bf93 100644
--- a/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/valueReferencePair/invalid.xml
+++ b/testdata/Xml/ContainedInEnvironment/Unexpected/Unserializable/UnexpectedAdditionalProperty/valueReferencePair/invalid.xml
@@ -35,6 +35,15 @@
 							</valueList>
 						</dataSpecificationIec61360>
 					</dataSpecificationContent>
+					<dataSpecification>
+						<type>ExternalReference</type>
+						<keys>
+							<key>
+								<type>GlobalReference</type>
+								<value>urn:some-company06:e9f47be2</value>
+							</key>
+						</keys>
+					</dataSpecification>
 				</embeddedDataSpecification>
 			</embeddedDataSpecifications>
 			<assetInformation>
diff --git a/types/types.go b/types/types.go
index 82e86722..24614e67 100644
--- a/types/types.go
+++ b/types/types.go
@@ -11246,13 +11246,11 @@ func (eds *EmbeddedDataSpecification) DescendOnce(
 		return
 	}
 
-	if eds.dataSpecification != nil {
-		abort = action(
-			eds.dataSpecification,
-		)
-		if abort {
-			return
-		}
+	abort = action(
+		eds.dataSpecification,
+	)
+	if abort {
+		return
 	}
 
 	return
@@ -11280,19 +11278,17 @@ func (eds *EmbeddedDataSpecification) Descend(
 		return
 	}
 
-	if eds.dataSpecification != nil {
-		abort = action(
-			eds.dataSpecification,
-		)
-		if abort {
-			return
-		}
-		abort = eds.dataSpecification.Descend(
-			action,
-		)
-		if abort {
-			return
-		}
+	abort = action(
+		eds.dataSpecification,
+	)
+	if abort {
+		return
+	}
+	abort = eds.dataSpecification.Descend(
+		action,
+	)
+	if abort {
+		return
 	}
 
 	return
@@ -11302,10 +11298,11 @@ func (eds *EmbeddedDataSpecification) Descend(
 // the given properties.
 func NewEmbeddedDataSpecification(
 	dataSpecificationContent IDataSpecificationContent,
+	dataSpecification IReference,
 ) *EmbeddedDataSpecification {
 	return &EmbeddedDataSpecification{
 		dataSpecificationContent: dataSpecificationContent,
-		dataSpecification:        nil,
+		dataSpecification:        dataSpecification,
 	}
 }
 
diff --git a/verification/verification.go b/verification/verification.go
index d6968ae2..9dc513fd 100644
--- a/verification/verification.go
+++ b/verification/verification.go
@@ -12084,7 +12084,16 @@ func VerifyEmbeddedDataSpecification(
 		}
 	}
 
-	if that.DataSpecification() != nil {
+	if that.DataSpecification() == nil {
+		abort = onError(
+			newVerificationError(
+				"Required property not set: DataSpecification",
+			),
+		)
+		if abort {
+			return
+		}
+	} else {
 		abort = Verify(
 			that.DataSpecification(),
 			func(err *VerificationError) bool {
@@ -12518,7 +12527,7 @@ func VerifyDataSpecificationIEC61360(
 	)) {
 		abort = onError(
 			newVerificationError(
-				"Constraint AASc-002: preferred name shall be provided at " +
+				"Constraint AASc-3a-002: preferred name shall be provided at " +
 					"least in English.",
 			),
 		)
@@ -13385,18 +13394,6 @@ func VerifyPathType(
 		}
 	}
 
-	if !MatchesRFC8089Path(that) {
-		abort = onError(
-			newVerificationError(
-				"The value must represent a valid file URI scheme according " +
-					"to RFC 8089.",
-			),
-		)
-		if abort {
-			return
-		}
-	}
-
 	return
 }
 
diff --git a/xmlization/xmlization.go b/xmlization/xmlization.go
index 366a0636..ca66fe61 100644
--- a/xmlization/xmlization.go
+++ b/xmlization/xmlization.go
@@ -9714,6 +9714,7 @@ func readEmbeddedDataSpecificationAsSequence(
 	var theDataSpecification aastypes.IReference
 
 	foundDataSpecificationContent := false
+	foundDataSpecification := false
 
 	for {
 		current, err = skipEmptyTextWhitespaceAndComments(decoder, current)
@@ -9772,6 +9773,7 @@ func readEmbeddedDataSpecificationAsSequence(
 				decoder,
 				current,
 			)
+			foundDataSpecification = true
 
 		default:
 			valueErr = newDeserializationError(
@@ -9824,10 +9826,15 @@ func readEmbeddedDataSpecificationAsSequence(
 		return
 	}
 
+	if !foundDataSpecification {
+		err = newDeserializationError(
+			"The required property 'dataSpecification' is missing",
+		)
+		return
+	}
+
 	instance = aastypes.NewEmbeddedDataSpecification(
 		theDataSpecificationContent,
-	)
-	instance.SetDataSpecification(
 		theDataSpecification,
 	)
 	return
@@ -21747,39 +21754,35 @@ func writeEmbeddedDataSpecificationAsSequence(
 
 	// region DataSpecification
 
-	theDataSpecification := that.DataSpecification()
-
-	if theDataSpecification != nil {
-		err = writeStartElement(
-			encoder,
-			"dataSpecification",
-			false,
-		)
-		if err != nil {
-			return
-		}
-		err = writeReferenceAsSequence(
-			encoder,
-			theDataSpecification,
-		)
-		if err != nil {
-			if seriaErr, ok := err.(*SerializationError); ok {
-				seriaErr.Path.PrependName(
-					&aasreporting.NameSegment{
-						Name: "DataSpecification()",
-					},
-				)
-			}
-			return
-		}
-		err = writeEndElement(
-			encoder,
-			"dataSpecification",
-			false,
-		)
-		if err != nil {
-			return
+	err = writeStartElement(
+		encoder,
+		"dataSpecification",
+		false,
+	)
+	if err != nil {
+		return
+	}
+	err = writeReferenceAsSequence(
+		encoder,
+		that.DataSpecification(),
+	)
+	if err != nil {
+		if seriaErr, ok := err.(*SerializationError); ok {
+			seriaErr.Path.PrependName(
+				&aasreporting.NameSegment{
+					Name: "DataSpecification()",
+				},
+			)
 		}
+		return
+	}
+	err = writeEndElement(
+		encoder,
+		"dataSpecification",
+		false,
+	)
+	if err != nil {
+		return
 	}
 
 	err = encoder.Flush()