diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7baac75..20ff2f0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -12,6 +12,9 @@
   "[json]": {
     "editor.defaultFormatter": "vscode.json-language-features"
   },
+  "[xml]": {
+    "editor.defaultFormatter": "redhat.vscode-xml"
+  },
   "files.insertFinalNewline": true,
   "files.trimFinalNewlines": true,
   "cSpell.words": [
@@ -27,5 +30,6 @@
     "pageable",
     "schön",
     "SRID"
-  ]
+  ],
+  "xml.format.maxLineWidth": 200
 }
diff --git a/schemas/edm.xsd b/schemas/edm.xsd
index 3860c17..864c37d 100644
--- a/schemas/edm.xsd
+++ b/schemas/edm.xsd
@@ -55,9 +55,8 @@
   prose specification document take precedence.
 
 -->
-<xs:schema elementFormDefault="qualified" attributeFormDefault="unqualified"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:edm="http://docs.oasis-open.org/odata/ns/edm"
-  targetNamespace="http://docs.oasis-open.org/odata/ns/edm">
+<xs:schema elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:edm="http://docs.oasis-open.org/odata/ns/edm" targetNamespace="http://docs.oasis-open.org/odata/ns/edm">
   <xs:annotation>
     <xs:documentation xml:lang="en">Entity Data Model part of the Common Schema Definition Language</xs:documentation>
   </xs:annotation>
@@ -382,8 +381,7 @@
   </xs:simpleType>
   <xs:simpleType name="TGuidLiteral">
     <xs:restriction base="xs:string">
-      <xs:pattern
-        value="[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}" />
+      <xs:pattern value="[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}" />
     </xs:restriction>
   </xs:simpleType>
   <xs:complexType name="TIntConstantExpression">
@@ -606,16 +604,14 @@
       <xs:minLength value="1" />
       <xs:maxLength value="511" />
       <!-- one or more SimpleIdentifiers separated by dots -->
-      <xs:pattern
-        value="[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(\.[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){0,}" />
+      <xs:pattern value="[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(\.[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){0,}" />
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="TQualifiedName">
     <xs:restriction base="xs:string">
       <xs:minLength value="1" />
       <!-- a NamespaceName followed by a dot and a SimpleIdentifier -->
-      <xs:pattern
-        value="[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(\.[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){1,}" />
+      <xs:pattern value="[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(\.[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){1,}" />
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="TNonEdmQualifiedName">
@@ -630,15 +626,13 @@
     <xs:list itemType="edm:TPath" />
   </xs:simpleType>
   <xs:simpleType name="TTypeName">
-    <xs:union
-      memberTypes="edm:TPrimitiveType edm:TAbstractType edm:TQualifiedName edm:TCollQualifiedName" />
+    <xs:union memberTypes="edm:TPrimitiveType edm:TAbstractType edm:TQualifiedName edm:TCollQualifiedName" />
   </xs:simpleType>
   <xs:simpleType name="TCollQualifiedName">
     <xs:restriction base="xs:string">
       <!-- The below pattern represents the allowed identifiers in the ECMAScript specification plus
       the '.' for namespace qualification and the Collection() wrapper -->
-      <xs:pattern
-        value="Collection\([\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(\.[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){1,}\)" />
+      <xs:pattern value="Collection\([\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(\.[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){1,}\)" />
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="TNavigationPropertyType">
@@ -663,8 +657,7 @@
     <xs:restriction base="xs:string">
       <!-- The below pattern represents the allowed identifiers in the ECMAScript specification plus
       the '.' for namespace qualification and the '/' for path segment separation -->
-      <xs:pattern
-        value="[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}([\./][\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){0,}" />
+      <xs:pattern value="[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}([\./][\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){0,}" />
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="TInstancePath">
@@ -680,8 +673,7 @@
       the '/' for path segment separation
         and
         the '.' for namespace qualification inside the segments. -->
-      <xs:pattern
-        value="(/?@?[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(([\./#@]|/@)[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){0,}(/$count)?)?" />
+      <xs:pattern value="(/?@?[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(([\./#@]|/@)[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){0,}(/$count)?)?" />
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="TTarget">
@@ -936,8 +928,7 @@
   <!-- binary data in base64url encoding -->
   <xs:simpleType name="binary">
     <xs:restriction base="xs:string">
-      <xs:pattern
-        value="([A-Za-z0-9_\-]{4})*([A-Za-z0-9_\-]{3}[A-Za-z0-9_\-]|[A-Za-z0-9_\-]{2}[AEIMQUYcgkosw048]=?|[A-Za-z0-9_\-][AQgw](==)?)?" />
+      <xs:pattern value="([A-Za-z0-9_\-]{4})*([A-Za-z0-9_\-]{3}[A-Za-z0-9_\-]|[A-Za-z0-9_\-]{2}[AEIMQUYcgkosw048]=?|[A-Za-z0-9_\-][AQgw](==)?)?" />
     </xs:restriction>
   </xs:simpleType>
   <!--boolean
@@ -962,8 +953,7 @@
   http://www.w3.org/TR/xmlschema11-2/#dateTimeStamp -->
   <xs:simpleType name="dateTimeStamp">
     <xs:restriction base="xs:dateTime">
-      <xs:pattern
-        value=".*([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\.[0-9]{1,12})?(Z|(\+|-)[0-9][0-9]:[0-9][0-9])" />
+      <xs:pattern value=".*([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\.[0-9]{1,12})?(Z|(\+|-)[0-9][0-9]:[0-9][0-9])" />
     </xs:restriction>
   </xs:simpleType>
   <!-- Copy of xs:dayTimeDuration from XML Schema 1.1, see