diff --git a/README.md b/README.md
index 6c4298c..35ffefa 100644
--- a/README.md
+++ b/README.md
@@ -28,12 +28,19 @@ The following release contains the latest version of the AAS schemas
  (see also the [releases](https://github.com/admin-shell-io/aas-specs-security/releases) 
 section of this repository):
 
-* [3.0.0](https://github.com/admin-shell-io/aas-specs-security/releases/tag/v3.0.0)
-is the latest release for the `V3.0.0` version of the AAS Security, 
+* [3.0.1](https://github.com/admin-shell-io/aas-specs-security/releases/tag/v3.0.1)
+is the latest bugfix release for the `V3.0.1` version of the AAS Security, 
 containing the normative sources for the published document
- "Specification of the Asset Administration Shell: Part 4 - **Version 3.0.0**". 
+ "Specification of the Asset Administration Shell: Part 4 - **Version 3.0.1**". 
 *Use this release if you want to work with the latest specified AAS version.*
 
+Previous releases:
+
+* [3.0.0](https://github.com/admin-shell-io/aas-specs-security/releases/tag/v3.0.0)
+is the first release for the `V3.0` version of the AAS Security, 
+containing the normative sources for the published document
+ "Specification of the Asset Administration Shell: Part 4 - Version 3.0.0". 
+
 ## Contributing
 
 Feature requests, reports about inconsistencies, mistakes *etc.* are highly
diff --git a/documentation/IDTA-01004/modules/ROOT/pages/access-rule-model.adoc b/documentation/IDTA-01004/modules/ROOT/pages/access-rule-model.adoc
index 3a9f069..09963fb 100644
--- a/documentation/IDTA-01004/modules/ROOT/pages/access-rule-model.adoc
+++ b/documentation/IDTA-01004/modules/ROOT/pages/access-rule-model.adoc
@@ -174,8 +174,6 @@ Global Attributes are:
 
 * *ANONYMOUS* - Tag for anonymous and non-authenticated user, i.e. no access token
 
-References in ReferenceAttributes are defined in Section xref:access-rule-model.adoc#text-serialization-of-values-of-type-reference[Text Serialization of Values of Type Reference].
-
 
 ==== Objects
 
@@ -188,8 +186,6 @@ Objects to be protected are either API Routes, Identifiables (e.g. AAS or Submod
 
 Routes may use * or end with a *, which means that all routes with a given prefix are valid.
 
-References to IdentifiableObjects, ReferableObjects, FragmentObjects and DescriptorObjects are defined in Section xref:access-rule-model.adoc#text-serialization-of-values-of-type-reference[Text Serialization of Values of Type Reference].
-
 An Object Group defines a list of single objects and/or a list of names of other object groups.
 
 ==== Formulas
@@ -218,18 +214,6 @@ This enables access rules related to week days or specific times in the year.
 An important special operation is $match, which can be used with any element containing a list of elements, e.g. semanticId[], specificAssetId[], SubmodelElementList or SubmodelElementCollection.
 The list element is written with [] to express, that $match shall check if a certain expression is true for at least one element in the list.
 
-[[text-serialization-of-values-of-type-reference]]
-==== Text Serialization of Values of Type Reference
-
-References are used in ReferenceAttributes, IdentifiableObjects, ReferableObjects, FragmentObjects and DescriptorObjects for the corresponding ReferenceLiterals, IdentifiableLiterals, ReferableLiterals, FragmentLiterals and DescriptorLiterals.
-
-Such references use the link:https://industrialdigitaltwin.io/aas-specifications/IDTA-01001/v3.1/mappings/mappings.html#reference-serialization[Part 1 Mapping in Section "Text Serialization of Values of Type Reference"] for specific instances of elements, e.g. an AAS, a Submodel, a ConceptDescription or a specific SubmodelElement.
-
-Access Rules may also be defined for all Identifiables of the Keytypes AssetAdministrationShell, Submodel or ConceptDescription.
-In this case an IdentifiableLiteral uses the format "(AssetAdministrationShell)\*", "(Submodel)*" and "(ConceptDescription)*".
-
-Access Rules extend the Keytypes of Part 1 by "(aasDesc)" for AAS Descriptors and "(smdesc)" for submodel descriptors.
-To define all descriptors "(aasDesc)\*" or "(smdesc)*" may be used in DescriptorLiterals accordingly.
 
 [[json-serialization]]
 == JSON Serialization of Access Rule Model
diff --git a/documentation/IDTA-01004/modules/ROOT/pages/annex/text-access-rule-examples.adoc b/documentation/IDTA-01004/modules/ROOT/pages/annex/text-access-rule-examples.adoc
index c9cf7c3..cfc7c1c 100644
--- a/documentation/IDTA-01004/modules/ROOT/pages/annex/text-access-rule-examples.adoc
+++ b/documentation/IDTA-01004/modules/ROOT/pages/annex/text-access-rule-examples.adoc
@@ -61,6 +61,7 @@ include::partial$examples/bpn.bnf[]
 include::partial$examples/allow-read-all-users-of-company-for-submodel.bnf[]
 ----
 
+[[allow-read-submodels-id-pattern]]
 == Allow READ to all Submodels with ID pattern for all authenticated users of a company for submodels with Nameplate and TechnicalData from 9:00-17:00
 
 [source,bnf,linenums]
diff --git a/documentation/IDTA-01004/modules/ROOT/pages/changelog.adoc b/documentation/IDTA-01004/modules/ROOT/pages/changelog.adoc
index d651166..fbfb77d 100644
--- a/documentation/IDTA-01004/modules/ROOT/pages/changelog.adoc
+++ b/documentation/IDTA-01004/modules/ROOT/pages/changelog.adoc
@@ -8,6 +8,30 @@ SPDX-License-Identifier: CC-BY-4.0
 
 ////
 
+[[change-notes]]
 = Change Notes
 
-This is the first Release.
+== Changes w.r.t. V3.1 vs. V3.0.1
+
+*changed: <ReferenceAttribute> with more detailed definition in BNF Grammar and JSON Schema
+*changed: <IdentifiableObject>, <ReferableObject>, <FragmentObject>, <DescriptorObject> with more detailed definition in BNF Grammar and JSON Schema
+
+
+== Changes w.r.t. V3.0.1 vs. V3.0
+
+Bugfixes:
+
+* changed: Removed incorrect but required whitespaces from grammar and examples [#477 of API](https://github.com/admin-shell-io/aas-specs-api/issues/477)
+* changed: fixed idShortPath definition in the BNF Grammar for the Query Language [#34](https://github.com/admin-shell-io/aas-specs-security/issues/34)
+* changed:  xref:access-rule-model.adoc#text-serialization-of-values-of-type-reference[text serialization of Reference]  does not follow text serialization of Part 1 of References, the updated grammar will be added in the V3.1 [#33](https://github.com/admin-shell-io/aas-specs-security/issues/33)
+
+
+Minor Changes:
+
+* changed: correct xref:annex/text-access-rule-examples.adoc#allow-read-submodels-id-pattern[example] in Annex
+* removed: remove <FieldIdentifierString> in grammar and use <FieldIdentifier> directly
+
+
+== Changes V3.0
+
+This is the first release
diff --git a/documentation/IDTA-01004/modules/ROOT/pages/index.adoc b/documentation/IDTA-01004/modules/ROOT/pages/index.adoc
index 23cd2a2..bb23ae6 100644
--- a/documentation/IDTA-01004/modules/ROOT/pages/index.adoc
+++ b/documentation/IDTA-01004/modules/ROOT/pages/index.adoc
@@ -18,31 +18,37 @@ This specification is part of the https://industrialdigitaltwin.org/en/content-h
 
 == Version
 
-This is version 3.0 of the specification IDTA-01004.
+This is version 3.0.1 of the specification IDTA-01004.
+
+Previous version: 3.0.
 
 [#metamodel-versions]
 == Metamodel Versions
 
-This document (version 3.0) uses the following parts of the “Specification of the Asset Administration Shell” series:
+This document uses the following parts and versions of the “Specification of the Asset Administration Shell” series:
 
 * IDTA-01001 Part 1: Metamodel in version 3.1 xref:bibliography.adoc#bib1[[1\]]
 * IDTA-01002 Part 2: Application Programming Interfaces in version 3.1 xref:bibliography.adoc#bib2[[2\]]
 * IDTA-01003-a Part 3a: Data Specification – IEC 61360 in version 3.1 xref:bibliography.adoc#bib3[[3\]]
 
+If there are bugfixes of the parts, these shall be used.
+
 == Notice
 
 Copyright: Industrial Digital Twin Association e.V. (IDTA)
 
-DOI: https://doi.org/10.62628/IDTA.01004-3-0
+DOI: https://doi.org/10.62628/IDTA.01004-3-0-1
+
+IDTA Number: IDTA-01004
 
-IDTA Document Number: IDTA-01004-3-0
+Version: 3.0.1
 
 This work is licensed under a
 https://creativecommons.org/licenses/by/4.0/[Creative Commons Attribution 4.0 International License].
 
 SPDX-License-Identifier: CC-BY-4.0
 
-May 2025
+July 2025
 
 == How to Get in Contact
 
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/bnf/access-rules.bnf b/documentation/IDTA-01004/modules/ROOT/partials/bnf/access-rules.bnf
index e93b434..c6c6e5e 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/bnf/access-rules.bnf
+++ b/documentation/IDTA-01004/modules/ROOT/partials/bnf/access-rules.bnf
@@ -41,7 +41,12 @@
     "GLOBAL" <ws> "(" <ws> ( "LOCALNOW" | "UTCNOW" | "CLIENTNOW" | "ANONYMOUS" ) <ws> ")"
 
 <ReferenceAttribute> ::=
-    "REFERENCE" <ws> "(" <ws> <ReferenceLiteral> <ws> ")"
+    "REFERENCE(" (
+    ("$aas" <IdentifierInstance> "#" <FieldsAAS> ) |
+    ("$sm" <IdentifierInstance> "#" <FieldsSM> ) |
+    ("$cd" <IdentifierInstance> "#" <FieldsCD> ) |
+    ("$sme" <IdentifierInstance> "." <idShortPath> "#" <FieldsSME> )
+    ) ")"
 
 <AttributeGroup> ::=
     ( <SingleAttribute> <ws> )*
@@ -56,17 +61,20 @@
 <RouteObject> ::=
     "ROUTE" <ws> <RouteLiteral> <ws>
 
+<IdentifierInstance> ::= "(" <StringLiteral> ")"
+<IdentifierInstanceOrAll> ::= <IdentifierInstance> | "(\"*\")"
+
 <IdentifiableObject> ::=
-    "IDENTIFIABLE" <ws> <IdentifiableLiteral> <ws>
+    "IDENTIFIABLE" <ws> ("$aas" | "$sm" | "$cd") <IdentifierInstanceOrAll>
 
 <ReferableObject> ::=
-    "REFERABLE" <ws> <ReferableLiteral> <ws>
+    "REFERABLE" <ws> "$sme" <IdentifierInstanceOrAll> "." <idShortPath>
 
 <FragmentObject> ::=
-    "FRAGMENT" <ws> <FragmentLiteral> <ws>
-
+    "FRAGMENT" <ws> "$sme" <IdentifierInstanceOrAll> "." <idShortPath> ( <ws> <StringLiteral> )+
+ 
 <DescriptorObject> ::=
-    "DESCRIPTOR" <ws> <DescriptorLiteral> <ws>
+    "DESCRIPTOR" <ws> ("$aasdesc" | "$smdesc") <IdentifierInstanceOrAll>
 
 <ObjectGroup> ::=
     ( <SingleObject> <ws> )*
@@ -103,13 +111,13 @@
 <stringComparison> ::=
     ( ( "$starts-with" | "$ends-with" | "$contains" | "$regex") <ws> "(" <ws> <stringOperand> <ws> "," <ws> <stringOperand> <ws> ")" <ws> ) |
     ( <stringOperand> <ws> <allComparisons> <ws> <stringOperand> <ws> ) |
-    ( <stringOperand> <ws> <allComparisons> <ws> <FieldIdentifierString> <ws> ) |
-    ( <FieldIdentifierString> <ws> <allComparisons> <ws> <stringOperand> <ws> )
+    ( <stringOperand> <ws> <allComparisons> <ws> <FieldIdentifier> <ws> ) |
+    ( <FieldIdentifier> <ws> <allComparisons> <ws> <stringOperand> <ws> )
 
 <numericalComparison> ::=
     ( <numericalOperand> <ws> <allComparisons> <ws> <numericalOperand> <ws> ) |
-    ( <numericalOperand> <ws> <allComparisons> <ws> <FieldIdentifierString> <ws> ) |
-    ( <FieldIdentifierString> <ws> <allComparisons> <ws> <numericalOperand> <ws> )
+    ( <numericalOperand> <ws> <allComparisons> <ws> <FieldIdentifier> <ws> ) |
+    ( <FieldIdentifier> <ws> <allComparisons> <ws> <numericalOperand> <ws> )
 
 <hexComparison> ::=
     <hexOperand> <ws> <allComparisons> <ws> <hexOperand> <ws>
@@ -129,7 +137,7 @@
 <operand> ::= <stringOperand> | <numericalOperand> | <hexOperand> | <boolOperand> | <dateTimeOperand> | <timeOperand>
 
 <stringOperand> ::=
-    <FieldIdentifierString> | <StringLiteral> | <castToString> | <SingleAttribute>
+    <FieldIdentifier> | <StringLiteral> | <castToString> | <SingleAttribute>
 
 <numericalOperand> ::=
     <NumericalLiteral> | <castToNumerical> | <dateTimeToNum>
@@ -164,25 +172,23 @@
 <castToTime> ::=
     "time" <ws> "(" <ws> ( <stringOperand> | <dateTimeOperand> ) <ws> ")" <ws>
 
-
 <DateTimeLiteral> ::= <datetime> <ws>
 <TimeLiteral> ::= <time> <ws>
-<datetime> ::= <date> <ws> ( "T" | " " ) <ws> <time> <ws> ( <timezone> <ws> )?
-<date> ::= <year> <ws> "-" <ws> <month> <ws> "-" <ws> <day> <ws>
-<year> ::= <digit> <ws> <digit> <ws> <digit> <ws> <digit> <ws>
-<month> ::= <digit> <ws> <digit> <ws>
-<day> ::= <digit> <ws> <digit> <ws>
-<time> ::= <hour> <ws> ":" <ws> <minute> <ws> ( ":" <ws> <second> <ws> )? ( "." <ws> <fraction> <ws> )?
-<timezone> ::= ( "Z" | ( "+" | "-" ) <ws> <hour> <ws> ":" <ws> <minute> <ws> )
-<hour> ::= <digit> <ws> <digit> <ws>
-<minute> ::= <digit> <ws> <digit> <ws>
-<second> ::= <digit> <ws> <digit> <ws>
-<fraction> ::= <digit>+ <ws>
-
-<digit> ::= [0-9] <ws>
+<datetime> ::= <date> ( "T" | "" ) <time> ( <timezone> )?
+<date> ::= <year> "-" <month> "-" <day>
+<year> ::= <digit> <digit> <digit> <digit>
+<month> ::= <digit> <digit>
+<day> ::= <digit> <digit>
+<time> ::= <hour> ":" <minute> ( ":" <second> )? ( "." <fraction> )?
+<timezone> ::= ( "Z" | ( "+" | "-" ) <hour> ":" <minute> )
+<hour> ::= <digit> <digit>
+<minute> ::= <digit> <digit>
+<second> ::= <digit> <digit>
+<fraction> ::= <digit>+
+ 
+<digit> ::= [0-9]
 <StringLiteral> ::= "\"" ( [A-Z] | [a-z] | [0-9] | "/" | "*" | "[" | "]" | "(" | ")" | " " | "_" | "@" | "#" | "\\" | "+" | "-" | "." | "," | ":" | "$" | "^" )+ "\""
 <ClaimLiteral> ::= <StringLiteral>
-<ReferenceLiteral> ::= <StringLiteral>
 <RouteLiteral> ::= <StringLiteral>
 <IdentifiableLiteral> ::= <StringLiteral>
 <ReferableLiteral> ::= <StringLiteral>
@@ -191,12 +197,16 @@
 <NumericalLiteral> ::= ( "+" | "-" )? ( [0-9]+ ( "." [0-9]* )? | "." [0-9]+ ) ( ( "e" | "E" )? [0-9]+ )
 <HexLiteral> ::= "16#" ( [0-9] | [A-F] )+
 <BoolLiteral> ::= "true" | "false"
-<FieldIdentifier> ::= <FieldIdentifierString>
-<FieldIdentifierString> ::= <FieldIdentifierAAS> | <FieldIdentifierSM> | <FieldIdentifierSME> | <FieldIdentifierCD> | <FieldIdentifierAasDescriptor> | <FieldIdentifierSmDescriptor>
-<FieldIdentifierAAS> ::= "$aas#" ( "idShort" | "id" | "assetInformation.assetKind" | "assetInformation.assetType" | "assetInformation.globalAssetId" | "assetInformation." <SpecificAssetIdsClause> | "submodels." <ReferenceClause> )
-<FieldIdentifierSM> ::= "$sm#" ( <SemanticIdClause> | "idShort" | "id" )
-<FieldIdentifierSME> ::= "$sme" ( "." <idShortPath> )? "#" ( <SemanticIdClause> | "idShort" | "value" | "valueType" | "language" )
-<FieldIdentifierCD> ::= "$cd#" ( "idShort" | "id" ) <ws>
+
+<FieldIdentifier> ::= <FieldIdentifierAAS> | <FieldIdentifierSM> | <FieldIdentifierSME> | <FieldIdentifierCD> | <FieldIdentifierAasDescriptor> | <FieldIdentifierSmDescriptor>
+<FieldIdentifierAAS> ::= "$aas#" <FieldsAAS>
+<FieldsAAS> ::= "idShort" | "id" | "assetInformation.assetKind" | "assetInformation.assetType" | "assetInformation.globalAssetId" | "assetInformation." <SpecificAssetIdsClause> | "submodels." <ReferenceClause>
+<FieldIdentifierSM> ::= "$sm#" <FieldsSM>
+<FieldsSM> ::= <SemanticIdClause> | "idShort" | "id"
+<FieldIdentifierCD> ::= "$cd#" <FieldsCD>
+<FieldsCD> ::= "idShort" | "id"
+<FieldIdentifierSME> ::= "$sme" ( "." <idShortPath> )? "#" <FieldsSME>
+<FieldsSME> ::= <SemanticIdClause> | "idShort" | "value" | "valueType" | "language"
 <FieldIdentifierAasDescriptor> ::= "$aasdesc#" ( "idShort" | "id" | "assetKind" | "assetType" | "globalAssetId" | <SpecificAssetIdsClause>  | "endpoints" ( "[" ( [0-9]* ) "]" ) "." <EndpointClause> | "submodelDescriptors" ( "[" ( [0-9]* ) "]" ) "." <SmDescriptorClause> )
 <FieldIdentifierSmDescriptor> ::= "$smdesc#" <SmDescriptorClause>
 <SmDescriptorClause> ::= ( <SemanticIdClause> | "idShort" | "id" | "endpoints" ( "[" ( [0-9]* ) "]" ) "." <EndpointClause> )
@@ -205,7 +215,7 @@
 <ReferenceClause> ::= ( "type" | "keys" ( "[" ( [0-9]* ) "]" ) ( ".type" | ".value" ) )
 <SemanticIdClause> ::= ( "semanticId" | "semanticId." <ReferenceClause> )
 <SpecificAssetIdsClause> ::=  ( "specificAssetIds" ( "[" ( [0-9]* ) "]" ) ( ".name" | ".value" | ".externalSubjectId" | ".externalSubjectId." <ReferenceClause> ) )
-<idShortPath> ::= ( <idShort> ("[" ( [0-9]* ) "]" ) ( "." <idShortPath> )* )
-<idShort> ::= ( ( [a-z] | [A-Z] ) ( [a-z] | [A-Z] | [0-9] | "_" )* )
+<idShortPath> ::= ( <idShort> ("[" ( [0-9]* ) "]" )* ( "." <idShortPath> )* )
+<idShort> ::= ( ( [a-z] | [A-Z] ) (( [a-z] | [A-Z] | [0-9] | "_"   | "-" )* ( [a-z] | [A-Z] | [0-9] | "_" ) )? )
 
-<ws> ::= ( " " | "\t" | "\r" | "\n" )+
+<ws> ::= ( " " | "\t" | "\r" | "\n" )*
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/bnf/attributes.bnf b/documentation/IDTA-01004/modules/ROOT/partials/bnf/attributes.bnf
index d4b75a9..fc9fdd7 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/bnf/attributes.bnf
+++ b/documentation/IDTA-01004/modules/ROOT/partials/bnf/attributes.bnf
@@ -8,7 +8,12 @@
     "GLOBAL" <ws> "(" <ws> ( "LOCALNOW" | "UTCNOW" | "CLIENTNOW" | "ANONYMOUS" ) <ws> ")"
 
 <ReferenceAttribute> ::=
-    "REFERENCE" <ws> "(" <ws> <ReferenceLiteral> <ws> ")"
+    "REFERENCE(" (
+    ("$aas" <IdentifierInstance> "#" <FieldsAAS> ) |
+    ("$sm" <IdentifierInstance> "#" <FieldsSM> ) |
+    ("$cd" <IdentifierInstance> "#" <FieldsCD> ) |
+    ("$sme" <IdentifierInstance> "." <idShortPath> "#" <FieldsSME> )
+    ) ")"
 
 <AttributeGroup> ::=
     ( <SingleAttribute> <ws> )*
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/bnf/objects.bnf b/documentation/IDTA-01004/modules/ROOT/partials/bnf/objects.bnf
index 7c685dc..d9ec093 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/bnf/objects.bnf
+++ b/documentation/IDTA-01004/modules/ROOT/partials/bnf/objects.bnf
@@ -4,17 +4,20 @@
 <RouteObject> ::=
     "ROUTE" <ws> <RouteLiteral> <ws>
 
+<IdentifierInstance> ::= "(" <StringLiteral> ")"
+<IdentifierInstanceOrAll> ::= <IdentifierInstance> | "(\"*\")"
+
 <IdentifiableObject> ::=
-    "IDENTIFIABLE" <ws> <IdentifiableLiteral> <ws>
+    "IDENTIFIABLE" <ws> ("$aas" | "$sm" | "$cd") <IdentifierInstanceOrAll>
 
 <ReferableObject> ::=
-    "REFERABLE" <ws> <ReferableLiteral> <ws>
+    "REFERABLE" <ws> "$sme" <IdentifierInstanceOrAll> "." <idShortPath>
 
 <FragmentObject> ::=
-    "FRAGMENT" <ws> <FragmentLiteral> <ws>
-
+    "FRAGMENT" <ws> "$sme" <IdentifierInstanceOrAll> "." <idShortPath> ( <ws> <StringLiteral> )+
+ 
 <DescriptorObject> ::=
-    "DESCRIPTOR" <ws> <DescriptorLiteral> <ws>
+    "DESCRIPTOR" <ws> ("$aasdesc" | "$smdesc") <IdentifierInstanceOrAll>
 
 <ObjectGroup> ::=
     ( <SingleObject> <ws> )*
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-all-users-of-company-for-submodel.bnf b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-all-users-of-company-for-submodel.bnf
index 3f35b4c..53be34a 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-all-users-of-company-for-submodel.bnf
+++ b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-all-users-of-company-for-submodel.bnf
@@ -4,7 +4,7 @@ ACCESSRULE:
   RIGHTS: READ
   ACCESS: ALLOW
   OBJECTS:
-    IDENTIFIABLE "(Submodel)*"
+    IDENTIFIABLE $sm("*")
   FORMULA:
     $and(
       $or(
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-all-users-of-company-for-submodel.json b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-all-users-of-company-for-submodel.json
index 41ff4cd..1064ecc 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-all-users-of-company-for-submodel.json
+++ b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-all-users-of-company-for-submodel.json
@@ -15,7 +15,7 @@
         },
         "OBJECTS": [
           {
-            "IDENTIFIABLE": "(Submodel)*"
+            "IDENTIFIABLE": "$sm(\"*\")"
           }
         ],
         "FORMULA": {
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-submodels-id-pattern.bnf b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-submodels-id-pattern.bnf
index 08870c2..c3be952 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-submodels-id-pattern.bnf
+++ b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-submodels-id-pattern.bnf
@@ -4,7 +4,7 @@ ACCESSRULE:
   RIGHTS: READ
   ACCESS: ALLOW
   OBJECTS:
-    IDENTIFIABLE "(Submodel)*"
+    IDENTIFIABLE $sm("*")
   FORMULA:
     $and(
       $or(
@@ -12,7 +12,7 @@ ACCESSRULE:
         $sm#semanticId $eq "SemanticID-TechnicalData"
       ),
       CLAIM("companyName") $eq "company1-name",
-      $regex(REFERENCE("(Submodel)*#Id"), "^https://company1.com/.*$"),
+      $regex($sm#id, "^https://company1.com/.*$"),
       GLOBAL(UTCNOW) $ge "09:00",
       GLOBAL(UTCNOW) $le "17:00"
     )
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-submodels-id-pattern.json b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-submodels-id-pattern.json
index bb4ef7c..8b4a56d 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-submodels-id-pattern.json
+++ b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-submodels-id-pattern.json
@@ -15,7 +15,7 @@
         },
         "OBJECTS": [
           {
-            "ROUTE": "*"
+            "IDENTIFIABLE": "$sm(\"*\")"
           }
         ],
         "FORMULA": {
@@ -60,7 +60,7 @@
               "$regex": [
                 {
                   "$attribute": {
-                    "REFERENCE": "(Submodel)*#Id"
+                    "REFERENCE": "$sm#id"
                   }
                 },
                 {
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-submodel.bnf b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-submodel.bnf
index 73114c3..33f617b 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-submodel.bnf
+++ b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-submodel.bnf
@@ -4,6 +4,6 @@ ACCESSRULE:
   RIGHTS: READ UPDATE
   ACCESS: ALLOW
   OBJECTS:
-    IDENTIFIABLE "(Submodel)https://submodel1.company1.com"
+    IDENTIFIABLE $sm("https://submodel1.company1.com")
   FORMULA:
     CLAIM("email") $eq "user1@company1.com"
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-submodel.json b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-submodel.json
index 4b18def..05b8f7e 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-submodel.json
+++ b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-submodel.json
@@ -16,7 +16,7 @@
         },
         "OBJECTS": [
           {
-            "IDENTIFIABLE": "(Submodel)https://submodel1.company1.com"
+            "IDENTIFIABLE": "$sm(\"https://submodel1.company1.com\")"
           }
         ],
         "FORMULA": {
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-users.bnf b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-users.bnf
index aeb9351..895e84f 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-users.bnf
+++ b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-users.bnf
@@ -4,7 +4,7 @@ ACCESSRULE:
   RIGHTS: READ UPDATE
   ACCESS: ALLOW
   OBJECTS:
-    IDENTIFIABLE "(Submodel)*"
+    IDENTIFIABLE $sm("*")
   FORMULA:
     $and(
       $or(
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-users.json b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-users.json
index 0579860..e334fd3 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-users.json
+++ b/documentation/IDTA-01004/modules/ROOT/partials/examples/allow-read-update-users.json
@@ -16,7 +16,7 @@
         },
         "OBJECTS": [
           {
-            "IDENTIFIABLE": "(Submodel)*"
+            "IDENTIFIABLE": "$sm(\"*\")"
           }
         ],
         "FORMULA": {
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/examples/filter.bnf b/documentation/IDTA-01004/modules/ROOT/partials/examples/filter.bnf
index c6dcc1a..f6eb340 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/examples/filter.bnf
+++ b/documentation/IDTA-01004/modules/ROOT/partials/examples/filter.bnf
@@ -4,7 +4,7 @@ ACCESSRULE:
   RIGHTS: READ
   ACCESS: ALLOW
   OBJECTS:
-    DESCRIPTOR "(aasDesc)*"
+    DESCRIPTOR $aasDesc("*")
   FORMULA:
     $and(
       CLAIM("BusinessPartnerNumber") $eq "BPNL00000000000A",
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/examples/filter.json b/documentation/IDTA-01004/modules/ROOT/partials/examples/filter.json
index 2a56d6d..8792c56 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/examples/filter.json
+++ b/documentation/IDTA-01004/modules/ROOT/partials/examples/filter.json
@@ -15,7 +15,7 @@
         },
         "OBJECTS": [
           {
-            "DESCRIPTOR": "(aasdesc)*"
+            "DESCRIPTOR": "$aasDesc(\"*\")"
           }
         ],
         "FORMULA": {
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/examples/reuse-acl-object-formula.bnf b/documentation/IDTA-01004/modules/ROOT/partials/examples/reuse-acl-object-formula.bnf
index 899e95d..a69e448 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/examples/reuse-acl-object-formula.bnf
+++ b/documentation/IDTA-01004/modules/ROOT/partials/examples/reuse-acl-object-formula.bnf
@@ -6,8 +6,8 @@ DEFACLS "acl1"
   ACCESS: ALLOW
 
 DEFOBJECTS "Properties"
-  REFERABLE "(Submodel)https://s1.com, (Property)p1"
-  REFERABLE "(Submodel)https://s1.com, (Property)p2"
+  REFERABLE $sme("https://s1.com").p1
+  REFERABLE $sme("https://s1.com").p2
 
 DEFFORMULAS "allowSubjectGroup1"
   $and(
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/examples/reuse-acl-object-formula.json b/documentation/IDTA-01004/modules/ROOT/partials/examples/reuse-acl-object-formula.json
index 176227c..1a99a68 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/examples/reuse-acl-object-formula.json
+++ b/documentation/IDTA-01004/modules/ROOT/partials/examples/reuse-acl-object-formula.json
@@ -22,10 +22,10 @@
         "name": "Properties",
         "objects": [
           {
-            "REFERABLE": "(Submodel)https://s1.com, (Property)p1"
+            "REFERABLE": "$sme("\https://s1.com\").p1"
           },
           {
-            "REFERABLE": "(Submodel)https://s1.com, (Property)p2"
+            "REFERABLE": "$sme(\"https://s1.com\").p2"
           }
         ]
       }
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/json/aas-queries-and-access-rules-schema.json b/documentation/IDTA-01004/modules/ROOT/partials/json/aas-queries-and-access-rules-schema.json
index ff82a9b..9985bf5 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/json/aas-queries-and-access-rules-schema.json
+++ b/documentation/IDTA-01004/modules/ROOT/partials/json/aas-queries-and-access-rules-schema.json
@@ -7,9 +7,99 @@
       "type": "string",
       "pattern": "^(?!\\$).*"
     },
-    "modelStringPattern": {
+    "FieldIdentifierAAS": {
       "type": "string",
-      "pattern": "^(?:\\$aas#(?:idShort|id|assetInformation\\.assetKind|assetInformation\\.assetType|assetInformation\\.globalAssetId|assetInformation\\.(?:specificAssetIds\\[[0-9]*\\](?:\\.(?:name|value|externalSubjectId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(?:type|value))?)?)?)|submodels\\.(?:type|keys\\[\\d*\\](?:\\.(?:type|value))?))|submodels\\.(type|keys\\[\\d*\\](?:\\.(type|value))?))|(?:\\$sm#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id))|(?:\\$sme(?:\\.[a-zA-Z][a-zA-Z0-9_]*\\[[0-9]*\\]?(?:\\.[a-zA-Z][a-zA-Z0-9_]*\\[[0-9]*\\]?)*)?#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|value|valueType|language))|(?:\\$cd#(?:idShort|id)))|(?:\\$aasdesc#(?:idShort|id|assetKind|assetType|globalAssetId|specificAssetIds\\[[0-9]*\\]?(?:\\.(name|value|externalSubjectId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?)?)|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href)|submodelDescriptors\\[[0-9]*\\]\\.(semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href))))|(?:\\$smdesc#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href)))$"
+      "pattern": "^(?:\\$aas#(?:idShort|id|assetInformation\\.assetKind|assetInformation\\.assetType|assetInformation\\.globalAssetId|assetInformation\\.(?:specificAssetIds\\[[0-9]*\\](?:\\.(?:name|value|externalSubjectId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(?:type|value))?)?)?)|submodels\\.(?:type|keys\\[\\d*\\](?:\\.(?:type|value))?))|submodels\\.(type|keys\\[\\d*\\](?:\\.(type|value))?)))$"
+    },
+    "FieldIdentifierSM": {
+      "type": "string",
+      "pattern": "^(?:\\$sm#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id))$"
+    },
+    "FieldIdentifierSME": {
+      "type": "string",
+      "pattern": "^(?:\\$sme(?:\\.[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9_])?(?:\\[[0-9]+\\])*)*#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|value|valueType|language))$"
+    },
+    "FieldIdentifierCD": {
+      "type": "string",
+      "pattern": "^(?:\\$cd#(?:idShort|id))$"
+    },
+    "FieldIdentifierAasDescriptor": {
+      "type": "string",
+      "pattern": "^(?:\\$aasdesc#(?:idShort|id|assetKind|assetType|globalAssetId|specificAssetIds\\[[0-9]*\\]?(?:\\.(name|value|externalSubjectId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?)?)|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href)|submodelDescriptors\\[[0-9]*\\]\\.(semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href))))$"
+    },
+    "FieldIdentifierSmDescriptor": {
+      "type": "string",
+      "pattern": "^(?:\\$smdesc#(?:semanticId(?:\\.type|\\.keys\\\\d*\\)?)?|idShort|id|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href)))$"
+    },
+    "FieldIdentifier": {
+      "oneOf": [
+        {
+          "$ref": "#/definitions/FieldIdentifierAAS"
+        },
+        {
+          "$ref": "#/definitions/FieldIdentifierSM"
+        },
+        {
+          "$ref": "#/definitions/FieldIdentifierSME"
+        },
+        {
+          "$ref": "#/definitions/FieldIdentifierCD"
+        },
+        {
+          "$ref": "#/definitions/FieldIdentifierAasDescriptor"
+        },
+        {
+          "$ref": "#/definitions/FieldIdentifierSmDescriptor"
+        }
+      ]
+    },
+    "ReferenceIdentifierAAS": {
+      "type": "string",
+      "pattern": "^(?:\\$aas\\(\\\".*\\\"\\)#(?:idShort|id|assetInformation\\.assetKind|assetInformation\\.assetType|assetInformation\\.globalAssetId|assetInformation\\.(?:specificAssetIds\\[[0-9]*\\](?:\\.(?:name|value|externalSubjectId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(?:type|value))?)?)?)|submodels\\.(?:type|keys\\[\\d*\\](?:\\.(?:type|value))?))|submodels\\.(type|keys\\[\\d*\\](?:\\.(type|value))?)))$"
+    },
+    "ReferenceIdentifierSM": {
+      "type": "string",
+      "pattern": "^(?:\\$sm\\(\\\".*\\\"\\)#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id))$"
+    },
+    "ReferenceIdentifierSME": {
+      "type": "string",
+      "pattern": "^\\$sme\\(\\\".*\\\"\\)(?:\\.[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9_])?(?:\\[[0-9]+\\])*)*#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|value|valueType|language)$"
+    },
+    "ReferenceIdentifierCD": {
+      "type": "string",
+      "pattern": "^(?:\\$cd\\(\\\".*\\\"\\)#(?:idShort|id))$"
+    },
+    "ReferenceIdentifier": {
+      "oneOf": [
+        {
+          "$ref": "#/definitions/ReferenceIdentifierAAS"
+        },
+        {
+          "$ref": "#/definitions/ReferenceIdentifierSM"
+        },
+        {
+          "$ref": "#/definitions/ReferenceIdentifierSME"
+        },
+        {
+          "$ref": "#/definitions/ReferenceIdentifierCD"
+        }
+      ]
+    },
+    "IdentifiableIdentifier": {
+      "type": "string",
+      "pattern": "^\\$(sm|aas|cd)\\(\\\".*\\\"\\)$"
+    },
+    "ReferableIdentifier": {
+      "type": "string",
+      "pattern": "^\\$sme\\(\\\".*\\\"\\)(?:\\.[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9_])?(?:\\[[0-9]+\\])*)*$"
+    },
+    "FragmentIdentifier": {
+      "type": "string",
+      "pattern": "^\\$sme\\(\\\".*\\\"\\)(?:\\.[a-zA-Z]([a-zA-Z0-9_-]*[a-zA-Z0-9_])?(?:\\[[0-9]+\\])*)*?(\\s+[a-zA-Z0-9_\\-\\.]+)+$"
+    },
+    "DescriptorIdentifier": {
+      "type": "string",
+      "pattern": "^(?:\\$(aasdesc|smdesc)\\(\\\".*\\\"\\))$"
     },
     "hexLiteralPattern": {
       "type": "string",
@@ -27,7 +117,7 @@
       "type": "object",
       "properties": {
         "$field": {
-          "$ref": "#/definitions/modelStringPattern"
+          "$ref": "#/definitions/FieldIdentifier"
         },
         "$strVal": {
           "$ref": "#/definitions/standardString"
@@ -179,7 +269,7 @@
       "type": "object",
       "properties": {
         "$field": {
-          "$ref": "#/definitions/modelStringPattern"
+          "$ref": "#/definitions/FieldIdentifier"
         },
         "$strVal": {
           "$ref": "#/definitions/standardString"
@@ -511,7 +601,7 @@
           ]
         },
         "REFERENCE": {
-          "type": "string"
+      	  "$ref": "#/definitions/ReferenceIdentifier"
         }
       },
       "additionalProperties": false
@@ -549,16 +639,16 @@
           "type": "string"
         },
         "IDENTIFIABLE": {
-          "type": "string"
+          "$ref": "#/definitions/IdentifiableIdentifier"
         },
         "REFERABLE": {
-          "type": "string"
+          "$ref": "#/definitions/ReferableIdentifier"
         },
         "FRAGMENT": {
-          "type": "string"
+          "$ref": "#/definitions/FragmentIdentifier"
         },
         "DESCRIPTOR": {
-          "type": "string"
+          "$ref": "#/definitions/DescriptorIdentifier"
         }
       },
       "additionalProperties": false
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/json/access-rule-model.json b/documentation/IDTA-01004/modules/ROOT/partials/json/access-rule-model.json
index d2f6c2b..caa1ba3 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/json/access-rule-model.json
+++ b/documentation/IDTA-01004/modules/ROOT/partials/json/access-rule-model.json
@@ -32,7 +32,7 @@
           ]
         },
         "REFERENCE": {
-          "type": "string"
+      	  "$ref": "#/definitions/ReferenceIdentifier"
         }
       },
       "additionalProperties": false
@@ -70,16 +70,16 @@
           "type": "string"
         },
         "IDENTIFIABLE": {
-          "type": "string"
+          "$ref": "#/definitions/IdentifiableIdentifier"
         },
         "REFERABLE": {
-          "type": "string"
+          "$ref": "#/definitions/ReferableIdentifier"
         },
         "FRAGMENT": {
-          "type": "string"
+          "$ref": "#/definitions/FragmentIdentifier"
         },
         "DESCRIPTOR": {
-          "type": "string"
+          "$ref": "#/definitions/DescriptorIdentifier"
         }
       },
       "additionalProperties": false
diff --git a/documentation/IDTA-01004/modules/ROOT/partials/json/formulas-and-logical-expressions.json b/documentation/IDTA-01004/modules/ROOT/partials/json/formulas-and-logical-expressions.json
index 38c90aa..2921b4e 100644
--- a/documentation/IDTA-01004/modules/ROOT/partials/json/formulas-and-logical-expressions.json
+++ b/documentation/IDTA-01004/modules/ROOT/partials/json/formulas-and-logical-expressions.json
@@ -3,9 +3,99 @@
       "type": "string",
       "pattern": "^(?!\\$).*"
     },
-    "modelStringPattern": {
+    "FieldIdentifierAAS": {
       "type": "string",
-      "pattern": "^(?:\\$aas#(?:idShort|id|assetInformation\\.assetKind|assetInformation\\.assetType|assetInformation\\.globalAssetId|assetInformation\\.(?:specificAssetIds\\[[0-9]*\\](?:\\.(?:name|value|externalSubjectId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(?:type|value))?)?)?)|submodels\\.(?:type|keys\\[\\d*\\](?:\\.(?:type|value))?))|submodels\\.(type|keys\\[\\d*\\](?:\\.(type|value))?))|(?:\\$sm#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id))|(?:\\$sme(?:\\.[a-zA-Z][a-zA-Z0-9_]*\\[[0-9]*\\]?(?:\\.[a-zA-Z][a-zA-Z0-9_]*\\[[0-9]*\\]?)*)?#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|value|valueType|language))|(?:\\$cd#(?:idShort|id)))|(?:\\$aasdesc#(?:idShort|id|assetKind|assetType|globalAssetId|specificAssetIds\\[[0-9]*\\]?(?:\\.(name|value|externalSubjectId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?)?)|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href)|submodelDescriptors\\[[0-9]*\\]\\.(semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href))))|(?:\\$smdesc#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href)))$"
+      "pattern": "^(?:\\$aas#(?:idShort|id|assetInformation\\.assetKind|assetInformation\\.assetType|assetInformation\\.globalAssetId|assetInformation\\.(?:specificAssetIds\\[[0-9]*\\](?:\\.(?:name|value|externalSubjectId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(?:type|value))?)?)?)|submodels\\.(?:type|keys\\[\\d*\\](?:\\.(?:type|value))?))|submodels\\.(type|keys\\[\\d*\\](?:\\.(type|value))?)))$"
+    },
+    "FieldIdentifierSM": {
+      "type": "string",
+      "pattern": "^(?:\\$sm#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id))$"
+    },
+    "FieldIdentifierSME": {
+      "type": "string",
+      "pattern": "^(?:\\$sme(?:\\.[a-zA-Z][a-zA-Z0-9_]*(?:\\[[0-9]+\\])*)*#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|value|valueType|language))$"
+    },
+    "FieldIdentifierCD": {
+      "type": "string",
+      "pattern": "^(?:\\$cd#(?:idShort|id))$"
+    },
+    "FieldIdentifierAasDescriptor": {
+      "type": "string",
+      "pattern": "^(?:\\$aasdesc#(?:idShort|id|assetKind|assetType|globalAssetId|specificAssetIds\\[[0-9]*\\]?(?:\\.(name|value|externalSubjectId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?)?)|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href)|submodelDescriptors\\[[0-9]*\\]\\.(semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href))))$"
+    },
+    "FieldIdentifierSmDescriptor": {
+      "type": "string",
+      "pattern": "^(?:\\$smdesc#(?:semanticId(?:\\.type|\\.keys\\\\d*\\)?)?|idShort|id|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href)))$"
+    },
+    "FieldIdentifier": {
+      "oneOf": [
+        {
+          "$ref": "#/definitions/FieldIdentifierAAS"
+        },
+        {
+          "$ref": "#/definitions/FieldIdentifierSM"
+        },
+        {
+          "$ref": "#/definitions/FieldIdentifierSME"
+        },
+        {
+          "$ref": "#/definitions/FieldIdentifierCD"
+        },
+        {
+          "$ref": "#/definitions/FieldIdentifierAasDescriptor"
+        },
+        {
+          "$ref": "#/definitions/FieldIdentifierSmDescriptor"
+        }
+      ]
+    },
+    "ReferenceIdentifierAAS": {
+      "type": "string",
+      "pattern": "^(?:\\$aas\\(\\\".*\\\"\\)#(?:idShort|id|assetInformation\\.assetKind|assetInformation\\.assetType|assetInformation\\.globalAssetId|assetInformation\\.(?:specificAssetIds\\[[0-9]*\\](?:\\.(?:name|value|externalSubjectId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(?:type|value))?)?)?)|submodels\\.(?:type|keys\\[\\d*\\](?:\\.(?:type|value))?))|submodels\\.(type|keys\\[\\d*\\](?:\\.(type|value))?)))$"
+    },
+    "ReferenceIdentifierSM": {
+      "type": "string",
+      "pattern": "^(?:\\$sm\\(\\\".*\\\"\\)#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id))$"
+    },
+    "ReferenceIdentifierSME": {
+      "type": "string",
+      "pattern": "^\\$sme\\(\\\".*\\\"\\)(?:\\.[a-zA-Z][a-zA-Z0-9_]*(?:\\[[0-9]+\\])*)*#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|value|valueType|language)$"
+    },
+    "ReferenceIdentifierCD": {
+      "type": "string",
+      "pattern": "^(?:\\$cd\\(\\\".*\\\"\\)#(?:idShort|id))$"
+    },
+    "ReferenceIdentifier": {
+      "oneOf": [
+        {
+          "$ref": "#/definitions/ReferenceIdentifierAAS"
+        },
+        {
+          "$ref": "#/definitions/ReferenceIdentifierSM"
+        },
+        {
+          "$ref": "#/definitions/ReferenceIdentifierSME"
+        },
+        {
+          "$ref": "#/definitions/ReferenceIdentifierCD"
+        }
+      ]
+    },
+    "IdentifiableIdentifier": {
+      "type": "string",
+      "pattern": "^\\$(sm|aas|cd)\\(\\\".*\\\"\\)$"
+    },
+    "ReferableIdentifier": {
+      "type": "string",
+      "pattern": "^\\$sme\\(\\\".*\\\"\\)(?:\\.[a-zA-Z][a-zA-Z0-9_]*(?:\\[[0-9]+\\])*)*$"
+    },
+    "FragmentIdentifier": {
+      "type": "string",
+      "pattern": "^\\$sme\\(\\\".*\\\"\\)(?:\\.[a-zA-Z][a-zA-Z0-9_]*(?:\\[[0-9]+\\])*)*?(\\s+[a-zA-Z0-9_\\-\\.]+)+$"
+    },
+    "DescriptorIdentifier": {
+      "type": "string",
+      "pattern": "^(?:\\$(aasdesc|smdesc)\\(\\\".*\\\"\\))$"
     },
     "hexLiteralPattern": {
       "type": "string",
@@ -23,7 +113,7 @@
       "type": "object",
       "properties": {
         "$field": {
-          "$ref": "#/definitions/modelStringPattern"
+          "$ref": "#/definitions/FieldIdentifier"
         },
         "$strVal": {
           "$ref": "#/definitions/standardString"
@@ -175,7 +265,7 @@
       "type": "object",
       "properties": {
         "$field": {
-          "$ref": "#/definitions/modelStringPattern"
+          "$ref": "#/definitions/FieldIdentifier"
         },
         "$strVal": {
           "$ref": "#/definitions/standardString"