diff --git a/examples/mapping-example/Sources/ExampleCRM/entities/Address.entity.cm b/examples/mapping-example/Sources/ExampleCRM/entities/Address.entity.cm
index e9bff3c3..adf08e65 100644
--- a/examples/mapping-example/Sources/ExampleCRM/entities/Address.entity.cm
+++ b/examples/mapping-example/Sources/ExampleCRM/entities/Address.entity.cm
@@ -3,7 +3,8 @@ entity:
     name: "Address"
     description: "The address of a customer."
     attributes:
-      - id: CustomerID
+      - identifier: true
+        id: CustomerID
         name: "CustomerID"
         datatype: "Integer"
       - id: Street
diff --git a/examples/mapping-example/Sources/ExampleCRM/entities/Customer.entity.cm b/examples/mapping-example/Sources/ExampleCRM/entities/Customer.entity.cm
index 78683740..1286efd0 100644
--- a/examples/mapping-example/Sources/ExampleCRM/entities/Customer.entity.cm
+++ b/examples/mapping-example/Sources/ExampleCRM/entities/Customer.entity.cm
@@ -2,24 +2,25 @@ entity:
     id: Customer
     name: "Customer"
     attributes:
-        - id: Id
-          name: "Id"
-          datatype: "Integer"
-        - id: FirstName
-          name: "FirstName"
-          datatype: "Text"
-        - id: LastName
-          name: "LastName"
-          datatype: "Text"
-        - id: City
-          name: "City"
-          datatype: "Text"
-        - id: Country
-          name: "Country"
-          datatype: "Text"
-        - id: Phone
-          name: "Phone"
-          datatype: "Text"
-        - id: BirthDate
-          name: "BirthDate"
-          datatype: "DateTime"
\ No newline at end of file
+      - identifier: true
+        id: Id
+        name: "Id"
+        datatype: "Integer"
+      - id: FirstName
+        name: "FirstName"
+        datatype: "Text"
+      - id: LastName
+        name: "LastName"
+        datatype: "Text"
+      - id: City
+        name: "City"
+        datatype: "Text"
+      - id: Country
+        name: "Country"
+        datatype: "Text"
+      - id: Phone
+        name: "Phone"
+        datatype: "Text"
+      - id: BirthDate
+        name: "BirthDate"
+        datatype: "DateTime"
\ No newline at end of file
diff --git a/examples/mapping-example/Sources/ExampleCRM/entities/Order.entity.cm b/examples/mapping-example/Sources/ExampleCRM/entities/Order.entity.cm
index 0d804945..aad4d257 100644
--- a/examples/mapping-example/Sources/ExampleCRM/entities/Order.entity.cm
+++ b/examples/mapping-example/Sources/ExampleCRM/entities/Order.entity.cm
@@ -3,7 +3,8 @@ entity:
     name: "Order"
     description: "Order placed by a customer in the Customer table."
     attributes:
-      - id: Id
+      - identifier: true
+        id: Id
         name: "Id"
         datatype: "Integer"
       - id: OrderDate
diff --git a/examples/mapping-example/Sources/ExampleMasterdata/entities/Country.entity.cm b/examples/mapping-example/Sources/ExampleMasterdata/entities/Country.entity.cm
index c760ff72..fbab99f3 100644
--- a/examples/mapping-example/Sources/ExampleMasterdata/entities/Country.entity.cm
+++ b/examples/mapping-example/Sources/ExampleMasterdata/entities/Country.entity.cm
@@ -2,9 +2,10 @@ entity:
     id: Country
     name: "Country"
     attributes:
-        - id: Code
-          name: "Code"
-          datatype: "Varchar"
-        - id: Name
-          name: "name"
-          datatype: "Varchar"
\ No newline at end of file
+      - identifier: true
+        id: Code
+        name: "Code"
+        datatype: "Varchar"
+      - id: Name
+        name: "Name"
+        datatype: "Varchar"
\ No newline at end of file