diff --git a/md/annex-b.md b/md/annex-b.md
index bf85277b9693f17b2256a6d4cb60cff184e9b645..6f85bf64dd6b58f71a6ea7a1a5b54149808e4afc 100644
--- a/md/annex-b.md
+++ b/md/annex-b.md
@@ -76,10 +76,6 @@ Such definition has been tested using [i.19].
       "@type": "@vocab"
     },
     "attrs": "ngsi-ld:attrs",
-    "avg": {
-      "@id": "ngsi-ld:avg",
-      "@container": "@list"
-    },
     "bbox": {
       "@container": "@list",
       "@id": "geojson:bbox"
@@ -121,12 +117,8 @@ Such definition has been tested using [i.19].
       "@id": "ngsi-ld:deletedAt",
       "@type": "DateTime"
     },
-    "description": "http://purl.org/dc/terms/description",
+    "description":  "http://purl.org/dc/terms/description",
     "detail": "ngsi-ld:detail",
-    "distinctCount": {
-      "@id": "ngsi-ld:distinctCount",
-      "@container": "@list"
-    },
     "endAt": {
       "@id": "ngsi-ld:endAt",
       "@type": "DateTime"
@@ -185,7 +177,17 @@ Such definition has been tested using [i.19].
     "jsonldContext": "ngsi-ld:jsonldContext",
     "jsons": {
       "@id": "ngsi-ld:jsons",
-      "@container": "@list"
+      "@container": "@list",
+      "@context": {
+        "distinctCount": {
+          "@id": "ngsi-ld:distinctCount",
+          "@container": "@list"
+        },
+        "totalCount": {
+          "@id": "ngsi-ld:totalCount",
+          "@container": "@list"
+        }
+      }
     },
     "key": "ngsi-ld:hasKey",
     "lang": "ngsi-ld:lang",
@@ -195,7 +197,17 @@ Such definition has been tested using [i.19].
     },
     "languageMaps": {
       "@id": "ngsi-ld:hasLanguageMaps",
-      "@container": "@list"
+      "@container": "@list",
+      "@context": {
+        "distinctCount": {
+          "@id": "ngsi-ld:distinctCount",
+          "@container": "@list"
+        },
+        "totalCount": {
+          "@id": "ngsi-ld:totalCount",
+          "@container": "@list"
+        }
+      }
     },
     "langString": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString",
     "lastFailure": {
@@ -220,14 +232,6 @@ Such definition has been tested using [i.19].
     "location": "ngsi-ld:location",
     "management": "ngsi-ld:management",
     "managementInterval": "ngsi-ld:managementInterval",
-    "max": {
-      "@id": "ngsi-ld:max",
-      "@container": "@list"
-    },
-    "min": {
-      "@id": "ngsi-ld:min",
-      "@container": "@list"
-    },
     "mode": "ngsi-ld:mode",
     "modifiedAt": {
       "@id": "ngsi-ld:modifiedAt",
@@ -265,11 +269,31 @@ Such definition has been tested using [i.19].
     },
     "objectLists": {
       "@id": "ngsi-ld:hasObjectLists",
-      "@container": "@list"
+      "@container": "@list",
+      "@context": {
+        "distinctCount": {
+          "@id": "ngsi-ld:distinctCount",
+          "@container": "@list"
+        },
+        "totalCount": {
+          "@id": "ngsi-ld:totalCount",
+          "@container": "@list"
+        }
+      }
     },
     "objects": {
       "@id": "ngsi-ld:hasObjects",
-      "@container": "@list"
+      "@container": "@list",
+      "@context": {
+        "distinctCount": {
+          "@id": "ngsi-ld:distinctCount",
+          "@container": "@list"
+        },
+        "totalCount": {
+          "@id": "ngsi-ld:totalCount",
+          "@container": "@list"
+        }
+      }
     },
     "objectType": {
       "@id": "ngsi-ld:hasObjectType",
@@ -377,14 +401,6 @@ Such definition has been tested using [i.19].
       "@id": "ngsi-ld:success",
       "@type": "@id"
     },
-    "sum": {
-      "@id": "ngsi-ld:sum",
-      "@container": "@list"
-    },
-    "sumsq": {
-      "@id": "ngsi-ld:sumsq",
-      "@container": "@list"
-    },
     "sysAttrs": "ngsi-ld:sysAttrs",
     "temporalQ": "ngsi-ld:temporalQ",
     "tenant": {
@@ -403,10 +419,6 @@ Such definition has been tested using [i.19].
     "timesFailed": "ngsi-ld:timesFailed",
     "timesSent": "ngsi-ld:timesSent",
     "title": "http://purl.org/dc/terms/title",
-    "totalCount": {
-      "@id": "ngsi-ld:totalCount",
-      "@container": "@list"
-    },
     "triggerReason": "ngsi-ld:triggerReason",
     "typeList": {
       "@id": "ngsi-ld:typeList",
@@ -431,11 +443,51 @@ Such definition has been tested using [i.19].
     },
     "valueLists": {
       "@id": "ngsi-ld:hasValueLists",
-      "@container": "@list"
+      "@container": "@list",
+      "@context": {
+        "distinctCount": {
+          "@id": "ngsi-ld:distinctCount",
+          "@container": "@list"
+        },
+        "totalCount": {
+          "@id": "ngsi-ld:totalCount",
+          "@container": "@list"
+        }
+      }
     },
     "values": {
       "@id": "ngsi-ld:hasValues",
-      "@container": "@list"
+      "@container": "@list",
+      "@context": {
+        "avg": {
+          "@id": "ngsi-ld:avg",
+          "@container": "@list"
+        },
+        "distinctCount": {
+          "@id": "ngsi-ld:distinctCount",
+          "@container": "@list"
+        },
+        "max": {
+          "@id": "ngsi-ld:max",
+          "@container": "@list"
+        },
+        "min": {
+          "@id": "ngsi-ld:min",
+          "@container": "@list"
+        },
+        "sum": {
+          "@id": "ngsi-ld:sum",
+          "@container": "@list"
+        },
+        "sumsq": {
+          "@id": "ngsi-ld:sumsq",
+          "@container": "@list"
+        },
+        "totalCount": {
+          "@id": "ngsi-ld:totalCount",
+          "@container": "@list"
+        }
+      }
     },
     "valueType": {
       "@id": "ngsi-ld:hasValueType",
@@ -447,7 +499,17 @@ Such definition has been tested using [i.19].
     },
     "vocabs": {
       "@id": "ngsi-ld:hasVocabs",
-      "@container": "@list"
+      "@container": "@list",
+      "@context": {
+        "distinctCount": {
+          "@id": "ngsi-ld:distinctCount",
+          "@container": "@list"
+        },
+        "totalCount": {
+          "@id": "ngsi-ld:totalCount",
+          "@container": "@list"
+        }
+      }
     },
     "watchedAttributes": {
       "@id": "ngsi-ld:watchedAttributes",