diff --git a/cddl/examples/ice-sla2.diag b/cddl/examples/ice-sla2.diag
index 8332370..43729ab 100644
--- a/cddl/examples/ice-sla2.diag
+++ b/cddl/examples/ice-sla2.diag
@@ -4,11 +4,11 @@
       [ /** uses reference-triple-record schema **/
         / environment-map / {
           / ** env1 ** /
-          / comid.class / 0 : {
-            / comid.vendor / 1 : "ACME.example",
-            / comid.model / 2 : "MAX.example",
-            / comid.index / 4 : 0,
-            / comid.class-id / 0 : 551(1) /** SPDM firmware **/
+          / class-map / 0 : {
+            / vendor / 1 : "ACME.example",
+            / model / 2 : "MAX.example",
+            / index / 4 : 0,
+            / class-id / 0 : 560(h'0001') /** SPDM firmware **/
           }
         },
         / measurement-map / {
diff --git a/cddl/examples/irim-s3m-sgx-appraisal.diag b/cddl/examples/irim-s3m-sgx-appraisal.diag
index 019389d..2093932 100644
--- a/cddl/examples/irim-s3m-sgx-appraisal.diag
+++ b/cddl/examples/irim-s3m-sgx-appraisal.diag
@@ -3,26 +3,41 @@
     / tag-id / 0 : "Sample S3M SGX Appraisal"
   },
   / triples / 4 : {
-    / conditional-endorsement-triples / 9 : [
+    / conditional-endorsement-triples / 10 : [
       [ / conditional-endorsement-triple-record /
-        [ / *** stateful-environment-record *** /
-          { / environment-map / 
-            / class-map / 0 : {
-              / vendor / 1: "Intel",
-              / model / 2: "0123456789ABCDEF",
-              / class-id / 0: / tagged-uuid-type / 37(h'e5c51cb6a7fe11ed89f400155d09de56')
+        [ / *** conditions *** /
+          [ / *** stateful-environment-record *** /
+            { / environment-map / 
+              / class-map / 0 : {
+                / vendor / 1: "Intel",
+                / model / 2: "0123456789ABCDEF",
+                / class-id / 0: / tagged-uuid-type / 37(h'e5c51cb6a7fe11ed89f400155d09de56')
+              }
+            },
+            { / *** measurement-map *** /
+              / mval / 1 : / measurement-values-map / {
+                / tcbstatus / -88: 60010([ / member / 6, [ "UpToDate", "SWHardeningNeeded" ] ]),
+                / tcbdate / -72: 60010([ / ge / 2, 0("2020-07-28T00:00:00Z") ])
+              }
             }
-          },
-          { / *** measurement-map *** /
-            / mval / 1 : / measurement-values-map / {
-              / tcbstatus / -88: 60010([ / member / 6, [ "UpToDate", "SWHardeningNeeded" ] ]),
-              / tcbdate / -72: 60010([ / ge / 2, 0("2020-07-28T00:00:00Z") ])
+          ] /*** end stateful-environment-record ***/
+        ], 
+        [ / *** endorsements *** /
+          [ / *** endorsed triple record *** /
+            { / environment-map / 
+              / class-map / 0 : {
+                / vendor / 1: "Intel",
+                / model / 2: "0123456789ABCDEF",
+                / class-id / 0: / tagged-uuid-type / 37(h'e5c51cb6a7fe11ed89f400155d09de56')
+              }
+            },
+            { / *** measurement-map *** /
+              / mval / 1 : { / *** measurement-values-map *** /
+                / name / 11: "sample data"
+              }
             }
-          }
-        ], /*** end stateful-environment-record ***/
-        { / measurement-values-map /
-          / name / 11: "sample data"
-        }
+          ]
+        ]
       ]
     ]
   }
diff --git a/cddl/examples/irim-sla2.diag b/cddl/examples/irim-sla2.diag
index acdef7d..6a1ed7c 100644
--- a/cddl/examples/irim-sla2.diag
+++ b/cddl/examples/irim-sla2.diag
@@ -7,11 +7,11 @@
       / reference-triple-record / [
         / environment-map / {
           / ** env1 ** /
-          / comid.class / 0 : {
-            / comid.vendor / 1 : "ACME.example",
-            / comid.model / 2 : "MAX.example",
-            / comid.index / 4 : 0,
-            / comid.class-id / 0 : 551(1) /** SPDM firmware **/
+          / class-map / 0 : {
+            / vendor / 1 : "ACME.example",
+            / model / 2 : "MAX.example",
+            / index / 4 : 0,
+            / class-id / 0 : 560(h'0001') /** SPDM firmware **/
           }
         },
         / measurement-map / {
@@ -37,7 +37,7 @@
           / comid.class / 0 : {
             / comid.vendor / 1 : "ACME.example",
             / comid.model / 2 : "MAX.example",
-            / comid.class-id / 0 : 551(0) /** SPDM ROM  type **/
+            / class-id / 0 : 560(h'0001') /** SPDM firmware **/
           }
         },
         / crypto-key-type-choice / [
@@ -53,7 +53,7 @@
             / comid.vendor / 1 : "ACME.example",
             / comid.model / 2 : "MAX.example",
             / comid.index / 4 : 1, /*** SPDM index ***/
-            / comid.class-id / 0 : 551(6) /** SPDM version type **/
+            / class-id / 0 : 560(h'0001') /** SPDM firmware **/
           }
         },
         / measurement-map / {
@@ -71,7 +71,7 @@
             / comid.vendor / 1 : "ACME.example",
             / comid.model / 2 : "MAX.example",
             / comid.index / 4 : 2, /*** SPDM index ***/
-            / comid.class-id / 0 : 551(7) /** SPDM svn type **/
+            / class-id / 0 : 560(h'0007') /** SPDM firmware **/
           }
         },
         / measurement-map / {
@@ -90,7 +90,7 @@
             / comid.class / 0 : {
               / comid.vendor / 1 : "ACME.example",
               / comid.model / 2 : "MAX.example",
-              / comid.class-id / 0 : 551(0) /** ROM **/
+              / class-id / 0 : 560(h'0000') /** ROM **/
             }
           },
           / environment-map / {
@@ -99,7 +99,7 @@
               / comid.vendor / 1 : "ACME.example",
               / comid.model / 2 : "MAX.example",
               / comid.index / 4 : 0, /*** SPDM index ***/
-              / comid.class-id / 0 : 551(1) /*** DMTFSpecMeasurementValueType - firmware ***/
+              / class-id / 0 : 560(h'0001') /*** DMTFSpecMeasurementValueType - firmware ***/
             }
           },
           / environment-map / {
@@ -108,7 +108,7 @@
               / comid.vendor / 1 : "ACME.example",
               / comid.model / 2 : "MAX.example",
               / comid.index / 4 : 1, /*** SPDM index ***/
-              / comid.class-id / 0 : 551(6) /*** DMTFSpecMeasurementValueType - version ***/
+              / class-id / 0 : 560(h'0006') /*** DMTFSpecMeasurementValueType - version ***/
             }
           },
           / environment-map / {
@@ -117,7 +117,7 @@
               / comid.vendor / 1 : "ACME.example",
               / comid.model / 2 : "MAX.example",
               / comid.index / 4 : 2, /*** SPDM index ***/
-              / comid.class-id / 0 : 551(7) /*** DMTFSpecMeasurementValueType - svn ***/
+              / class-id / 0 : 560(h'0007') /*** DMTFSpecMeasurementValueType - svn ***/
             }
           }
         ]