diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
index e8e4f037c2..9845fc4305 100644
--- a/CHANGES_NEXT_RELEASE
+++ b/CHANGES_NEXT_RELEASE
@@ -2,6 +2,7 @@
   * #1535:  Ignore Subscription::q when matching subscriptions for deletion of an entity
   * #1542:  Array Reduction (arrays of one single element are "flattened" to that very element)
   * SOF:    https://stackoverflow.com/questions/77911109/fiware-to-payload-too-large
+  * #1551:  format=simplified for distribute GET /entities gave Normalized for entities from other brokers
 
 ## New Features:
   * Support for attributes of type VocabularyProperty
@@ -12,3 +13,7 @@
 
 ## Notes
   * TRoE is still not prepared for attributes of type Vocab/Json/Language, so, attributes of those types are not stored in the historical database
+  * Modified the @context hosting feature to be according to API spec
+  * Support for URI param 'kind' for GET Contexts
+  * Improved counters for GET Context/Contexts
+  * API spec compliance for GET Context/Contexts
diff --git a/src/app/orionld/orionld.cpp b/src/app/orionld/orionld.cpp
index 155ab6d330..abf34aaf81 100644
--- a/src/app/orionld/orionld.cpp
+++ b/src/app/orionld/orionld.cpp
@@ -243,6 +243,7 @@ bool            debugCurl    = false;
 uint32_t        cSubCounters;
 char            coreContextVersion[64];
 bool            triggerOperation = false;
+bool            noprom           = false;
 
 
 
@@ -335,6 +336,7 @@ bool            triggerOperation = false;
 #define DEBUG_CURL_DESC        "turn on debugging of libcurl - to the broker's logfile"
 #define CSUBCOUNTERS_DESC      "number of subscription counter updates before flush from sub-cache to DB (0: never, 1: always)"
 #define CORE_CONTEXT_DESC      "core context version (v1.0|v1.3|v1.4|v1.5|v1.6|v1.7) - v1.6 is default"
+#define NO_PROM_DESC           "run without Prometheus metrics"
 
 
 
@@ -438,6 +440,7 @@ PaArgument paArgs[] =
   { "-lmtmp",                 &lmtmp,                   "TMP_TRACES",                PaBool,    PaHid,  true,            false,  true,             TMPTRACES_DESC           },
   { "-debugCurl",             &debugCurl,               "DEBUG_CURL",                PaBool,    PaHid,  false,           false,  true,             DEBUG_CURL_DESC          },
   { "-lmtmp",                 &lmtmp,                   "TMP_TRACES",                PaBool,    PaHid,  true,            false,  true,             TMPTRACES_DESC           },
+  { "-noprom",                &noprom,                  "NO_PROM",                   PaBool,    PaHid,  false,           false,  true,             NO_PROM_DESC             },
 
   PA_END_OF_ARGS
 };
@@ -1130,7 +1133,9 @@ int main(int argC, char* argV[])
   if (fg == false)
     daemonize();
 
-  if (promInit(8000) != 0)
+  if (noprom == true)
+    LM_W(("Running without Prometheus metrics"));
+  else if (promInit(8000) != 0)
     LM_W(("Error initializing Prometheus Metrics library"));
 
   IpVersion ipVersion = IPDUAL;
diff --git a/src/lib/logMsg/traceLevels.h b/src/lib/logMsg/traceLevels.h
index 72cf8cee67..6d6542199c 100644
--- a/src/lib/logMsg/traceLevels.h
+++ b/src/lib/logMsg/traceLevels.h
@@ -101,6 +101,7 @@ typedef enum TraceLevels
   LmtContexts = 100,                   // Contexts
   LmtContextTree,                      // Context Tree
   LmtContextCache,                     // Context Cache
+  LmtContextCacheStats,                // Context Cache Statistics
   LmtContextDownload,                  // Context Download
   LmtCoreContext,                      // Core Context
 
@@ -142,6 +143,7 @@ typedef enum TraceLevels
   LmtDateTime,                         // DateTime (ISO8601) conversion
   LmtMimeType,                         // MimeType
   LmtArrayReduction,                   // Arrays of only one item are reduced to the item
+  LmtFormat,                           // Normalized, Concise, Simplified
 
   //
   // Legacy
diff --git a/src/lib/orionld/apiModel/ntocAttribute.cpp b/src/lib/orionld/apiModel/ntocAttribute.cpp
index 33761db2dd..7d08db5792 100644
--- a/src/lib/orionld/apiModel/ntocAttribute.cpp
+++ b/src/lib/orionld/apiModel/ntocAttribute.cpp
@@ -57,6 +57,8 @@ void ntocAttribute(KjNode* attrP, const char* lang, bool sysAttrs)
     return;
   }
 
+  kjTreeLog(attrP, "attribute to convert from Normalized to Concise", LmtFormat);
+
   // 1. Remove the sysAttrs, if so requested
   if (sysAttrs == false)
     kjSysAttrsRemove(attrP, 0);
diff --git a/src/lib/orionld/common/orionldState.cpp b/src/lib/orionld/common/orionldState.cpp
index 68d12ed049..1aa16c5006 100644
--- a/src/lib/orionld/common/orionldState.cpp
+++ b/src/lib/orionld/common/orionldState.cpp
@@ -118,6 +118,7 @@ bool              entityMapsEnabled = false;
 mongoc_uri_t*          mongocUri;
 mongoc_client_pool_t*  mongocPool;
 sem_t                  mongocContextsSem;
+sem_t                  mongocConnectionSem;
 char                   mongocServerVersion[128];
 char                   postgresServerVersion[128];
 
diff --git a/src/lib/orionld/common/orionldState.h b/src/lib/orionld/common/orionldState.h
index 34578b3094..82717be144 100644
--- a/src/lib/orionld/common/orionldState.h
+++ b/src/lib/orionld/common/orionldState.h
@@ -170,6 +170,8 @@ typedef struct OrionldUriParams
   bool      entityMap;
   char*     format;
 
+  OrionldContextKind kind;
+
   double    observedAtAsDouble;
   uint64_t  mask;
 } OrionldUriParams;
@@ -639,6 +641,7 @@ extern mongoc_collection_t*  mongoRegistrationsCollectionP;  // Deprecated
 extern mongoc_uri_t*          mongocUri;
 extern mongoc_client_pool_t*  mongocPool;
 extern sem_t                  mongocContextsSem;
+extern sem_t                  mongocConnectionSem;
 extern char                   mongocServerVersion[128];
 extern char                   postgresServerVersion[128];
 
diff --git a/src/lib/orionld/context/CMakeLists.txt b/src/lib/orionld/context/CMakeLists.txt
index 6eb25ee032..8995d7b351 100644
--- a/src/lib/orionld/context/CMakeLists.txt
+++ b/src/lib/orionld/context/CMakeLists.txt
@@ -42,7 +42,6 @@ SET (SOURCES
     orionldContextItemAlreadyExpanded.cpp
     orionldAttributeExpand.cpp
     orionldSubAttributeExpand.cpp
-    orionldContextOriginName.cpp
     orionldEntityExpand.cpp
     orionldEntityCompact.cpp
 )
diff --git a/src/lib/orionld/context/orionldContextCreate.cpp b/src/lib/orionld/context/orionldContextCreate.cpp
index 8f322a0e7e..4ea978d21d 100644
--- a/src/lib/orionld/context/orionldContextCreate.cpp
+++ b/src/lib/orionld/context/orionldContextCreate.cpp
@@ -37,25 +37,6 @@ extern "C"
 
 
 
-// -----------------------------------------------------------------------------
-//
-// orionldOriginFromString - FIXME: move to its own module
-//
-OrionldContextOrigin orionldOriginFromString(const char* s)
-{
-  if      (strcmp(s, "UnknownOrigin")    == 0) return OrionldContextUnknownOrigin;
-  else if (strcmp(s, "Inline")           == 0) return OrionldContextFromInline;
-  else if (strcmp(s, "Downloaded")       == 0) return OrionldContextDownloaded;
-  else if (strcmp(s, "FileCached")       == 0) return OrionldContextFileCached;
-  else if (strcmp(s, "ForNotifications") == 0) return OrionldContextForNotifications;
-  else if (strcmp(s, "ForForwarding")    == 0) return OrionldContextForForwarding;
-  else if (strcmp(s, "UserCreated")      == 0) return OrionldContextUserCreated;
-
-  return OrionldContextUnknownOrigin;
-}
-
-
-
 // -----------------------------------------------------------------------------
 //
 // orionldContextCreate -
@@ -72,6 +53,7 @@ OrionldContext* orionldContextCreate(const char* url, OrionldContextOrigin origi
     LM_X(1, ("out of memory - trying to allocate a OrionldContext of %d bytes", sizeof(OrionldContext)));
 
   contextP->origin    = origin;
+  contextP->kind      = OrionldContextCached;  // By defaukt. Changed later to Hosted/Implicit if needed
   contextP->parent    = NULL;
 
   // NULL URL means NOT to be saved - will live just inside the request-thread
@@ -95,7 +77,7 @@ OrionldContext* orionldContextCreate(const char* url, OrionldContextOrigin origi
   }
 
   contextP->keyValues = keyValues;
-  contextP->lookups   = 0;
+  contextP->lookups   = 1;
 
   return contextP;
 }
diff --git a/src/lib/orionld/context/orionldContextFromBuffer.cpp b/src/lib/orionld/context/orionldContextFromBuffer.cpp
index a0b9885180..17014a8f86 100644
--- a/src/lib/orionld/context/orionldContextFromBuffer.cpp
+++ b/src/lib/orionld/context/orionldContextFromBuffer.cpp
@@ -67,7 +67,7 @@ OrionldContext* orionldContextFromBuffer(char* url, OrionldContextOrigin origin,
   KjNode* contextNodeP = kjLookup(tree, "@context");
   if (contextNodeP == NULL)
   {
-    orionldError(OrionldBadRequestData, "Invalid context - @context field missing", url, 400);
+    orionldError(OrionldInvalidRequest, "Invalid context - @context field missing", url, 400);
     return NULL;
   }
 
diff --git a/src/lib/orionld/context/orionldContextFromUrl.cpp b/src/lib/orionld/context/orionldContextFromUrl.cpp
index abcf4fda18..0d00aaae70 100644
--- a/src/lib/orionld/context/orionldContextFromUrl.cpp
+++ b/src/lib/orionld/context/orionldContextFromUrl.cpp
@@ -251,6 +251,11 @@ OrionldContext* orionldContextFromUrl(char* url, char* id)
 
   if (contextP != NULL)
   {
+    contextP->usedAt   = orionldState.requestTime;
+
+    contextP->lookups += 1;
+    LM_T(LmtContextCacheStats, ("Context '%s': %d lookups", url, contextP->lookups));
+
     LM_T(LmtContextDownload, ("Found already downloaded URL '%s'", url));
     return contextP;
   }
diff --git a/src/lib/orionld/context/orionldContextItemAliasLookup.cpp b/src/lib/orionld/context/orionldContextItemAliasLookup.cpp
index 13b8e3b0ff..aba5daa37c 100644
--- a/src/lib/orionld/context/orionldContextItemAliasLookup.cpp
+++ b/src/lib/orionld/context/orionldContextItemAliasLookup.cpp
@@ -59,10 +59,15 @@ char* orionldContextItemAliasLookup
   if (contextItemPP != NULL)
     *contextItemPP = NULL;
 
+  if (contextP == NULL)
+    contextP = orionldCoreContextP;
 
   // 1. Is it the default URL?
   if (strncmp(longName, orionldDefaultUrl, orionldDefaultUrlLen) == 0)
+  {
+    orionldCoreContextP->compactions += 1;
     return (char*) &longName[orionldDefaultUrlLen];
+  }
 
   // 2. Found in Core Context?
   contextItemP = orionldContextItemValueLookup(orionldCoreContextP, longName);
@@ -91,5 +96,6 @@ char* orionldContextItemAliasLookup
     *contextItemPP = contextItemP;
 
   // Return the short name
+  contextP->compactions += 1;
   return contextItemP->name;
 }
diff --git a/src/lib/orionld/context/orionldContextItemExpand.cpp b/src/lib/orionld/context/orionldContextItemExpand.cpp
index b353d22477..00c383a71f 100644
--- a/src/lib/orionld/context/orionldContextItemExpand.cpp
+++ b/src/lib/orionld/context/orionldContextItemExpand.cpp
@@ -96,6 +96,8 @@ char* orionldContextItemExpand
       if (contextItemPP != NULL)
         *contextItemPP = NULL;
 
+      orionldCoreContextP->expansions += 1;  // Really, @vocab expansions of the core context
+
       return longName;
     }
 
@@ -106,5 +108,7 @@ char* orionldContextItemExpand
   if (contextItemPP != NULL)
     *contextItemPP = contextItemP;
 
+  contextP->expansions += 1;  // Really, @vocab expansions of the core context
+
   return contextItemP->id;
 }
diff --git a/src/lib/orionld/context/orionldContextItemLookup.cpp b/src/lib/orionld/context/orionldContextItemLookup.cpp
index 45d15ca868..ada8f9762d 100644
--- a/src/lib/orionld/context/orionldContextItemLookup.cpp
+++ b/src/lib/orionld/context/orionldContextItemLookup.cpp
@@ -62,12 +62,17 @@ OrionldContextItem* orionldContextItemLookup(OrionldContext* contextP, const cha
     }
   }
 
-  if (valueMayBeCompactedP != NULL)
+  if (itemP != NULL)
   {
-    if ((itemP->type != NULL) && (strcmp(itemP->type, "@vocab") == 0))
-      *valueMayBeCompactedP = true;
-    else
-      *valueMayBeCompactedP = false;
+    contextP->expansions += 1;
+
+    if (valueMayBeCompactedP != NULL)
+    {
+      if ((itemP->type != NULL) && (strcmp(itemP->type, "@vocab") == 0))
+        *valueMayBeCompactedP = true;
+      else
+        *valueMayBeCompactedP = false;
+    }
   }
 
   return itemP;
diff --git a/src/lib/orionld/contextCache/orionldContextCacheGet.cpp b/src/lib/orionld/contextCache/orionldContextCacheGet.cpp
index be492d1abd..f9bad90565 100644
--- a/src/lib/orionld/contextCache/orionldContextCacheGet.cpp
+++ b/src/lib/orionld/contextCache/orionldContextCacheGet.cpp
@@ -32,12 +32,11 @@ extern "C"
 #include "logMsg/logMsg.h"                                       // LM_*
 #include "logMsg/traceLevels.h"                                  // Lmt*
 
-#include "orionld/types/OrionldContext.h"                        // OrionldContext
+#include "orionld/types/OrionldContext.h"                        // OrionldContext, orionldOriginToString, OrionldContextKind
 #include "orionld/types/OrionldContextItem.h"                    // OrionldContextItem
 #include "orionld/common/orionldState.h"                         // orionldState
 #include "orionld/common/numberToDate.h"                         // numberToDate
 #include "orionld/context/orionldCoreContext.h"                  // orionldCoreContextP
-#include "orionld/context/orionldContextOriginName.h"            // orionldContextOriginName
 #include "orionld/contextCache/orionldContextCache.h"            // Context Cache Internals
 #include "orionld/contextCache/orionldContextCacheGet.h"         // Own interface
 
@@ -45,101 +44,136 @@ extern "C"
 
 // -----------------------------------------------------------------------------
 //
-// orionldContextCacheGet -
+// orionldContextWithDetails - FIXME: rename and put in separate module
 //
-KjNode* orionldContextCacheGet(KjNode* arrayP, bool details)
+KjNode* orionldContextWithDetails(OrionldContext* contextP)
 {
-  for (int ix = 0; ix < orionldContextCacheSlotIx; ix++)
+  char createdAtString[64];
+  char lastUseString[64];
+
+  numberToDate(contextP->createdAt, createdAtString, sizeof(createdAtString));
+  numberToDate(contextP->usedAt,    lastUseString,   sizeof(lastUseString));
+
+  //
+  // Details, according to spec:
+  //   URL
+  //   localId
+  //   kind   (Hosted, Cached, ImplicitlyCreated)
+  //   createdAt
+  //   lastUsage (optional)
+  //   numberOfHits (optional)
+  //   extraInfo (object with broker specific fields, like "type", "origin")
+  //
+
+  KjNode*          contextObjP      = kjObject(orionldState.kjsonP, NULL);
+
+  KjNode*          urlStringP       = kjString(orionldState.kjsonP,  "URL",          contextP->url);
+  KjNode*          idStringP        = kjString(orionldState.kjsonP,  "localId",      (contextP->id == NULL)? "None" : contextP->id);
+  KjNode*          kindP            = kjString(orionldState.kjsonP,  "kind",         orionldKindToString(contextP->kind));
+  KjNode*          createdAtP       = kjString(orionldState.kjsonP,  "createdAt",    createdAtString);
+  KjNode*          extraInfoP       = kjObject(orionldState.kjsonP,  "extraInfo");
+  KjNode*          typeStringP      = kjString(orionldState.kjsonP,  "type",         (contextP->keyValues == true)? "hash-table" : "array");
+  KjNode*          originP          = kjString(orionldState.kjsonP,  "origin",       orionldOriginToString(contextP->origin));
+  KjNode*          compactionsP     = kjInteger(orionldState.kjsonP, "compactions",  contextP->compactions);
+  KjNode*          expansionsP      = kjInteger(orionldState.kjsonP, "expansions",   contextP->expansions);
+
+  kjChildAdd(contextObjP, urlStringP);
+  kjChildAdd(contextObjP, idStringP);
+  kjChildAdd(contextObjP, kindP);
+  kjChildAdd(contextObjP, createdAtP);
+  kjChildAdd(contextObjP, extraInfoP);
+
+
+  if (contextP != orionldCoreContextP)
   {
-    OrionldContext*  contextP         = orionldContextCacheArray[ix];
+    KjNode*          usedAtP          = kjString(orionldState.kjsonP,  "lastUsage",    lastUseString);
+    KjNode*          lookupsP         = kjInteger(orionldState.kjsonP, "numberOfHits", contextP->lookups);
+    kjChildAdd(contextObjP, usedAtP);
+    kjChildAdd(contextObjP, lookupsP);
+  }
 
-    if (contextP == NULL)
-      continue;
+  kjChildAdd(extraInfoP,  typeStringP);
+  kjChildAdd(extraInfoP,  originP);
+  kjChildAdd(extraInfoP,  compactionsP);
+  kjChildAdd(extraInfoP,  expansionsP);
 
-    if (details == true)
+  if (contextP->parent != NULL)
+  {
+    KjNode* parentP = kjString(orionldState.kjsonP, "parent", contextP->parent);
+    kjChildAdd(extraInfoP, parentP);
+  }
+
+  if (contextP->keyValues)
+  {
+    // Show a maximum of 5 items from the hash-table
+    KjNode*      hashTableObjectP = kjObject(orionldState.kjsonP, "hash-table");
+    KHashTable*  htP              = contextP->context.hash.nameHashTable;
+    int          noOfItems        = 0;
+
+    for (int slot = 0; slot < ORIONLD_CONTEXT_CACHE_HASH_ARRAY_SIZE; ++slot)
     {
-      char createdAtString[64];
-      char lastUseString[64];
-
-      numberToDate(contextP->createdAt, createdAtString, sizeof(createdAtString));
-      numberToDate(contextP->usedAt,    lastUseString,   sizeof(lastUseString));
-
-      KjNode*          contextObjP      = kjObject(orionldState.kjsonP, NULL);
-      KjNode*          urlStringP       = kjString(orionldState.kjsonP, "url",       contextP->url);
-      KjNode*          idStringP        = kjString(orionldState.kjsonP, "id",        (contextP->id == NULL)? "None" : contextP->id);
-      KjNode*          typeStringP      = kjString(orionldState.kjsonP, "type",      contextP->keyValues? "hash-table" : "array");
-      KjNode*          originP          = kjString(orionldState.kjsonP, "origin",    orionldContextOriginName(contextP->origin));
-      KjNode*          createdAtP       = kjString(orionldState.kjsonP, "createdAt", createdAtString);
-
-      kjChildAdd(contextObjP, urlStringP);
-      kjChildAdd(contextObjP, idStringP);
-      kjChildAdd(contextObjP, typeStringP);
-      kjChildAdd(contextObjP, originP);
-      kjChildAdd(contextObjP, createdAtP);
-
-      if (contextP != orionldCoreContextP)
+      KHashListItem* itemP = htP->array[slot];
+
+      while (itemP != 0)
       {
-        KjNode*          usedAtP          = kjString(orionldState.kjsonP,  "lastUse",  lastUseString);
-        KjNode*          lookupsP         = kjInteger(orionldState.kjsonP, "lookups",  contextP->lookups);
+        OrionldContextItem* hashItemP       = (OrionldContextItem*) itemP->data;
+        KjNode*             hashItemStringP = kjString(orionldState.kjsonP, hashItemP->name, hashItemP->id);
 
-        kjChildAdd(contextObjP, usedAtP);
-        kjChildAdd(contextObjP, lookupsP);
-      }
+        kjChildAdd(hashTableObjectP, hashItemStringP);
 
-      if (contextP->parent != NULL)
-      {
-        KjNode* parentP = kjString(orionldState.kjsonP, "parent", contextP->parent);
+        ++noOfItems;
+        if (noOfItems >= 5)
+          break;
 
-        kjChildAdd(contextObjP, parentP);
+        itemP = itemP->next;
       }
 
-      if (contextP->keyValues)
-      {
-        // Show a maximum of 5 items from the hash-table
-        KjNode*      hashTableObjectP = kjObject(orionldState.kjsonP, "hash-table");
-        KHashTable*  htP              = contextP->context.hash.nameHashTable;
-        int          noOfItems        = 0;
+      if (noOfItems >= 5)
+        break;
+    }
 
-        for (int slot = 0; slot < ORIONLD_CONTEXT_CACHE_HASH_ARRAY_SIZE; ++slot)
-        {
-          KHashListItem* itemP = htP->array[slot];
+    kjChildAdd(extraInfoP, hashTableObjectP);
+  }
+  else
+  {
+    //
+    // If ARRAY - show all the URLs in the array
+    //
+    KjNode* urlArrayP = kjArray(orionldState.kjsonP, "URLs");
 
-          while (itemP != 0)
-          {
-            OrionldContextItem* hashItemP       = (OrionldContextItem*) itemP->data;
-            KjNode*             hashItemStringP = kjString(orionldState.kjsonP, hashItemP->name, hashItemP->id);
+    for (int aIx = 0; aIx < contextP->context.array.items; ++aIx)
+    {
+      KjNode* urlStringP = kjString(orionldState.kjsonP, NULL, contextP->context.array.vector[aIx]->url);
 
-            kjChildAdd(hashTableObjectP, hashItemStringP);
+      kjChildAdd(urlArrayP, urlStringP);
+    }
+    kjChildAdd(extraInfoP, urlArrayP);
+  }
 
-            ++noOfItems;
-            if (noOfItems >= 5)
-              break;
+  return contextObjP;
+}
 
-            itemP = itemP->next;
-          }
 
-          if (noOfItems >= 5)
-            break;
-        }
 
-        kjChildAdd(contextObjP, hashTableObjectP);
-      }
-      else
-      {
-        //
-        // If ARRAY - show all the URLs in the array
-        //
-        KjNode* urlArrayP = kjArray(orionldState.kjsonP, "URLs");
-
-        for (int aIx = 0; aIx < contextP->context.array.items; ++aIx)
-        {
-          KjNode* urlStringP = kjString(orionldState.kjsonP, NULL, contextP->context.array.vector[aIx]->url);
-
-          kjChildAdd(urlArrayP, urlStringP);
-        }
-        kjChildAdd(contextObjP, urlArrayP);
-      }
+// -----------------------------------------------------------------------------
+//
+// orionldContextCacheGet -
+//
+KjNode* orionldContextCacheGet(KjNode* arrayP, bool details, OrionldContextKind kind)
+{
+  for (int ix = 0; ix < orionldContextCacheSlotIx; ix++)
+  {
+    OrionldContext*  contextP = orionldContextCacheArray[ix];
+
+    if (contextP == NULL)
+      continue;
 
+    if ((kind != OrionldContextUnknownKind) && (contextP->kind != kind))
+      continue;
+
+    if (details == true)
+    {
+      KjNode* contextObjP = orionldContextWithDetails(contextP);
       kjChildAdd(arrayP, contextObjP);
     }
     else
diff --git a/src/lib/orionld/contextCache/orionldContextCacheGet.h b/src/lib/orionld/contextCache/orionldContextCacheGet.h
index 05ee192240..0cdf55b346 100644
--- a/src/lib/orionld/contextCache/orionldContextCacheGet.h
+++ b/src/lib/orionld/contextCache/orionldContextCacheGet.h
@@ -30,12 +30,14 @@ extern "C"
 #include "kjson/KjNode.h"                                        // KjNode
 }
 
+#include "orionld/types/OrionldContext.h"                        // OrionldContextKind
+
 
 
 // -----------------------------------------------------------------------------
 //
 // orionldContextCacheGet -
 //
-extern KjNode* orionldContextCacheGet(KjNode* arrayP, bool details);
+extern KjNode* orionldContextCacheGet(KjNode* arrayP, bool details, OrionldContextKind kind);
 
 #endif  // SRC_LIB_ORIONLD_CONTEXTCACHE_ORIONLDCONTEXTCACHEGET_H_
diff --git a/src/lib/orionld/contextCache/orionldContextCacheLookup.cpp b/src/lib/orionld/contextCache/orionldContextCacheLookup.cpp
index 5afce5dd7f..7edbf5a4b4 100644
--- a/src/lib/orionld/contextCache/orionldContextCacheLookup.cpp
+++ b/src/lib/orionld/contextCache/orionldContextCacheLookup.cpp
@@ -49,16 +49,11 @@ OrionldContext* orionldContextCacheLookup(const char* url)
 
     if (strcmp(url, orionldContextCache[ix]->url) == 0)
       contextP = orionldContextCache[ix];
-
-    if ((orionldContextCache[ix]->id != NULL) && (strcmp(url, orionldContextCache[ix]->id) == 0))
+    else if ((orionldContextCache[ix]->id != NULL) && (strcmp(url, orionldContextCache[ix]->id) == 0))
       contextP = orionldContextCache[ix];
 
     if (contextP != NULL)
-    {
-      contextP->usedAt   = orionldState.requestTime;
-      contextP->lookups += 1;
       return contextP;
-    }
   }
 
   return NULL;
diff --git a/src/lib/orionld/contextCache/orionldContextCachePersist.cpp b/src/lib/orionld/contextCache/orionldContextCachePersist.cpp
index 0e778a58a1..7ae1deb7e1 100644
--- a/src/lib/orionld/contextCache/orionldContextCachePersist.cpp
+++ b/src/lib/orionld/contextCache/orionldContextCachePersist.cpp
@@ -31,11 +31,10 @@ extern "C"
 #include "logMsg/logMsg.h"                                       // LM_*
 #include "logMsg/traceLevels.h"                                  // Lmt*
 
-#include "orionld/types/OrionldContext.h"                        // OrionldContext
+#include "orionld/types/OrionldContext.h"                        // OrionldContext, orionldOriginToString, orionldKindToString
 #include "orionld/common/orionldState.h"                         // orionldState
 #include "orionld/common/uuidGenerate.h"                         // uuidGenerate
 #include "orionld/context/orionldContextUrlGenerate.h"           // orionldContextUrlGenerate
-#include "orionld/context/orionldContextOriginName.h"            // orionldContextOriginName
 #include "orionld/mongoc/mongocContextCachePersist.h"            // mongocContextCachePersist - FIXME: Use dbContextCachePersist
 #include "orionld/contextCache/orionldContextCachePersist.h"     // Own interface
 
@@ -61,7 +60,8 @@ void orionldContextCachePersist(OrionldContext* contextP)
   KjNode*  idP;
   KjNode*  urlP         = kjString(orionldState.kjsonP, "url",       contextP->url);
   KjNode*  parentP;
-  KjNode*  originP      = kjString(orionldState.kjsonP, "origin",    orionldContextOriginName(contextP->origin));
+  KjNode*  originP      = kjString(orionldState.kjsonP, "origin",    orionldOriginToString(contextP->origin));
+  KjNode*  kindP        = kjString(orionldState.kjsonP, "kind",      orionldKindToString(contextP->kind));
   KjNode*  createdAtP   = kjFloat(orionldState.kjsonP,  "createdAt", orionldState.requestTime);  // FIXME: make sure it's not overwritten if already exists
   KjNode*  valueP       = contextP->tree;
 
@@ -88,6 +88,9 @@ void orionldContextCachePersist(OrionldContext* contextP)
   // Field: "origin"
   kjChildAdd(contextObjP, originP);
 
+  // Field: "kind"
+  kjChildAdd(contextObjP, kindP);
+
   // Field: "createdAt"
   kjChildAdd(contextObjP, createdAtP);
 
diff --git a/src/lib/orionld/dbModel/dbModelToApiSubscription.cpp b/src/lib/orionld/dbModel/dbModelToApiSubscription.cpp
index dee719efc9..4fa86cf462 100644
--- a/src/lib/orionld/dbModel/dbModelToApiSubscription.cpp
+++ b/src/lib/orionld/dbModel/dbModelToApiSubscription.cpp
@@ -548,7 +548,6 @@ KjNode* dbModelToApiSubscription
   }
 
 
-
   //
   // origin
   //
diff --git a/src/lib/orionld/distOp/distOpResponseMergeIntoEntityArray.cpp b/src/lib/orionld/distOp/distOpResponseMergeIntoEntityArray.cpp
index 6a3732a800..b2ba46f8c8 100644
--- a/src/lib/orionld/distOp/distOpResponseMergeIntoEntityArray.cpp
+++ b/src/lib/orionld/distOp/distOpResponseMergeIntoEntityArray.cpp
@@ -34,6 +34,8 @@ extern "C"
 #include "orionld/types/DistOp.h"                                   // DistOp
 #include "orionld/common/orionldState.h"                            // orionldState, entityMaps
 #include "orionld/kjTree/kjEntityIdLookupInEntityArray.h"           // kjEntityIdLookupInEntityArray
+#include "orionld/kjTree/kjEntityNormalizedToConcise.h"             // kjEntityNormalizedToConcise
+#include "orionld/kjTree/kjEntityNormalizedToSimplified.h"          // kjEntityNormalizedToSimplified
 #include "orionld/distOp/distOpEntityMerge.h"                       // distOpEntityMerge
 #include "orionld/distOp/distOpResponseMergeIntoEntityArray.h"      // Own interface
 
@@ -57,6 +59,7 @@ void distOpResponseMergeIntoEntityArray(DistOp* distOpP, KjNode* entityArray)
 
     KjNode* entityP = distOpP->responseBody->value.firstChildP;
     KjNode* next;
+
     while (entityP != NULL)
     {
       next = entityP->next;
@@ -91,4 +94,3 @@ void distOpResponseMergeIntoEntityArray(DistOp* distOpP, KjNode* entityArray)
     }
   }
 }
-
diff --git a/src/lib/orionld/mhd/mhdConnectionInit.cpp b/src/lib/orionld/mhd/mhdConnectionInit.cpp
index c8a71badfc..993673b2e0 100644
--- a/src/lib/orionld/mhd/mhdConnectionInit.cpp
+++ b/src/lib/orionld/mhd/mhdConnectionInit.cpp
@@ -852,6 +852,18 @@ MHD_Result orionldUriArgumentGet(void* cbDataP, MHD_ValueKind kind, const char*
     orionldState.uriParams.subscriptionId  = (char*) value;
     orionldState.uriParams.mask           |= ORIONLD_URIPARAM_SUBSCRIPTION_ID;
   }
+  else if (strcmp(key, "kind") == 0)
+  {
+    orionldState.uriParams.kind = orionldKindFromString(value);
+
+    if (orionldState.uriParams.kind == OrionldContextUnknownKind)
+    {
+      orionldError(OrionldBadRequestData, "Invalid value for uri parameter /kind/", value, 400);
+      return MHD_YES;
+    }
+
+    orionldState.uriParams.mask  |= ORIONLD_URIPARAM_KIND;
+  }
   else if (strcmp(key, "location") == 0)
   {
     if (strcmp(value, "true") == 0)
diff --git a/src/lib/orionld/mongoc/mongocAttributeDelete.cpp b/src/lib/orionld/mongoc/mongocAttributeDelete.cpp
index 71e8306ef9..755f39cecd 100644
--- a/src/lib/orionld/mongoc/mongocAttributeDelete.cpp
+++ b/src/lib/orionld/mongoc/mongocAttributeDelete.cpp
@@ -54,10 +54,7 @@ extern "C"
 //
 bool mongocAttributeDelete(const char* entityId, const char* attrName)
 {
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   bson_t selector;
   bson_init(&selector);
diff --git a/src/lib/orionld/mongoc/mongocAttributeReplace.cpp b/src/lib/orionld/mongoc/mongocAttributeReplace.cpp
index 6188a9cfc4..a162f82699 100644
--- a/src/lib/orionld/mongoc/mongocAttributeReplace.cpp
+++ b/src/lib/orionld/mongoc/mongocAttributeReplace.cpp
@@ -47,10 +47,7 @@ extern "C"
 //
 bool mongocAttributeReplace(const char* entityId, KjNode* dbAttrP, char** detailP)
 {
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   bson_t selector;
   bson_init(&selector);
diff --git a/src/lib/orionld/mongoc/mongocAttributesAdd.cpp b/src/lib/orionld/mongoc/mongocAttributesAdd.cpp
index 73e8ff49a0..f88c4ed9f2 100644
--- a/src/lib/orionld/mongoc/mongocAttributesAdd.cpp
+++ b/src/lib/orionld/mongoc/mongocAttributesAdd.cpp
@@ -60,10 +60,7 @@ bool mongocAttributesAdd
   bool         singleAttribute
 )
 {
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   bson_t selector;
   bson_init(&selector);
diff --git a/src/lib/orionld/mongoc/mongocConnectionGet.cpp b/src/lib/orionld/mongoc/mongocConnectionGet.cpp
index 6a24459e7f..8b42f6d425 100644
--- a/src/lib/orionld/mongoc/mongocConnectionGet.cpp
+++ b/src/lib/orionld/mongoc/mongocConnectionGet.cpp
@@ -23,9 +23,11 @@
 * Author: Ken Zangelin
 */
 #include <unistd.h>                                              // NULL
+#include <semaphore.h>                                           // sem_wait, sem_post
 #include <mongoc/mongoc.h>                                       // mongoc driver
 
 #include "orionld/common/orionldState.h"                         // orionldState, mongocPool
+#include "orionld/types/OrionldTenant.h"                         // OrionldTenant
 #include "orionld/mongoc/mongocConnectionGet.h"                  // Own interface
 
 
@@ -34,8 +36,36 @@
 //
 // mongocConnectionGet -
 //
-void mongocConnectionGet(void)
+void mongocConnectionGet(OrionldTenant* tenantP, DbCollection dbCollection)
 {
+  sem_wait(&mongocConnectionSem);
+
   if (orionldState.mongoc.client == NULL)
     orionldState.mongoc.client = mongoc_client_pool_pop(mongocPool);
+
+  if ((dbCollection & DbEntities) == DbEntities)
+  {
+    if (orionldState.mongoc.entitiesP == NULL)
+      orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, tenantP->mongoDbName, "entities");
+  }
+
+  if ((dbCollection & DbSubscriptions) == DbSubscriptions)
+  {
+    if (orionldState.mongoc.subscriptionsP == NULL)
+      orionldState.mongoc.subscriptionsP = mongoc_client_get_collection(orionldState.mongoc.client, tenantP->mongoDbName, "csubs");
+  }
+
+  if ((dbCollection & DbRegistrations) == DbRegistrations)
+  {
+    if (orionldState.mongoc.registrationsP == NULL)
+      orionldState.mongoc.registrationsP = mongoc_client_get_collection(orionldState.mongoc.client, tenantP->mongoDbName, "registrations");
+  }
+
+  if ((dbCollection & DbContexts) == DbContexts)
+  {
+    if (orionldState.mongoc.contextsP == NULL)
+      orionldState.mongoc.contextsP = mongoc_client_get_collection(orionldState.mongoc.client, "orionld", "contexts");
+  }
+
+  sem_post(&mongocConnectionSem);
 }
diff --git a/src/lib/orionld/mongoc/mongocConnectionGet.h b/src/lib/orionld/mongoc/mongocConnectionGet.h
index 6a08fba1c1..13801e3f55 100644
--- a/src/lib/orionld/mongoc/mongocConnectionGet.h
+++ b/src/lib/orionld/mongoc/mongocConnectionGet.h
@@ -25,6 +25,22 @@
 *
 * Author: Ken Zangelin
 */
+#include "orionld/types/OrionldTenant.h"                         // OrionldTenant
+
+
+
+// -----------------------------------------------------------------------------
+//
+// DbCollection - move to orionld/types/DbCollection.h
+//
+typedef enum DbCollection
+{
+  DbNone           = 1,
+  DbEntities       = 2,
+  DbSubscriptions  = 4,
+  DbRegistrations  = 8,
+  DbContexts       = 16
+} DbCollection;
 
 
 
@@ -32,6 +48,6 @@
 //
 // mongocConnectionGet -
 //
-extern void mongocConnectionGet(void);
+extern void mongocConnectionGet(OrionldTenant* tenantP, DbCollection dbCollection);
 
 #endif  // SRC_LIB_ORIONLD_MONGOC_MONGOCCONNECTIONGET_H_
diff --git a/src/lib/orionld/mongoc/mongocContextCacheDelete.cpp b/src/lib/orionld/mongoc/mongocContextCacheDelete.cpp
index fd83abd317..4c70b89dc0 100644
--- a/src/lib/orionld/mongoc/mongocContextCacheDelete.cpp
+++ b/src/lib/orionld/mongoc/mongocContextCacheDelete.cpp
@@ -22,6 +22,7 @@
 *
 * Author: Ken Zangelin
 */
+#include <semaphore.h>                                           // sem_wait, sem_post
 #include <bson/bson.h>                                           // bson_t, ...
 #include <mongoc/mongoc.h>                                       // mongoc driver
 
@@ -46,10 +47,7 @@ void mongocContextCacheDelete(const char* id)
 {
   bson_t selector;
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.contextsP == NULL)
-    orionldState.mongoc.contextsP = mongoc_client_get_collection(orionldState.mongoc.client, "orionld", "contexts");
+  mongocConnectionGet(NULL, DbContexts);
 
   bson_init(&selector);
   bson_append_utf8(&selector, "_id", 3, id, -1);
diff --git a/src/lib/orionld/mongoc/mongocContextCacheGet.cpp b/src/lib/orionld/mongoc/mongocContextCacheGet.cpp
index 19ab15caf0..edbb1bc512 100644
--- a/src/lib/orionld/mongoc/mongocContextCacheGet.cpp
+++ b/src/lib/orionld/mongoc/mongocContextCacheGet.cpp
@@ -55,10 +55,7 @@ KjNode* mongocContextCacheGet(void)
   bson_t*           query        = bson_new();       // Empty - to find all the contexts in the DB
   KjNode*           contextArray = kjArray(orionldState.kjsonP, NULL);
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.contextsP == NULL)
-    orionldState.mongoc.contextsP = mongoc_client_get_collection(orionldState.mongoc.client, "orionld", "contexts");
+  mongocConnectionGet(NULL, DbContexts);
 
   sem_wait(&mongocContextsSem);
 
diff --git a/src/lib/orionld/mongoc/mongocContextCachePersist.cpp b/src/lib/orionld/mongoc/mongocContextCachePersist.cpp
index 64ff5f4d5d..d0098c4124 100644
--- a/src/lib/orionld/mongoc/mongocContextCachePersist.cpp
+++ b/src/lib/orionld/mongoc/mongocContextCachePersist.cpp
@@ -49,10 +49,7 @@ void mongocContextCachePersist(KjNode* contextObject)
 
   mongocKjTreeToBson(contextObject, &bson);
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.contextsP == NULL)
-    orionldState.mongoc.contextsP = mongoc_client_get_collection(orionldState.mongoc.client, "orionld", "contexts");
+  mongocConnectionGet(NULL, DbContexts);
 
   sem_wait(&mongocContextsSem);
 
diff --git a/src/lib/orionld/mongoc/mongocEntitiesDelete.cpp b/src/lib/orionld/mongoc/mongocEntitiesDelete.cpp
index fa97d5036f..6812c2218d 100644
--- a/src/lib/orionld/mongoc/mongocEntitiesDelete.cpp
+++ b/src/lib/orionld/mongoc/mongocEntitiesDelete.cpp
@@ -48,10 +48,7 @@ extern "C"
 //
 bool mongocEntitiesDelete(KjNode* entityIdArray)
 {
-  mongocConnectionGet();  // mongocConnectionGet(MONGO_ENTITIES) - do the mongoc_client_get_collection also
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   mongoc_bulk_operation_t* bulkP;
 
diff --git a/src/lib/orionld/mongoc/mongocEntitiesExist.cpp b/src/lib/orionld/mongoc/mongocEntitiesExist.cpp
index d4897ae52a..f8cb4a1d02 100644
--- a/src/lib/orionld/mongoc/mongocEntitiesExist.cpp
+++ b/src/lib/orionld/mongoc/mongocEntitiesExist.cpp
@@ -117,10 +117,7 @@ KjNode* mongocEntitiesExist(KjNode* entityIdArray, bool entityType)
   bson_append_document(&options, "projection", 10, &projection);
   bson_destroy(&projection);
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   mongoCursorP = mongoc_collection_find_with_opts(orionldState.mongoc.entitiesP, &mongoFilter, &options, readPrefs);
   bson_destroy(&options);
diff --git a/src/lib/orionld/mongoc/mongocEntitiesGet.cpp b/src/lib/orionld/mongoc/mongocEntitiesGet.cpp
index f9ed8293c8..737d0458d9 100644
--- a/src/lib/orionld/mongoc/mongocEntitiesGet.cpp
+++ b/src/lib/orionld/mongoc/mongocEntitiesGet.cpp
@@ -96,10 +96,7 @@ KjNode* mongocEntitiesGet(char** fieldV, int fields, bool entityIdPresent)
   bson_t mongoFilter;
   bson_init(&mongoFilter);
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   //
   // Run the query
diff --git a/src/lib/orionld/mongoc/mongocEntitiesQuery.cpp b/src/lib/orionld/mongoc/mongocEntitiesQuery.cpp
index 7d2d7c0b83..48a104ec4a 100644
--- a/src/lib/orionld/mongoc/mongocEntitiesQuery.cpp
+++ b/src/lib/orionld/mongoc/mongocEntitiesQuery.cpp
@@ -775,10 +775,7 @@ KjNode* mongocEntitiesQuery
   bson_append_document(&options, "projection", 10, &projection);
   bson_destroy(&projection);
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   // semTake(&mongoEntitiesSem);
 
diff --git a/src/lib/orionld/mongoc/mongocEntitiesQuery2.cpp b/src/lib/orionld/mongoc/mongocEntitiesQuery2.cpp
index fff07f9d54..2cd5ddba00 100644
--- a/src/lib/orionld/mongoc/mongocEntitiesQuery2.cpp
+++ b/src/lib/orionld/mongoc/mongocEntitiesQuery2.cpp
@@ -347,10 +347,7 @@ KjNode* mongocEntitiesQuery2
   bson_append_document(&options, "projection", 10, &projection);
   bson_destroy(&projection);
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   // count?
   if (orionldState.uriParams.count == true)
diff --git a/src/lib/orionld/mongoc/mongocEntitiesUpsert.cpp b/src/lib/orionld/mongoc/mongocEntitiesUpsert.cpp
index 82cea850a9..2dbd9d3ed1 100644
--- a/src/lib/orionld/mongoc/mongocEntitiesUpsert.cpp
+++ b/src/lib/orionld/mongoc/mongocEntitiesUpsert.cpp
@@ -48,13 +48,9 @@ extern "C"
 //
 bool mongocEntitiesUpsert(KjNode* createArrayP, KjNode* updateArrayP)
 {
-  mongocConnectionGet();  // mongocConnectionGet(MONGO_ENTITIES) - do the mongoc_client_get_collection also
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   mongoc_bulk_operation_t* bulkP;
-
   bulkP = mongoc_collection_create_bulk_operation_with_opts(orionldState.mongoc.entitiesP, NULL);
 
   if (createArrayP != NULL)
diff --git a/src/lib/orionld/mongoc/mongocEntityDelete.cpp b/src/lib/orionld/mongoc/mongocEntityDelete.cpp
index 7e6ab15883..c1f2c07974 100644
--- a/src/lib/orionld/mongoc/mongocEntityDelete.cpp
+++ b/src/lib/orionld/mongoc/mongocEntityDelete.cpp
@@ -44,10 +44,7 @@ extern "C"
 //
 bool mongocEntityDelete(const char* entityId, char** detailP)
 {
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "csubs");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   bson_t            selector;
   bson_error_t      error;
diff --git a/src/lib/orionld/mongoc/mongocEntityGet.cpp b/src/lib/orionld/mongoc/mongocEntityGet.cpp
index 505525fab5..4ef5660a30 100644
--- a/src/lib/orionld/mongoc/mongocEntityGet.cpp
+++ b/src/lib/orionld/mongoc/mongocEntityGet.cpp
@@ -91,10 +91,7 @@ KjNode* mongocEntityGet(const char* entityId, const char** projectionV, bool inc
   //
   // Get the connection
   //
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   //
   // Perform the query
diff --git a/src/lib/orionld/mongoc/mongocEntityInsert.cpp b/src/lib/orionld/mongoc/mongocEntityInsert.cpp
index 46096cb806..d1a1737165 100644
--- a/src/lib/orionld/mongoc/mongocEntityInsert.cpp
+++ b/src/lib/orionld/mongoc/mongocEntityInsert.cpp
@@ -51,10 +51,7 @@ bool mongocEntityInsert(KjNode* dbEntityP, const char* entityId)
   bson_t document;
   bson_t reply;
 
-  mongocConnectionGet();  // mongocConnectionGet(MONGO_ENTITIES) - do the mongoc_client_get_collection also
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   bson_init(&document);
   bson_init(&reply);
diff --git a/src/lib/orionld/mongoc/mongocEntityLookup.cpp b/src/lib/orionld/mongoc/mongocEntityLookup.cpp
index 1d3734af4c..a99cfa1e0c 100644
--- a/src/lib/orionld/mongoc/mongocEntityLookup.cpp
+++ b/src/lib/orionld/mongoc/mongocEntityLookup.cpp
@@ -78,10 +78,7 @@ KjNode* mongocEntityLookup(const char* entityId, const char* entityType, StringA
   if (entityType != NULL)
     bson_append_utf8(&mongoFilter, "_id.type", 8, entityType, -1);
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   //
   // Projection (will be added to if attrList != NULL)
diff --git a/src/lib/orionld/mongoc/mongocEntityReplace.cpp b/src/lib/orionld/mongoc/mongocEntityReplace.cpp
index 7c34edbad4..f00e9d22c6 100644
--- a/src/lib/orionld/mongoc/mongocEntityReplace.cpp
+++ b/src/lib/orionld/mongoc/mongocEntityReplace.cpp
@@ -51,10 +51,7 @@ bool mongocEntityReplace(KjNode* dbEntityP, const char* entityId)
   bson_t replacement;
   bson_t reply;
 
-  mongocConnectionGet();  // mongocConnectionGet(MONGO_ENTITIES) - do the mongoc_client_get_collection also
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   bson_init(&selector);
   bson_init(&replacement);
diff --git a/src/lib/orionld/mongoc/mongocEntityRetrieve.cpp b/src/lib/orionld/mongoc/mongocEntityRetrieve.cpp
index c093ac3d35..53d1858b70 100644
--- a/src/lib/orionld/mongoc/mongocEntityRetrieve.cpp
+++ b/src/lib/orionld/mongoc/mongocEntityRetrieve.cpp
@@ -412,10 +412,7 @@ KjNode* mongocEntityRetrieve
   bson_init(&mongoFilter);
   bson_append_utf8(&mongoFilter, "_id.id", 6, entityId, -1);
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   //
   // Run the query
diff --git a/src/lib/orionld/mongoc/mongocEntityTypeGet.cpp b/src/lib/orionld/mongoc/mongocEntityTypeGet.cpp
index 216fff4e7f..ca4b5403de 100644
--- a/src/lib/orionld/mongoc/mongocEntityTypeGet.cpp
+++ b/src/lib/orionld/mongoc/mongocEntityTypeGet.cpp
@@ -79,10 +79,7 @@ KjNode* mongocEntityTypeGet(OrionldProblemDetails* pdP, const char* typeLongName
 
   mongoc_read_prefs_t* readPrefs = mongoc_read_prefs_new(MONGOC_READ_NEAREST);
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   mongoc_cursor_t*      mongoCursorP;
   mongoCursorP = mongoc_collection_find_with_opts(orionldState.mongoc.entitiesP, &mongoFilter, &options, readPrefs);
diff --git a/src/lib/orionld/mongoc/mongocEntityTypesFromRegistrationsGet.cpp b/src/lib/orionld/mongoc/mongocEntityTypesFromRegistrationsGet.cpp
index 724fe1c475..0f2b2dd3ff 100644
--- a/src/lib/orionld/mongoc/mongocEntityTypesFromRegistrationsGet.cpp
+++ b/src/lib/orionld/mongoc/mongocEntityTypesFromRegistrationsGet.cpp
@@ -76,10 +76,7 @@ KjNode* mongocEntityTypesFromRegistrationsGet(bool details)
   bson_destroy(&projection);
 
   // Connection
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.registrationsP == NULL)
-    orionldState.mongoc.registrationsP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "registrations");
+  mongocConnectionGet(orionldState.tenantP, DbRegistrations);
 
   //
   // Run the query
diff --git a/src/lib/orionld/mongoc/mongocEntityUpdate.cpp b/src/lib/orionld/mongoc/mongocEntityUpdate.cpp
index 5a5696af53..e4ca518d25 100644
--- a/src/lib/orionld/mongoc/mongocEntityUpdate.cpp
+++ b/src/lib/orionld/mongoc/mongocEntityUpdate.cpp
@@ -270,10 +270,7 @@ static bool patchApply
 //
 bool mongocEntityUpdate(const char* entityId, KjNode* patchTree)
 {
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.entitiesP == NULL)
-    orionldState.mongoc.entitiesP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "entities");
+  mongocConnectionGet(orionldState.tenantP, DbEntities);
 
   bson_t selector;
   bson_init(&selector);
diff --git a/src/lib/orionld/mongoc/mongocGeoIndexCreate.cpp b/src/lib/orionld/mongoc/mongocGeoIndexCreate.cpp
index a4cc6346f2..aeb37d9b45 100644
--- a/src/lib/orionld/mongoc/mongocGeoIndexCreate.cpp
+++ b/src/lib/orionld/mongoc/mongocGeoIndexCreate.cpp
@@ -59,7 +59,7 @@ bool mongocGeoIndexCreate(OrionldTenant* tenantP, const char* attrLongName)
   bson_init(&key);
   BSON_APPEND_UTF8(&key, indexPath, "2dsphere");
 
-  mongocConnectionGet();
+  mongocConnectionGet(NULL, DbNone);
 
   mongoc_database_t*  dbP                = mongoc_client_get_database(orionldState.mongoc.client, tenantP->mongoDbName);
   char*               indexName          = mongoc_collection_keys_to_index_string(&key);
diff --git a/src/lib/orionld/mongoc/mongocGeoIndexInit.cpp b/src/lib/orionld/mongoc/mongocGeoIndexInit.cpp
index c6151b7837..eb534323f1 100644
--- a/src/lib/orionld/mongoc/mongocGeoIndexInit.cpp
+++ b/src/lib/orionld/mongoc/mongocGeoIndexInit.cpp
@@ -55,7 +55,7 @@ bool mongocGeoIndexInit(void)
   //
   // DB Connection
   //
-  mongocConnectionGet();
+  mongocConnectionGet(NULL, DbNone);
 
   //
   // Loop over all tenants
@@ -72,6 +72,8 @@ bool mongocGeoIndexInit(void)
     // Get handle to collection
     //
     mCollectionP = mongoc_client_get_collection(orionldState.mongoc.client, tenantP->mongoDbName, "entities");
+    if (mCollectionP == NULL)
+      LM_X(1, ("mongoc_client_get_collection failed for 'entities' collection on tenant '%s'", tenantP->mongoDbName));
 
     // Aggregation pipeline
 
diff --git a/src/lib/orionld/mongoc/mongocIdIndexCreate.cpp b/src/lib/orionld/mongoc/mongocIdIndexCreate.cpp
index 08975babe5..561f520dfd 100644
--- a/src/lib/orionld/mongoc/mongocIdIndexCreate.cpp
+++ b/src/lib/orionld/mongoc/mongocIdIndexCreate.cpp
@@ -52,7 +52,7 @@ bool mongocIdIndexCreate(OrionldTenant* tenantP)
   bson_init(&key);
   BSON_APPEND_INT32(&key, "_id.id", 1);
 
-  mongocConnectionGet();
+  mongocConnectionGet(NULL, DbNone);
 
   mongoc_database_t*  dbP                = mongoc_client_get_database(orionldState.mongoc.client, tenantP->mongoDbName);
   char*               indexName          = mongoc_collection_keys_to_index_string(&key);
diff --git a/src/lib/orionld/mongoc/mongocInit.cpp b/src/lib/orionld/mongoc/mongocInit.cpp
index 0e027b627a..37a5b95b42 100644
--- a/src/lib/orionld/mongoc/mongocInit.cpp
+++ b/src/lib/orionld/mongoc/mongocInit.cpp
@@ -318,6 +318,11 @@ void mongocInit
   //
   sem_init(&mongocContextsSem, 0, 1);  // 0: shared between threads of the same process. 1: free to be taken
 
+  //
+  // Semaphore for getting a connection/collection for mongo
+  //
+  sem_init(&mongocConnectionSem, 0, 1);  // 0: shared between threads of the same process. 1: free to be taken
+
   if (mongocTenantsGet() == false)
     LM_X(1, ("Unable to extract tenants from the database - fatal error"));
 
diff --git a/src/lib/orionld/mongoc/mongocRegistrationDelete.cpp b/src/lib/orionld/mongoc/mongocRegistrationDelete.cpp
index c851836c65..3c68527cff 100644
--- a/src/lib/orionld/mongoc/mongocRegistrationDelete.cpp
+++ b/src/lib/orionld/mongoc/mongocRegistrationDelete.cpp
@@ -39,14 +39,11 @@
 //
 bool mongocRegistrationDelete(const char* registrationId)
 {
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.registrationsP == NULL)
-    orionldState.mongoc.registrationsP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "registrations");
-
   bson_t            selector;
   bson_error_t      error;
 
+  mongocConnectionGet(orionldState.tenantP, DbRegistrations);
+
   //
   // Create the filter for the query
   //
diff --git a/src/lib/orionld/mongoc/mongocRegistrationExists.cpp b/src/lib/orionld/mongoc/mongocRegistrationExists.cpp
index 3e5055b4ff..736215203a 100644
--- a/src/lib/orionld/mongoc/mongocRegistrationExists.cpp
+++ b/src/lib/orionld/mongoc/mongocRegistrationExists.cpp
@@ -52,10 +52,7 @@ bool mongocRegistrationExists(const char* registrationId, bool* foundP)
   bson_init(&mongoFilter);
   bson_append_utf8(&mongoFilter, "_id", 3, registrationId, -1);
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.registrationsP == NULL)
-    orionldState.mongoc.registrationsP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "registrations");
+  mongocConnectionGet(orionldState.tenantP, DbRegistrations);
 
   //
   // Run the query
diff --git a/src/lib/orionld/mongoc/mongocRegistrationGet.cpp b/src/lib/orionld/mongoc/mongocRegistrationGet.cpp
index db59e1015d..6623bb839b 100644
--- a/src/lib/orionld/mongoc/mongocRegistrationGet.cpp
+++ b/src/lib/orionld/mongoc/mongocRegistrationGet.cpp
@@ -58,10 +58,7 @@ KjNode* mongocRegistrationGet(const char* registrationId)
   bson_init(&mongoFilter);
   bson_append_utf8(&mongoFilter, "_id", 3, registrationId, -1);
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.registrationsP == NULL)
-    orionldState.mongoc.registrationsP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "registrations");
+  mongocConnectionGet(orionldState.tenantP, DbRegistrations);
 
   //
   // Run the query
diff --git a/src/lib/orionld/mongoc/mongocRegistrationInsert.cpp b/src/lib/orionld/mongoc/mongocRegistrationInsert.cpp
index 56273dec0c..0246706168 100644
--- a/src/lib/orionld/mongoc/mongocRegistrationInsert.cpp
+++ b/src/lib/orionld/mongoc/mongocRegistrationInsert.cpp
@@ -51,10 +51,7 @@ bool mongocRegistrationInsert(KjNode* dbRegistrationP, const char* registrationI
   bson_t document;
   bson_t reply;
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.registrationsP == NULL)
-    orionldState.mongoc.registrationsP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "registrations");
+  mongocConnectionGet(orionldState.tenantP, DbRegistrations);
 
   bson_init(&document);
   bson_init(&reply);
diff --git a/src/lib/orionld/mongoc/mongocRegistrationLookup.cpp b/src/lib/orionld/mongoc/mongocRegistrationLookup.cpp
index 4b700d9a65..7db6efe322 100644
--- a/src/lib/orionld/mongoc/mongocRegistrationLookup.cpp
+++ b/src/lib/orionld/mongoc/mongocRegistrationLookup.cpp
@@ -61,10 +61,7 @@ KjNode* mongocRegistrationLookup(const char* entityId, const char* attribute, in
     // { $or: [ { "contextRegistration.attrs": { $size: 0 }}, { "contextRegistration.attrs.name": 'attribute' } ]  }  ???
   }
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.registrationsP == NULL)
-    orionldState.mongoc.registrationsP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "registrations");
+  mongocConnectionGet(orionldState.tenantP, DbRegistrations);
 
   //
   // Run the query
diff --git a/src/lib/orionld/mongoc/mongocRegistrationReplace.cpp b/src/lib/orionld/mongoc/mongocRegistrationReplace.cpp
index ec5f8700ef..5ea25ef773 100644
--- a/src/lib/orionld/mongoc/mongocRegistrationReplace.cpp
+++ b/src/lib/orionld/mongoc/mongocRegistrationReplace.cpp
@@ -49,10 +49,7 @@ bool mongocRegistrationReplace(const char* registrationId, KjNode* dbRegistratio
   bson_t replacement;
   bson_t reply;
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.registrationsP == NULL)
-    orionldState.mongoc.registrationsP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "registrations");
+  mongocConnectionGet(orionldState.tenantP, DbRegistrations);
 
   bson_init(&selector);
   bson_init(&replacement);
diff --git a/src/lib/orionld/mongoc/mongocRegistrationsGet.cpp b/src/lib/orionld/mongoc/mongocRegistrationsGet.cpp
index 6dc6222668..9ab69b20ae 100644
--- a/src/lib/orionld/mongoc/mongocRegistrationsGet.cpp
+++ b/src/lib/orionld/mongoc/mongocRegistrationsGet.cpp
@@ -79,11 +79,7 @@ KjNode* mongocRegistrationsGet(int64_t* countP)
   //
   bson_init(&mongoFilter);
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.registrationsP == NULL)
-    orionldState.mongoc.registrationsP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "registrations");
-
+  mongocConnectionGet(orionldState.tenantP, DbRegistrations);
 
   // count?
   if (orionldState.uriParams.count == true)
diff --git a/src/lib/orionld/mongoc/mongocRegistrationsIter.cpp b/src/lib/orionld/mongoc/mongocRegistrationsIter.cpp
index c8f7f8a8cd..57a0cb3601 100644
--- a/src/lib/orionld/mongoc/mongocRegistrationsIter.cpp
+++ b/src/lib/orionld/mongoc/mongocRegistrationsIter.cpp
@@ -62,13 +62,16 @@ int mongocRegistrationsIter(RegCache* rcP, RegCacheIterFunc callback)
   //
   bson_init(&mongoFilter);
 
-  mongocConnectionGet();
+  mongocConnectionGet(NULL, DbNone);
 
   //
   // Can't use the "orionldState.mongoc.registrationsP" here, as we'll deal with not one single tenant but all of them
   //
   mongoc_collection_t* regsCollectionP = mongoc_client_get_collection(orionldState.mongoc.client, rcP->tenantP->mongoDbName, "registrations");
 
+  if (regsCollectionP == NULL)
+    LM_X(1, ("mongoc_client_get_collection failed for 'registrations' collection on tenant '%s'", rcP->tenantP->mongoDbName));
+
   //
   // Run the query
   //
diff --git a/src/lib/orionld/mongoc/mongocServerVersionGet.cpp b/src/lib/orionld/mongoc/mongocServerVersionGet.cpp
index d72a99bf47..e8c7047eea 100644
--- a/src/lib/orionld/mongoc/mongocServerVersionGet.cpp
+++ b/src/lib/orionld/mongoc/mongocServerVersionGet.cpp
@@ -52,7 +52,7 @@ bool mongocServerVersionGet(char* serverVersionBuf)
   bson_init(&command);
   bson_init(&reply);
 
-  mongocConnectionGet();
+  mongocConnectionGet(NULL, DbNone);
 
   bson_append_int32(&command, "buildinfo", 9, 1);
 
diff --git a/src/lib/orionld/mongoc/mongocSubCachePopulateByTenant.cpp b/src/lib/orionld/mongoc/mongocSubCachePopulateByTenant.cpp
index 12f16f5fe7..18f3f3ce5e 100644
--- a/src/lib/orionld/mongoc/mongocSubCachePopulateByTenant.cpp
+++ b/src/lib/orionld/mongoc/mongocSubCachePopulateByTenant.cpp
@@ -78,6 +78,9 @@ bool mongocSubCachePopulateByTenant(OrionldTenant* tenantP, bool refresh)
   mongoc_client_t*     connectionP    = mongoc_client_pool_pop(mongocPool);
   mongoc_collection_t* subscriptionsP = mongoc_client_get_collection(connectionP, tenantP->mongoDbName, "csubs");
 
+  if (subscriptionsP == NULL)
+    LM_X(1, ("mongoc_client_get_collection failed for 'csubs' collection on tenant '%s'", tenantP->mongoDbName));
+
   //
   // Run the query
   //
diff --git a/src/lib/orionld/mongoc/mongocSubCountersUpdate.cpp b/src/lib/orionld/mongoc/mongocSubCountersUpdate.cpp
index a723d75cbe..3154d66640 100644
--- a/src/lib/orionld/mongoc/mongocSubCountersUpdate.cpp
+++ b/src/lib/orionld/mongoc/mongocSubCountersUpdate.cpp
@@ -83,6 +83,9 @@ void mongocSubCountersUpdate
   bson_t                selector;
   bson_t                inc;
 
+  if (subscriptionsP == NULL)
+    LM_X(1, ("mongoc_client_get_collection failed for 'csubs' collection on tenant '%s'", tenantP->mongoDbName));
+
   bson_init(&reply);
   bson_init(&selector);
   bson_init(&inc);
diff --git a/src/lib/orionld/mongoc/mongocSubscriptionDelete.cpp b/src/lib/orionld/mongoc/mongocSubscriptionDelete.cpp
index 54b6183a3e..1697260a9e 100644
--- a/src/lib/orionld/mongoc/mongocSubscriptionDelete.cpp
+++ b/src/lib/orionld/mongoc/mongocSubscriptionDelete.cpp
@@ -39,10 +39,7 @@
 //
 bool mongocSubscriptionDelete(const char* subscriptionId)
 {
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.subscriptionsP == NULL)
-    orionldState.mongoc.subscriptionsP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "csubs");
+  mongocConnectionGet(orionldState.tenantP, DbSubscriptions);
 
   bson_t            selector;
   bson_error_t      error;
diff --git a/src/lib/orionld/mongoc/mongocSubscriptionExists.cpp b/src/lib/orionld/mongoc/mongocSubscriptionExists.cpp
index 389933f78a..2eb5e42789 100644
--- a/src/lib/orionld/mongoc/mongocSubscriptionExists.cpp
+++ b/src/lib/orionld/mongoc/mongocSubscriptionExists.cpp
@@ -51,10 +51,7 @@ bool mongocSubscriptionExists(const char* subscriptionId, char** detailP)
   bson_init(&mongoFilter);
   bson_append_utf8(&mongoFilter, "_id", 3, subscriptionId, -1);
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.subscriptionsP == NULL)
-    orionldState.mongoc.subscriptionsP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "csubs");
+  mongocConnectionGet(orionldState.tenantP, DbSubscriptions);
 
   //
   // Run the query
diff --git a/src/lib/orionld/mongoc/mongocSubscriptionInsert.cpp b/src/lib/orionld/mongoc/mongocSubscriptionInsert.cpp
index 83915aa2f4..13cb72316b 100644
--- a/src/lib/orionld/mongoc/mongocSubscriptionInsert.cpp
+++ b/src/lib/orionld/mongoc/mongocSubscriptionInsert.cpp
@@ -52,10 +52,7 @@ bool mongocSubscriptionInsert(KjNode* dbSubscriptionP, const char* subscriptionI
   bson_t document;
   bson_t reply;
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.subscriptionsP == NULL)
-    orionldState.mongoc.subscriptionsP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "csubs");
+  mongocConnectionGet(orionldState.tenantP, DbSubscriptions);
 
   bson_init(&document);
   bson_init(&reply);
diff --git a/src/lib/orionld/mongoc/mongocSubscriptionLookup.cpp b/src/lib/orionld/mongoc/mongocSubscriptionLookup.cpp
index ffccc7f427..7242fd4348 100644
--- a/src/lib/orionld/mongoc/mongocSubscriptionLookup.cpp
+++ b/src/lib/orionld/mongoc/mongocSubscriptionLookup.cpp
@@ -59,10 +59,7 @@ KjNode* mongocSubscriptionLookup(const char* subscriptionId)
   bson_init(&mongoFilter);
   bson_append_utf8(&mongoFilter, "_id", 3, subscriptionId, -1);
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.subscriptionsP == NULL)
-    orionldState.mongoc.subscriptionsP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "csubs");
+  mongocConnectionGet(orionldState.tenantP, DbSubscriptions);
 
   //
   // Run the query
diff --git a/src/lib/orionld/mongoc/mongocSubscriptionReplace.cpp b/src/lib/orionld/mongoc/mongocSubscriptionReplace.cpp
index 64e9e06e64..60b5a965ca 100644
--- a/src/lib/orionld/mongoc/mongocSubscriptionReplace.cpp
+++ b/src/lib/orionld/mongoc/mongocSubscriptionReplace.cpp
@@ -52,10 +52,7 @@ bool mongocSubscriptionReplace(const char* subscriptionId, KjNode* dbSubscriptio
   bson_t replacement;
   bson_t reply;
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.subscriptionsP == NULL)
-    orionldState.mongoc.subscriptionsP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "csubs");
+  mongocConnectionGet(orionldState.tenantP, DbSubscriptions);
 
   bson_init(&selector);
   bson_init(&replacement);
diff --git a/src/lib/orionld/mongoc/mongocSubscriptionsGet.cpp b/src/lib/orionld/mongoc/mongocSubscriptionsGet.cpp
index 4fa59224b8..0e118354db 100644
--- a/src/lib/orionld/mongoc/mongocSubscriptionsGet.cpp
+++ b/src/lib/orionld/mongoc/mongocSubscriptionsGet.cpp
@@ -79,10 +79,7 @@ KjNode* mongocSubscriptionsGet(int64_t* countP)
   //
   bson_init(&mongoFilter);
 
-  mongocConnectionGet();
-
-  if (orionldState.mongoc.subscriptionsP == NULL)
-    orionldState.mongoc.subscriptionsP = mongoc_client_get_collection(orionldState.mongoc.client, orionldState.tenantP->mongoDbName, "csubs");
+  mongocConnectionGet(orionldState.tenantP, DbSubscriptions);
 
 
   // count?
diff --git a/src/lib/orionld/mongoc/mongocTenantExists.cpp b/src/lib/orionld/mongoc/mongocTenantExists.cpp
index 08cb1a345f..5e42cd3694 100644
--- a/src/lib/orionld/mongoc/mongocTenantExists.cpp
+++ b/src/lib/orionld/mongoc/mongocTenantExists.cpp
@@ -66,13 +66,13 @@ bool mongocTenantExists(const char* tenantName)
   bson_init(&command);
   bson_init(&reply);
 
-  mongocConnectionGet();
+  mongocConnectionGet(NULL, DbNone);
 
   bson_append_int32(&command, "listDatabases", 13, 1);
 
   bool b = mongoc_client_read_command_with_opts(orionldState.mongoc.client, "admin", &command, NULL, NULL, &reply, &mcError);
   if (b == false)
-    LM_RE(false, ("Database Error ()", mcError.message));
+    LM_RE(false, ("Database Error (%s)", mcError.message));
 
   char*   title;
   char*   detail;
diff --git a/src/lib/orionld/mongoc/mongocTenantsGet.cpp b/src/lib/orionld/mongoc/mongocTenantsGet.cpp
index 661bf291a8..b33ca20b31 100644
--- a/src/lib/orionld/mongoc/mongocTenantsGet.cpp
+++ b/src/lib/orionld/mongoc/mongocTenantsGet.cpp
@@ -54,7 +54,7 @@ bool mongocTenantsGet(void)
   bson_init(&command);
   bson_init(&reply);
 
-  mongocConnectionGet();
+  mongocConnectionGet(NULL, DbNone);
 
   bson_append_int32(&command, "listDatabases", 13, 1);
 
diff --git a/src/lib/orionld/service/orionldServiceInit.cpp b/src/lib/orionld/service/orionldServiceInit.cpp
index afa0292778..a5d05ad803 100644
--- a/src/lib/orionld/service/orionldServiceInit.cpp
+++ b/src/lib/orionld/service/orionldServiceInit.cpp
@@ -466,14 +466,16 @@ static void restServicePrepare(OrionLdRestService* serviceP, OrionLdRestServiceS
     serviceP->uriParams |= ORIONLD_URIPARAM_DETAILS;
     serviceP->uriParams |= ORIONLD_URIPARAM_LOCATION;
     serviceP->uriParams |= ORIONLD_URIPARAM_URL;
+    serviceP->uriParams |= ORIONLD_URIPARAM_KIND;
 
     serviceP->options   |= ORIONLD_SERVICE_OPTION_DONT_ADD_CONTEXT_TO_RESPONSE_PAYLOAD;
   }
   else if (serviceP->serviceRoutine == orionldGetContext)
   {
     serviceP->options  = 0;  // Tenant is Ignored
-
     serviceP->options   |= ORIONLD_SERVICE_OPTION_DONT_ADD_CONTEXT_TO_RESPONSE_PAYLOAD;
+
+    serviceP->uriParams |= ORIONLD_URIPARAM_DETAILS;
   }
   else if (serviceP->serviceRoutine == orionldPostContexts)
   {
diff --git a/src/lib/orionld/serviceRoutines/orionldDeleteContext.cpp b/src/lib/orionld/serviceRoutines/orionldDeleteContext.cpp
index 9c674ba4e9..131d503deb 100644
--- a/src/lib/orionld/serviceRoutines/orionldDeleteContext.cpp
+++ b/src/lib/orionld/serviceRoutines/orionldDeleteContext.cpp
@@ -59,7 +59,10 @@ bool orionldDeleteContext(void)
 
   if (orionldState.uriParams.reload == true)
   {
-    if (oldContextP->origin != OrionldContextDownloaded)
+    //
+    // Only contexts of type Cached (indirect download) can be reloaded
+    //
+    if (oldContextP->kind != OrionldContextCached)
     {
       orionldError(OrionldBadRequestData, "Wrong type of context", "only cached contexts are subject for reload", 400);
       return false;
@@ -93,6 +96,7 @@ bool orionldDeleteContext(void)
     if (contextP == NULL)
     {
       orionldContextCacheInsert(oldContextP);
+      // orionldError(OrionldLdContextNotAvailable, "Unable to reload the @context", oldContextP->url, 504);
       return false;
     }
 
diff --git a/src/lib/orionld/serviceRoutines/orionldGetContext.cpp b/src/lib/orionld/serviceRoutines/orionldGetContext.cpp
index 97f16ae427..268c90e4de 100644
--- a/src/lib/orionld/serviceRoutines/orionldGetContext.cpp
+++ b/src/lib/orionld/serviceRoutines/orionldGetContext.cpp
@@ -38,6 +38,7 @@ extern "C"
 
 
 
+extern KjNode* orionldContextWithDetails(OrionldContext* contextP);
 // ----------------------------------------------------------------------------
 //
 // orionldGetContext -
@@ -54,16 +55,31 @@ bool orionldGetContext(void)
     return false;
   }
 
-  orionldState.responseTree = kjObject(orionldState.kjsonP, NULL);
-  if (orionldState.responseTree == NULL)
+  //
+  // Contexts of type Cached (indirect download) are not served.
+  // The broker is not a context server.
+  // See 5.13.4.4 of the NGSI-LD API Specification
+  //
+  if ((contextP->kind == OrionldContextCached) && (orionldState.uriParams.details == false))
   {
-    orionldError(OrionldBadRequestData, "kjObject failed", "out of memory?", 500);
+    orionldError(OrionldOperationNotSupported, "Not serving cached JSON-LD @context", orionldState.wildcard[0], 422);
     return false;
   }
 
-  contextP->tree->name = (char*) "@context";
+  if (orionldState.uriParams.details == true)
+    orionldState.responseTree = orionldContextWithDetails(contextP);
+  else
+  {
+    orionldState.responseTree = kjObject(orionldState.kjsonP, NULL);
+    if (orionldState.responseTree == NULL)
+    {
+      orionldError(OrionldBadRequestData, "kjObject failed", "out of memory?", 500);
+      return false;
+    }
 
-  kjChildAdd(orionldState.responseTree, contextP->tree);
+    contextP->tree->name = (char*) "@context";
+    kjChildAdd(orionldState.responseTree, contextP->tree);
+  }
 
   return true;
 }
diff --git a/src/lib/orionld/serviceRoutines/orionldGetContexts.cpp b/src/lib/orionld/serviceRoutines/orionldGetContexts.cpp
index c141dd1d5e..cff5c8df3f 100644
--- a/src/lib/orionld/serviceRoutines/orionldGetContexts.cpp
+++ b/src/lib/orionld/serviceRoutines/orionldGetContexts.cpp
@@ -83,7 +83,7 @@ bool orionldGetContexts(void)
 
   orionldState.noLinkHeader = true;  // We don't want the Link header for context requests
 
-  orionldState.responseTree = orionldContextCacheGet(contextTree, orionldState.uriParams.details);
+  orionldState.responseTree = orionldContextCacheGet(contextTree, orionldState.uriParams.details, orionldState.uriParams.kind);
 
   return true;
 }
diff --git a/src/lib/orionld/serviceRoutines/orionldGetEntitiesPage.cpp b/src/lib/orionld/serviceRoutines/orionldGetEntitiesPage.cpp
index 5675eaaabf..cb249be4dc 100644
--- a/src/lib/orionld/serviceRoutines/orionldGetEntitiesPage.cpp
+++ b/src/lib/orionld/serviceRoutines/orionldGetEntitiesPage.cpp
@@ -37,6 +37,8 @@ extern "C"
 #include "orionld/common/orionldState.h"                            // orionldState, entityMaps
 #include "orionld/common/orionldError.h"                            // orionldError
 #include "orionld/kjTree/kjChildCount.h"                            // kjChildCount
+#include "orionld/apiModel/ntocEntity.h"                            // ntocEntity
+#include "orionld/apiModel/ntosEntity.h"                            // ntosEntity
 #include "orionld/distOp/distOpLookupByRegId.h"                     // distOpLookupByRegId
 #include "orionld/distOp/distOpListDebug.h"                         // distOpListDebug
 #include "orionld/distOp/distOpsSend.h"                             // distOpsSend2
@@ -66,7 +68,6 @@ static void cleanupSysAttrs(void)
     {
       nextAttrP = attrP->next;
 
-      LM_T(LmtSR, ("attrP->name: '%s'", attrP->name));
       if      (strcmp(attrP->name, "createdAt")  == 0)  kjChildRemove(entityP, attrP);
       else if (strcmp(attrP->name, "modifiedAt") == 0)  kjChildRemove(entityP, attrP);
       else if (attrP->type == KjObject)
@@ -129,6 +130,34 @@ static int queryResponse(DistOp* distOpP, void* callbackParam)
 
 
 
+
+// -----------------------------------------------------------------------------
+//
+// formatFix -
+//
+static void formatFix(KjNode* entityArray, int skip)
+{
+  int ix = -1;
+  for (KjNode* entityP = entityArray->value.firstChildP; entityP != NULL; entityP = entityP->next)
+  {
+    ++ix;
+    if (ix < skip)  // Entities from the local DB have already been transformed to the desired format
+    {
+      LM_T(LmtFormat, ("Skipping child %d as it comes from local DB", ix));
+      continue;
+    }
+
+    LM_T(LmtFormat, ("Fixing format for child %d as it comes from remote", ix));
+
+    if (orionldState.out.format == RF_CONCISE)
+      ntocEntity(entityP, orionldState.uriParams.lang, orionldState.uriParamOptions.sysAttrs);
+    else if (orionldState.out.format == RF_SIMPLIFIED)
+      ntosEntity(entityP, orionldState.uriParams.lang);
+  }
+}
+
+
+
 // ----------------------------------------------------------------------------
 //
 // orionldGetEntitiesPage -
@@ -329,11 +358,18 @@ bool orionldGetEntitiesPage(void)
 
   if (distOpListItem != NULL)
   {
+    int localKids = kjChildCount(entityArray);
+
+    LM_T(LmtFormat, ("Number of children from local: %d (no format fix for those)", localKids));
+
     distOpItemListDebug(distOpListItem, "To Forward for GET /entities");
     distOpsSendAndReceive(distOpListItem, queryResponse, entityArray);
+
+    formatFix(entityArray, localKids);
   }
 
-  orionldState.responseTree = entityArray;
+  orionldState.responseTree   = entityArray;
+  orionldState.httpStatusCode = 200;
 
   //
   // Time to cleanup ...
diff --git a/src/lib/orionld/serviceRoutines/orionldPostContexts.cpp b/src/lib/orionld/serviceRoutines/orionldPostContexts.cpp
index 2ef062e1d5..b58f4381d6 100644
--- a/src/lib/orionld/serviceRoutines/orionldPostContexts.cpp
+++ b/src/lib/orionld/serviceRoutines/orionldPostContexts.cpp
@@ -69,7 +69,13 @@ bool orionldPostContexts(void)
 
   url = orionldContextUrlGenerate(&id);
 
-  OrionldContext* contextP = orionldContextFromTree(url, OrionldContextUserCreated, id, orionldState.requestTree);
+  if (orionldState.payloadContextNode == NULL)
+  {
+    orionldError(OrionldInvalidRequest, "Invalid @context", "@context field missing", 400);
+    return false;
+  }
+
+  OrionldContext* contextP = orionldContextFromTree(url, OrionldContextUserCreated, id, orionldState.payloadContextNode);
   if (contextP == NULL)
   {
     LM_W(("Unable to create context (%s: %s)", orionldState.pd.title, orionldState.pd.detail));
@@ -78,6 +84,7 @@ bool orionldPostContexts(void)
 
   contextP->createdAt = orionldState.requestTime;
   contextP->usedAt    = orionldState.requestTime;
+  contextP->kind      = OrionldContextHosted;
 
   httpHeaderLocationAdd(contextP->url, NULL, NULL);
 
diff --git a/src/lib/orionld/types/CMakeLists.txt b/src/lib/orionld/types/CMakeLists.txt
index b7bf29988f..4b7a4f9e53 100644
--- a/src/lib/orionld/types/CMakeLists.txt
+++ b/src/lib/orionld/types/CMakeLists.txt
@@ -37,6 +37,7 @@ SET (SOURCES
     DistOpType.cpp
     TroeMode.cpp
     Verb.cpp
+    OrionldContext.cpp
 )
 
 # Include directories
diff --git a/src/lib/orionld/types/OrionLdRestService.h b/src/lib/orionld/types/OrionLdRestService.h
index e63887cb27..53ee8f0613 100644
--- a/src/lib/orionld/types/OrionLdRestService.h
+++ b/src/lib/orionld/types/OrionLdRestService.h
@@ -156,6 +156,7 @@ typedef struct OrionLdRestServiceSimplifiedVector
 #define ORIONLD_URIPARAM_ENTITYMAP            (UINT64_C(1) << 39)
 #define ORIONLD_URIPARAM_FORMAT               (UINT64_C(1) << 40)
 #define ORIONLD_URIPARAM_EXPAND_VALUES        (UINT64_C(1) << 41)
+#define ORIONLD_URIPARAM_KIND                 (UINT64_C(1) << 42)
 
 
 
diff --git a/src/lib/orionld/types/OrionldContext.cpp b/src/lib/orionld/types/OrionldContext.cpp
new file mode 100644
index 0000000000..191ad74cf5
--- /dev/null
+++ b/src/lib/orionld/types/OrionldContext.cpp
@@ -0,0 +1,104 @@
+/*
+*
+* Copyright 2024 FIWARE Foundation e.V.
+*
+* This file is part of Orion-LD Context Broker.
+*
+* Orion-LD Context Broker is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Affero General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* Orion-LD Context Broker is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
+* General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with Orion-LD Context Broker. If not, see http://www.gnu.org/licenses/.
+*
+* For those usages not covered by this license please contact with
+* orionld at fiware dot org
+*
+* Author: Ken Zangelin
+*/
+#include <string.h>                                              // strcmp
+
+#include "orionld/types/OrionldContext.h"                        // OrionldContext
+
+
+
+// -----------------------------------------------------------------------------
+//
+// orionldOriginFromString - FIXME: move to its own module
+//
+OrionldContextOrigin orionldOriginFromString(const char* s)
+{
+  if      (strcmp(s, "UnknownOrigin")    == 0) return OrionldContextUnknownOrigin;
+  else if (strcmp(s, "Inline")           == 0) return OrionldContextFromInline;
+  else if (strcmp(s, "Downloaded")       == 0) return OrionldContextDownloaded;
+  else if (strcmp(s, "FileCached")       == 0) return OrionldContextFileCached;
+  else if (strcmp(s, "ForNotifications") == 0) return OrionldContextForNotifications;
+  else if (strcmp(s, "ForForwarding")    == 0) return OrionldContextForForwarding;
+  else if (strcmp(s, "UserCreated")      == 0) return OrionldContextUserCreated;
+
+  return OrionldContextUnknownOrigin;
+}
+
+
+
+// -----------------------------------------------------------------------------
+//
+// orionldOriginToString -
+//
+const char* orionldOriginToString(OrionldContextOrigin origin)
+{
+  switch (origin)
+  {
+  case OrionldContextUnknownOrigin:       return "UnknownOrigin";
+  case OrionldContextFromInline:          return "FromInline";
+  case OrionldContextDownloaded:          return "Downloaded";
+  case OrionldContextFileCached:          return "FileCached";
+  case OrionldContextForNotifications:    return "ForNotifications";
+  case OrionldContextForForwarding:       return "ForForwarding";
+  case OrionldContextUserCreated:         return "UserCreated";
+  case OrionldContextBuiltinCoreContext:  return "BuiltinCoreContext";
+  }
+
+  return "InvalidOrigin";
+}
+
+
+
+// -----------------------------------------------------------------------------
+//
+// orionldKindFromString -
+//
+OrionldContextKind orionldKindFromString(const char* kind)
+{
+  if      (strcmp(kind, "Hosted")            == 0)    return OrionldContextHosted;
+  else if (strcmp(kind, "Cached")            == 0)    return OrionldContextCached;
+  else if (strcmp(kind, "ImplicitlyCreated") == 0)    return OrionldContextImplicit;
+  else if (strcmp(kind, "Unknown")           == 0)    return OrionldContextUnknownKind;
+
+  return OrionldContextUnknownKind;
+}
+
+
+
+// -----------------------------------------------------------------------------
+//
+// orionldKindToString -
+//
+const char* orionldKindToString(OrionldContextKind kind)
+{
+  switch (kind)
+  {
+  case OrionldContextUnknownKind:  return "Unknown";
+  case OrionldContextHosted:       return "Hosted";
+  case OrionldContextCached:       return "Cached";
+  case OrionldContextImplicit:     return "ImplicitlyCreated";
+  }
+
+  return "Invalid";
+}
diff --git a/src/lib/orionld/types/OrionldContext.h b/src/lib/orionld/types/OrionldContext.h
index 6c84a91500..a98d439ace 100644
--- a/src/lib/orionld/types/OrionldContext.h
+++ b/src/lib/orionld/types/OrionldContext.h
@@ -84,6 +84,20 @@ typedef enum OrionldContextOrigin
 
 
 
+// -----------------------------------------------------------------------------
+//
+// OrionldContextKind -
+//
+typedef enum OrionldContextKind
+{
+  OrionldContextUnknownKind,
+  OrionldContextHosted,
+  OrionldContextCached,
+  OrionldContextImplicit
+} OrionldContextKind;
+
+
+
 // -----------------------------------------------------------------------------
 //
 // orionldOriginFromString -
@@ -92,6 +106,29 @@ extern OrionldContextOrigin orionldOriginFromString(const char* s);
 
 
 
+// -----------------------------------------------------------------------------
+//
+// orionldOriginToString -
+//
+extern const char* orionldOriginToString(OrionldContextOrigin origin);
+
+
+
+// -----------------------------------------------------------------------------
+//
+// orionldKindFromString -
+//
+extern OrionldContextKind orionldKindFromString(const char* s);
+
+
+
+// -----------------------------------------------------------------------------
+//
+// orionldKindToString -
+//
+extern const char* orionldKindToString(OrionldContextKind kind);
+
+
 
 // ----------------------------------------------------------------------------
 //
@@ -109,10 +146,13 @@ typedef struct OrionldContext
   bool                  coreContext;
   double                createdAt;
   double                usedAt;
-  int                   lookups;
+  int                   compactions;     // Number of compactions done with this @context
+  int                   expansions;      // Number of expansions done with this @context
+  int                   lookups;         // Number of NGSI-LD requests done using this @context
   bool                  keyValues;
   OrionldContextInfo    context;
   OrionldContextOrigin  origin;
+  OrionldContextKind    kind;
 } OrionldContext;
 
 #endif  // SRC_LIB_ORIONLD_TYPES_ORIONLDCONTEXT_H_
diff --git a/src/lib/rest/rest.cpp b/src/lib/rest/rest.cpp
index f8a3428345..2f4d7457e0 100644
--- a/src/lib/rest/rest.cpp
+++ b/src/lib/rest/rest.cpp
@@ -391,12 +391,28 @@ static void requestCompleted
 
 
   //
-  // Release the connection to mongo - after all notifications have been sent (orionldAlterationsTreat takes care of that)
-  //
-  if (orionldState.mongoc.contextsP)       mongoc_collection_destroy(orionldState.mongoc.contextsP);
-  if (orionldState.mongoc.entitiesP)       mongoc_collection_destroy(orionldState.mongoc.entitiesP);
-  if (orionldState.mongoc.subscriptionsP)  mongoc_collection_destroy(orionldState.mongoc.subscriptionsP);
-  if (orionldState.mongoc.registrationsP)  mongoc_collection_destroy(orionldState.mongoc.registrationsP);
+  // Release the connections to mongo - after all notifications have been sent (orionldAlterationsTreat takes care of the notifications)
+  // NOTE, this "construct" with NULLing the mongoc_collection_t pointers before actually calling mongoc_collection_destroy is a
+  // desperate attempt to fix the issue #1499.
+  // If still not enough, perhaps a semaphore to protect.
+  // It's weird though, these collection pointers are THREAD VARIABLES !!!
+  // No protection should be needed.
+  // But, desperate times ...
+  //
+  mongoc_collection_t* contextsP      = orionldState.mongoc.contextsP;
+  mongoc_collection_t* entitiesP      = orionldState.mongoc.entitiesP;
+  mongoc_collection_t* subscriptionsP = orionldState.mongoc.subscriptionsP;
+  mongoc_collection_t* registrationsP = orionldState.mongoc.registrationsP;
+
+  orionldState.mongoc.contextsP      = NULL;
+  orionldState.mongoc.entitiesP      = NULL;
+  orionldState.mongoc.subscriptionsP = NULL;
+  orionldState.mongoc.registrationsP = NULL;
+
+  if (contextsP      != NULL)  mongoc_collection_destroy(contextsP);
+  if (entitiesP      != NULL)  mongoc_collection_destroy(entitiesP);
+  if (subscriptionsP != NULL)  mongoc_collection_destroy(subscriptionsP);
+  if (registrationsP != NULL)  mongoc_collection_destroy(registrationsP);
 
   mongocConnectionRelease();
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_batch_upsert_and_contexts.test b/test/functionalTest/cases/0000_ngsild/ngsild_batch_upsert_and_contexts.test
index f1ea731edc..5811c69575 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_batch_upsert_and_contexts.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_batch_upsert_and_contexts.test
@@ -726,52 +726,67 @@ Link: <http://localhost:7080/jsonldContexts/schema_lab_fiware_org_ld_context.jso
 04. Get all contexts from the context cache
 ===========================================
 HTTP/1.1 200 OK
-Content-Length: 1639
+Content-Length: 2000
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
   {
-    "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
+    "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
     "createdAt": "202REGEX(.*)",
-    "hash-table": {
-      "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-      "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-      "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
-      "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-      "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 5,
+      "expansions": 286,
+      "hash-table": {
+        "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+        "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+        "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
+        "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+        "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+      }
     }
   },
   {
-    "url": "https://fiware.github.io/data-models/context.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
+    "URL": "https://fiware.github.io/data-models/context.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
     "createdAt": "202REGEX(.*)",
-    "lastUse": "202REGEX(.*)",
-    "lookups": 0,
-    "hash-table": {
-      "roadClosed": "https://uri.fiware.org/ns/data-models#roadClosed",
-      "copyMachineOrService": "https://uri.fiware.org/ns/data-models#copyMachineOrService",
-      "carSharing": "https://uri.fiware.org/ns/data-models#carSharing",
-      "areaServed": "https://schema.org/areaServed",
-      "anyVehicle": "https://uri.fiware.org/ns/data-models#anyVehicle"
-    }
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 26,
+      "hash-table": {
+        "roadClosed": "https://uri.fiware.org/ns/data-models#roadClosed",
+        "copyMachineOrService": "https://uri.fiware.org/ns/data-models#copyMachineOrService",
+        "carSharing": "https://uri.fiware.org/ns/data-models#carSharing",
+        "areaServed": "https://schema.org/areaServed",
+        "anyVehicle": "https://uri.fiware.org/ns/data-models#anyVehicle"
+      }
+    },
+    "lastUsage": "202REGEX(.*)",
+    "numberOfHits": 1
   },
   {
-    "url": "http://localhost:7080/jsonldContexts/schema_lab_fiware_org_ld_context.jsonld",
-    "id": "REGEX(.*)",
-    "type": "array",
-    "origin": "Downloaded",
+    "URL": "http://localhost:7080/jsonldContexts/schema_lab_fiware_org_ld_context.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
     "createdAt": "202REGEX(.*)",
-    "lastUse": "202REGEX(.*)",
-    "lookups": 10,
-    "URLs": [
-      "https://fiware.github.io/data-models/context.jsonld"
-    ]
+    "extraInfo": {
+      "type": "array",
+      "origin": "Downloaded",
+      "compactions": 25,
+      "expansions": 27,
+      "URLs": [
+        "https://fiware.github.io/data-models/context.jsonld"
+      ]
+    },
+    "lastUsage": "202REGEX(.*)",
+    "numberOfHits": 2
   }
 ]
 
@@ -981,52 +996,67 @@ Link: <http://localhost:7080/jsonldContexts/schema_lab_fiware_org_ld_context.jso
 07. Get all contexts from the context cache
 ===========================================
 HTTP/1.1 200 OK
-Content-Length: 1639
+Content-Length: 2001
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
   {
-    "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
+    "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
     "createdAt": "202REGEX(.*)",
-    "hash-table": {
-      "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-      "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-      "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
-      "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-      "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 10,
+      "expansions": 291,
+      "hash-table": {
+        "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+        "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+        "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
+        "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+        "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+      }
     }
   },
   {
-    "url": "https://fiware.github.io/data-models/context.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
+    "URL": "https://fiware.github.io/data-models/context.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
     "createdAt": "202REGEX(.*)",
-    "lastUse": "202REGEX(.*)",
-    "lookups": 0,
-    "hash-table": {
-      "roadClosed": "https://uri.fiware.org/ns/data-models#roadClosed",
-      "copyMachineOrService": "https://uri.fiware.org/ns/data-models#copyMachineOrService",
-      "carSharing": "https://uri.fiware.org/ns/data-models#carSharing",
-      "areaServed": "https://schema.org/areaServed",
-      "anyVehicle": "https://uri.fiware.org/ns/data-models#anyVehicle"
-    }
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 52,
+      "hash-table": {
+        "roadClosed": "https://uri.fiware.org/ns/data-models#roadClosed",
+        "copyMachineOrService": "https://uri.fiware.org/ns/data-models#copyMachineOrService",
+        "carSharing": "https://uri.fiware.org/ns/data-models#carSharing",
+        "areaServed": "https://schema.org/areaServed",
+        "anyVehicle": "https://uri.fiware.org/ns/data-models#anyVehicle"
+      }
+    },
+    "lastUsage": "202REGEX(.*)",
+    "numberOfHits": 1
   },
   {
-    "url": "http://localhost:7080/jsonldContexts/schema_lab_fiware_org_ld_context.jsonld",
-    "id": "REGEX(.*)",
-    "type": "array",
-    "origin": "Downloaded",
+    "URL": "http://localhost:7080/jsonldContexts/schema_lab_fiware_org_ld_context.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
     "createdAt": "202REGEX(.*)",
-    "lastUse": "202REGEX(.*)",
-    "lookups": 21,
-    "URLs": [
-      "https://fiware.github.io/data-models/context.jsonld"
-    ]
+    "extraInfo": {
+      "type": "array",
+      "origin": "Downloaded",
+      "compactions": 50,
+      "expansions": 54,
+      "URLs": [
+        "https://fiware.github.io/data-models/context.jsonld"
+      ]
+    },
+    "lastUsage": "202REGEX(.*)",
+    "numberOfHits": 3
   }
 ]
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_context-delete-and-reload.test b/test/functionalTest/cases/0000_ngsild/ngsild_context-delete-and-reload.test
index a2b3aadabf..b959526cdd 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_context-delete-and-reload.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_context-delete-and-reload.test
@@ -34,7 +34,8 @@ orionldStart CB
 #
 # 01. Create a context in the context server
 # 02. Create an entity using the context from step 01, just to get the context inside the context cache of the broker
-# 03. GET the context (from step 01) from the broker
+# 03. GET the context (from step 01) from the broker - without details - see 422
+# 03. GET the context (from step 01) from the broker - with details - see metadata of the context
 # 04. Update the context in the context server
 # 05. DELETE and RELOAD the context in the broker's context cache
 # 06. GET the context (from step 05) from the broker and make sure it's been updated
@@ -72,13 +73,20 @@ echo
 echo
 
 
-echo "03. GET the context (from step 01) from the broker"
-echo "=================================================="
+echo "03. GET the context (from step 01) from the broker - without details - see 422"
+echo "=============================================================================="
 orionCurl --url '/ngsi-ld/v1/jsonldContexts/http://localhost:7080/jsonldContexts/testContext2'
 echo
 echo
 
 
+echo "03. GET the context (from step 01) from the broker - with details - see metadata of the context"
+echo "==============================================================================================="
+orionCurl --url '/ngsi-ld/v1/jsonldContexts/http://localhost:7080/jsonldContexts/testContext2?details=true'
+echo
+echo
+
+
 echo "04. Update the context in the context server"
 echo "============================================"
 cServerCurl --url /jsonldContexts/testContext2 --verb DELETE
@@ -103,7 +111,7 @@ echo
 
 echo "06. GET the context (from step 05) from the broker and make sure it's been updated"
 echo "=================================================================================="
-orionCurl --url '/ngsi-ld/v1/jsonldContexts/http://localhost:7080/jsonldContexts/testContext2'
+orionCurl --url '/ngsi-ld/v1/jsonldContexts/http://localhost:7080/jsonldContexts/testContext2?details=true'
 echo
 echo
 
@@ -131,7 +139,7 @@ echo
 
 echo "10. GET the context from the broker and make sure it exists in the broker's context cache and is the same as in step 06"
 echo "======================================================================================================================="
-orionCurl --url '/ngsi-ld/v1/jsonldContexts/http://localhost:7080/jsonldContexts/testContext2'
+orionCurl --url '/ngsi-ld/v1/jsonldContexts/http://localhost:7080/jsonldContexts/testContext2?details=true'
 echo
 echo
 
@@ -156,18 +164,44 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E1
 
 
 
-03. GET the context (from step 01) from the broker
-==================================================
+03. GET the context (from step 01) from the broker - without details - see 422
+==============================================================================
+HTTP/1.1 422 Unprocessable Content
+Content-Length: 175
+Content-Type: application/json
+Date: REGEX(.*)
+
+{
+    "detail": "http://localhost:7080/jsonldContexts/testContext2",
+    "title": "Not serving cached JSON-LD @context",
+    "type": "https://uri.etsi.org/ngsi-ld/errors/OperationNotSupported"
+}
+
+
+03. GET the context (from step 01) from the broker - with details - see metadata of the context
+===============================================================================================
 HTTP/1.1 200 OK
-Content-Length: 42
+Content-Length: 349
 Content-Type: application/json
 Date: REGEX(.*)
 
 {
-    "@context": {
-        "p1": "urn:p1",
-        "p2": "urn:p2"
-    }
+    "URL": "http://localhost:7080/jsonldContexts/testContext2",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+        "compactions": 0,
+        "expansions": 0,
+        "hash-table": {
+            "p1": "urn:p1",
+            "p2": "urn:p2"
+        },
+        "origin": "Downloaded",
+        "type": "hash-table"
+    },
+    "kind": "Cached",
+    "lastUsage": "202REGEX(.*)",
+    "localId": "REGEX(.*)",
+    "numberOfHits": 1
 }
 
 
@@ -196,15 +230,27 @@ Date: REGEX(.*)
 06. GET the context (from step 05) from the broker and make sure it's been updated
 ==================================================================================
 HTTP/1.1 200 OK
-Content-Length: 56
+Content-Length: 363
 Content-Type: application/json
 Date: REGEX(.*)
 
 {
-    "@context": {
-        "p1": "urn:step04:p1",
-        "p2": "urn:step04:p2"
-    }
+    "URL": "http://localhost:7080/jsonldContexts/testContext2",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+        "compactions": 0,
+        "expansions": 0,
+        "hash-table": {
+            "p1": "urn:step04:p1",
+            "p2": "urn:step04:p2"
+        },
+        "origin": "Downloaded",
+        "type": "hash-table"
+    },
+    "kind": "Cached",
+    "lastUsage": "202REGEX(.*)",
+    "localId": "REGEX(.*)",
+    "numberOfHits": 1
 }
 
 
@@ -242,15 +288,27 @@ Date: REGEX(.*)
 10. GET the context from the broker and make sure it exists in the broker's context cache and is the same as in step 06
 =======================================================================================================================
 HTTP/1.1 200 OK
-Content-Length: 56
+Content-Length: 363
 Content-Type: application/json
 Date: REGEX(.*)
 
 {
-    "@context": {
-        "p1": "urn:step04:p1",
-        "p2": "urn:step04:p2"
-    }
+    "URL": "http://localhost:7080/jsonldContexts/testContext2",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+        "compactions": 0,
+        "expansions": 0,
+        "hash-table": {
+            "p1": "urn:step04:p1",
+            "p2": "urn:step04:p2"
+        },
+        "origin": "Downloaded",
+        "type": "hash-table"
+    },
+    "kind": "Cached",
+    "lastUsage": "202REGEX(.*)",
+    "localId": "REGEX(.*)",
+    "numberOfHits": 1
 }
 
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_context_creation.test b/test/functionalTest/cases/0000_ngsild/ngsild_context_creation.test
index 72ed2bcda1..feebc904f2 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_context_creation.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_context_creation.test
@@ -51,9 +51,11 @@ orionldStart CB
 echo "01. Create a new context to be served by the broker"
 echo "==================================================="
 payload='{
-  "A1": "urn:ngsi-ld:attributes:A1",
-  "A2": "urn:ngsi-ld:attributes:A2",
-  "A3": "urn:ngsi-ld:attributes:A3"
+  "@context": {
+    "A1": "urn:ngsi-ld:attributes:A1",
+    "A2": "urn:ngsi-ld:attributes:A2",
+    "A3": "urn:ngsi-ld:attributes:A3"
+  }
 }'
 orionCurl --url /ngsi-ld/v1/jsonldContexts --payload "$payload"
 contextURL="/"$(echo "$_responseHeaders" | grep Location: | awk -F:9999/ '{ print $2 }' | tr -d "\r\n")
@@ -112,10 +114,12 @@ echo
 
 echo "07. Create another context, this one an array of two already existing contexts"
 echo "=============================================================================="
-payload='[
-  "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld",
-  "https://fiware.github.io/data-models/context.jsonld"
-]'
+payload='{
+  "@context": [
+    "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld",
+    "https://fiware.github.io/data-models/context.jsonld"
+  ]
+}'
 orionCurl --url /ngsi-ld/v1/jsonldContexts --payload "$payload"
 contextURL="/"$(echo "$_responseHeaders" | grep Location: | awk -F:9999/ '{ print $2 }' | tr -d "\r\n")
 echo URL of newly created context: $contextURL
@@ -162,10 +166,12 @@ echo
 
 echo "12. Create a context, as an object with a @context member with an array"
 echo "======================================================================="
-payload='[
-  "https://fiware.github.io/data-models/context.jsonld",
-  "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld"
-]'
+payload='{
+  "@context": [
+    "https://fiware.github.io/data-models/context.jsonld",
+    "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld"
+  ]
+}'
 orionCurl --url /ngsi-ld/v1/jsonldContexts --payload "$payload"
 contextURL="/"$(echo "$_responseHeaders" | grep Location: | awk -F:9999/ '{ print $2 }' | tr -d "\r\n")
 echo URL of newly created context: $contextURL
@@ -200,32 +206,42 @@ Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     },
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "A1": "urn:ngsi-ld:attributes:A1",
-            "A2": "urn:ngsi-ld:attributes:A2",
-            "A3": "urn:ngsi-ld:attributes:A3"
+        "URL": "REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "A1": "urn:ngsi-ld:attributes:A1",
+                "A2": "urn:ngsi-ld:attributes:A2",
+                "A3": "urn:ngsi-ld:attributes:A3"
+            },
+            "origin": "UserCreated",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 0,
-        "origin": "UserCreated",
-        "type": "hash-table",
-        "url": "http://REGEX(.*)
+        "kind": "Hosted",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
     }
 ]
 
@@ -333,91 +349,121 @@ Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     },
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "A1": "urn:ngsi-ld:attributes:A1",
-            "A2": "urn:ngsi-ld:attributes:A2",
-            "A3": "urn:ngsi-ld:attributes:A3"
+        "URL": "REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "A1": "urn:ngsi-ld:attributes:A1",
+                "A2": "urn:ngsi-ld:attributes:A2",
+                "A3": "urn:ngsi-ld:attributes:A3"
+            },
+            "origin": "UserCreated",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 2,
-        "origin": "UserCreated",
-        "type": "hash-table",
-        "url": "REGEX(.*)"
+        "kind": "Hosted",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
     },
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "A1": "urn:ngsi-ld:attributes:A1",
-            "A2": "urn:ngsi-ld:attributes:A2",
-            "A3": "urn:ngsi-ld:attributes:A3"
+        "URL": "REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 3,
+            "expansions": 6,
+            "hash-table": {
+                "A1": "urn:ngsi-ld:attributes:A1",
+                "A2": "urn:ngsi-ld:attributes:A2",
+                "A3": "urn:ngsi-ld:attributes:A3"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 1,
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "REGEX(.*)"
+        "kind": "Cached",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 2
     },
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "StockOrder": "https://fiware.github.io/tutorials.Step-by-Step/schema/StockOrder",
-            "commercial": "https://uri.fiware.org/ns/data-models#commercial",
-            "inProgress": "https://fiware.github.io/tutorials.Step-by-Step/schema/inProgress",
-            "industrial": "https://uri.fiware.org/ns/data-models#industrial",
-            "stockCount": "https://fiware.github.io/tutorials.Step-by-Step/schema/stockCount"
+        "URL": "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 86,
+            "hash-table": {
+                "StockOrder": "https://fiware.github.io/tutorials.Step-by-Step/schema/StockOrder",
+                "commercial": "https://uri.fiware.org/ns/data-models#commercial",
+                "inProgress": "https://fiware.github.io/tutorials.Step-by-Step/schema/inProgress",
+                "industrial": "https://uri.fiware.org/ns/data-models#industrial",
+                "stockCount": "https://fiware.github.io/tutorials.Step-by-Step/schema/stockCount"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 0,
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld"
+        "kind": "Cached",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
     },
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "anyVehicle": "https://uri.fiware.org/ns/data-models#anyVehicle",
-            "areaServed": "https://schema.org/areaServed",
-            "carSharing": "https://uri.fiware.org/ns/data-models#carSharing",
-            "copyMachineOrService": "https://uri.fiware.org/ns/data-models#copyMachineOrService",
-            "roadClosed": "https://uri.fiware.org/ns/data-models#roadClosed"
+        "URL": "https://fiware.github.io/data-models/context.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "anyVehicle": "https://uri.fiware.org/ns/data-models#anyVehicle",
+                "areaServed": "https://schema.org/areaServed",
+                "carSharing": "https://uri.fiware.org/ns/data-models#carSharing",
+                "copyMachineOrService": "https://uri.fiware.org/ns/data-models#copyMachineOrService",
+                "roadClosed": "https://uri.fiware.org/ns/data-models#roadClosed"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 0,
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://fiware.github.io/data-models/context.jsonld"
+        "kind": "Cached",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
     },
     {
-        "URLs": [
-            "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld",
-            "https://fiware.github.io/data-models/context.jsonld"
-        ],
-        "createdAt": "REGEX(.*)",
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 1,
-        "origin": "UserCreated",
-        "type": "array",
-        "url": "REGEX(.*)"
+        "URL": "REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "URLs": [
+                "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld",
+                "https://fiware.github.io/data-models/context.jsonld"
+            ],
+            "compactions": 0,
+            "expansions": 0,
+            "origin": "UserCreated",
+            "type": "array"
+        },
+        "kind": "Hosted",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
     }
 ]
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_context_deletion.test b/test/functionalTest/cases/0000_ngsild/ngsild_context_deletion.test
index 6691466ebd..6d3526737a 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_context_deletion.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_context_deletion.test
@@ -46,9 +46,11 @@ orionldStart CB
 echo "01. Create context A in the broker"
 echo "=================================="
 payload='{
-  "A1": "urn:ngsi-ld:attributes:A1",
-  "A2": "urn:ngsi-ld:attributes:A2",
-  "A3": "urn:ngsi-ld:attributes:A3"
+  "@context": {
+    "A1": "urn:ngsi-ld:attributes:A1",
+    "A2": "urn:ngsi-ld:attributes:A2",
+    "A3": "urn:ngsi-ld:attributes:A3"
+  }
 }'
 orionCurl --url /ngsi-ld/v1/jsonldContexts --payload "$payload"
 urlA="/"$(echo "$_responseHeaders" | grep Location: | awk -F:9999/ '{ print $2 }' | tr -d "\r\n")
@@ -60,9 +62,11 @@ echo
 echo "02. Create context B in the broker"
 echo "=================================="
 payload='{
-  "B1": "urn:ngsi-ld:attributes:B1",
-  "B2": "urn:ngsi-ld:attributes:B2",
-  "B3": "urn:ngsi-ld:attributes:B3"
+  "@context": {
+    "B1": "urn:ngsi-ld:attributes:B1",
+    "B2": "urn:ngsi-ld:attributes:B2",
+    "B3": "urn:ngsi-ld:attributes:B3"
+  }
 }'
 orionCurl --url /ngsi-ld/v1/jsonldContexts --payload "$payload"
 urlB="/"$(echo "$_responseHeaders" | grep Location: | awk -F:9999/ '{ print $2 }' | tr -d "\r\n")
@@ -74,9 +78,11 @@ echo
 echo "03. Create context C in the broker"
 echo "=================================="
 payload='{
-  "C1": "urn:ngsi-ld:attributes:C1",
-  "C2": "urn:ngsi-ld:attributes:C2",
-  "C3": "urn:ngsi-ld:attributes:C3"
+  "@context": {
+    "C1": "urn:ngsi-ld:attributes:C1",
+    "C2": "urn:ngsi-ld:attributes:C2",
+    "C3": "urn:ngsi-ld:attributes:C3"
+  }
 }'
 orionCurl --url /ngsi-ld/v1/jsonldContexts --payload "$payload"
 urlC="/"$(echo "$_responseHeaders" | grep Location: | awk -F:9999/ '{ print $2 }' | tr -d "\r\n")
@@ -161,60 +167,80 @@ Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     },
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "A1": "urn:ngsi-ld:attributes:A1",
-            "A2": "urn:ngsi-ld:attributes:A2",
-            "A3": "urn:ngsi-ld:attributes:A3"
+        "URL": "REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "A1": "urn:ngsi-ld:attributes:A1",
+                "A2": "urn:ngsi-ld:attributes:A2",
+                "A3": "urn:ngsi-ld:attributes:A3"
+            },
+            "origin": "UserCreated",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 0,
-        "origin": "UserCreated",
-        "type": "hash-table",
-        "url": "http://REGEX(.*)
+        "kind": "Hosted",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
     },
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "B1": "urn:ngsi-ld:attributes:B1",
-            "B2": "urn:ngsi-ld:attributes:B2",
-            "B3": "urn:ngsi-ld:attributes:B3"
+        "URL": "REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "B1": "urn:ngsi-ld:attributes:B1",
+                "B2": "urn:ngsi-ld:attributes:B2",
+                "B3": "urn:ngsi-ld:attributes:B3"
+            },
+            "origin": "UserCreated",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 0,
-        "origin": "UserCreated",
-        "type": "hash-table",
-        "url": "http://REGEX(.*)
+        "kind": "Hosted",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
     },
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "C1": "urn:ngsi-ld:attributes:C1",
-            "C2": "urn:ngsi-ld:attributes:C2",
-            "C3": "urn:ngsi-ld:attributes:C3"
+        "URL": "REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "C1": "urn:ngsi-ld:attributes:C1",
+                "C2": "urn:ngsi-ld:attributes:C2",
+                "C3": "urn:ngsi-ld:attributes:C3"
+            },
+            "origin": "UserCreated",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 0,
-        "origin": "UserCreated",
-        "type": "hash-table",
-        "url": "http://REGEX(.*)
+        "kind": "Hosted",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
     }
 ]
 
@@ -229,6 +255,7 @@ MongoDB server version: REGEX(.*)
 	"url" : "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
 	"parent" : null,
 	"origin" : "Downloaded",
+	"kind" : "Cached",
 	"createdAt" : REGEX(.*)
 }
 {
@@ -236,6 +263,7 @@ MongoDB server version: REGEX(.*)
 	"url" : "httpREGEX(.*)",
 	"parent" : null,
 	"origin" : "UserCreated",
+	"kind" : "Hosted",
 	"createdAt" : REGEX(.*)
 }
 {
@@ -243,6 +271,7 @@ MongoDB server version: REGEX(.*)
 	"url" : "httpREGEX(.*)",
 	"parent" : null,
 	"origin" : "UserCreated",
+	"kind" : "Hosted",
 	"createdAt" : REGEX(.*)
 }
 {
@@ -250,6 +279,7 @@ MongoDB server version: REGEX(.*)
 	"url" : "httpREGEX(.*)",
 	"parent" : null,
 	"origin" : "UserCreated",
+	"kind" : "Hosted",
 	"createdAt" : REGEX(.*)
 }
 bye
@@ -271,46 +301,61 @@ Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     },
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "A1": "urn:ngsi-ld:attributes:A1",
-            "A2": "urn:ngsi-ld:attributes:A2",
-            "A3": "urn:ngsi-ld:attributes:A3"
+        "URL": "REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "A1": "urn:ngsi-ld:attributes:A1",
+                "A2": "urn:ngsi-ld:attributes:A2",
+                "A3": "urn:ngsi-ld:attributes:A3"
+            },
+            "origin": "UserCreated",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 0,
-        "origin": "UserCreated",
-        "type": "hash-table",
-        "url": "http://REGEX(.*)
+        "kind": "Hosted",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
     },
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "C1": "urn:ngsi-ld:attributes:C1",
-            "C2": "urn:ngsi-ld:attributes:C2",
-            "C3": "urn:ngsi-ld:attributes:C3"
+        "URL": "REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "C1": "urn:ngsi-ld:attributes:C1",
+                "C2": "urn:ngsi-ld:attributes:C2",
+                "C3": "urn:ngsi-ld:attributes:C3"
+            },
+            "origin": "UserCreated",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 0,
-        "origin": "UserCreated",
-        "type": "hash-table",
-        "url": "http://REGEX(.*)
+        "kind": "Hosted",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
     }
 ]
 
@@ -325,6 +370,7 @@ MongoDB server version: REGEX(.*)
 	"url" : "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
 	"parent" : null,
 	"origin" : "Downloaded",
+	"kind" : "Cached",
 	"createdAt" : REGEX(.*)
 }
 {
@@ -332,6 +378,7 @@ MongoDB server version: REGEX(.*)
 	"url" : "httpREGEX(.*)",
 	"parent" : null,
 	"origin" : "UserCreated",
+	"kind" : "Hosted",
 	"createdAt" : REGEX(.*)
 }
 {
@@ -339,6 +386,7 @@ MongoDB server version: REGEX(.*)
 	"url" : "httpREGEX(.*)",
 	"parent" : null,
 	"origin" : "UserCreated",
+	"kind" : "Hosted",
 	"createdAt" : REGEX(.*)
 }
 bye
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_context_errors.test b/test/functionalTest/cases/0000_ngsild/ngsild_context_errors.test
index 795dec5e69..3aa2ee6126 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_context_errors.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_context_errors.test
@@ -313,24 +313,29 @@ Date: REGEX(.*)
 02. GET Contexts - see only Core Context
 ========================================
 HTTP/1.1 200 OK
-Content-Length: 582
+Content-Length: 701
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     }
 ]
 
@@ -352,24 +357,29 @@ Date: REGEX(.*)
 04. GET Contexts - see only Core Context
 ========================================
 HTTP/1.1 200 OK
-Content-Length: 582
+Content-Length: 701
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     }
 ]
 
@@ -391,24 +401,29 @@ Date: REGEX(.*)
 06. GET Contexts - see only Core Context
 ========================================
 HTTP/1.1 200 OK
-Content-Length: 582
+Content-Length: 701
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     }
 ]
 
@@ -431,24 +446,29 @@ Date: REGEX(.*)
 08. GET Contexts - see only Core Context
 ========================================
 HTTP/1.1 200 OK
-Content-Length: 582
+Content-Length: 701
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     }
 ]
 
@@ -470,24 +490,29 @@ Date: REGEX(.*)
 10. GET Contexts - see only Core Context
 ========================================
 HTTP/1.1 200 OK
-Content-Length: 582
+Content-Length: 701
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     }
 ]
 
@@ -509,24 +534,29 @@ Date: REGEX(.*)
 12. GET Contexts - see only Core Context
 ========================================
 HTTP/1.1 200 OK
-Content-Length: 582
+Content-Length: 701
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     }
 ]
 
@@ -548,24 +578,29 @@ Date: REGEX(.*)
 14. GET Contexts - see only Core Context
 ========================================
 HTTP/1.1 200 OK
-Content-Length: 582
+Content-Length: 701
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     }
 ]
 
@@ -587,24 +622,29 @@ Date: REGEX(.*)
 16. GET Contexts - see only Core Context
 ========================================
 HTTP/1.1 200 OK
-Content-Length: 582
+Content-Length: 701
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     }
 ]
 
@@ -626,24 +666,29 @@ Date: REGEX(.*)
 18. GET Contexts - see only Core Context
 ========================================
 HTTP/1.1 200 OK
-Content-Length: 582
+Content-Length: 701
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     }
 ]
 
@@ -665,24 +710,29 @@ Date: REGEX(.*)
 20. GET Contexts - see only Core Context
 ========================================
 HTTP/1.1 200 OK
-Content-Length: 582
+Content-Length: 701
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     }
 ]
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_context_list_with_kind.test b/test/functionalTest/cases/0000_ngsild/ngsild_context_list_with_kind.test
new file mode 100644
index 0000000000..46cd279e6d
--- /dev/null
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_context_list_with_kind.test
@@ -0,0 +1,467 @@
+# Copyright 2024 FIWARE Foundation e.V.
+#
+# This file is part of Orion-LD Context Broker.
+#
+# Orion-LD Context Broker is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# Orion-LD Context Broker is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Orion-LD Context Broker. If not, see http://www.gnu.org/licenses/.
+#
+# For those usages not covered by this license please contact with
+# orionld at fiware dot org
+
+# VALGRIND_READY - to mark the test ready for valgrindTestSuite.sh
+
+--NAME--
+Create and DELETE contexts
+
+--SHELL-INIT--
+dbInit CB
+dbDrop orionld
+orionldStart CB
+
+--SHELL--
+
+#
+# 01. Create context A in the broker (array of two URLs - Hosted + 2 Cached)
+# 02. Create context B in the broker (key-values - Hosted)
+# 03. Create context C in the broker (key-values - Hosted)
+# 04. GET all contexts, with details, see A-B-C + the two Cached ones, and the core context
+# 05. GET all contexts, with kind=Hosted - see A-B-C
+# 06. GET all contexts, with kind=Hosted AND details - see A-B-C
+# 07. GET all contexts, with kind=Cached - see the 2 URLs from step 1 + the Core Context
+# 08. GET all contexts, with kind=Cached AND details - see the 2 URLs from step 1 +	the Core Context
+# 09. GET all contexts, with kind=Nada - see 400 Bad Request
+#
+
+echo "01. Create context A in the broker (array of two URLs - Hosted + 2 Cached)"
+echo "=========================================================================="
+payload='{
+  "@context": [
+    "http://smartdatamodels.org/context.jsonld",
+    "https://fiware.github.io/data-models/context.jsonld"
+  ]
+}'
+orionCurl --url /ngsi-ld/v1/jsonldContexts --payload "$payload"
+echo
+echo
+
+
+echo "02. Create context B in the broker"
+echo "=================================="
+payload='{
+  "@context": {
+    "B1": "urn:ngsi-ld:attributes:B1",
+    "B2": "urn:ngsi-ld:attributes:B2",
+    "B3": "urn:ngsi-ld:attributes:B3"
+  }
+}'
+orionCurl --url /ngsi-ld/v1/jsonldContexts --payload "$payload"
+echo
+echo
+
+
+echo "03. Create context C in the broker"
+echo "=================================="
+payload='{
+  "@context": {
+    "C1": "urn:ngsi-ld:attributes:C1",
+    "C2": "urn:ngsi-ld:attributes:C2",
+    "C3": "urn:ngsi-ld:attributes:C3"
+  }
+}'
+orionCurl --url /ngsi-ld/v1/jsonldContexts --payload "$payload"
+echo
+echo
+
+
+echo "04. GET all contexts, with details, see A-B-C + the two Cached ones, and the core context"
+echo "========================================================================================="
+orionCurl --url /ngsi-ld/v1/jsonldContexts?details=true
+echo
+echo
+
+
+echo "05. GET all contexts, with kind=Hosted - see A-B-C"
+echo "=================================================="
+orionCurl --url /ngsi-ld/v1/jsonldContexts?kind=Hosted
+echo
+echo
+
+
+echo "06. GET all contexts, with kind=Hosted AND details - see A-B-C"
+echo "=============================================================="
+orionCurl --url '/ngsi-ld/v1/jsonldContexts?details=true&kind=Hosted'
+echo
+echo
+
+
+echo "07. GET all contexts, with kind=Cached - see the 2 URLs from step 1 + the Core Context"
+echo "======================================================================================"
+orionCurl --url /ngsi-ld/v1/jsonldContexts?kind=Cached
+echo
+echo
+
+
+echo "08. GET all contexts, with kind=Cached AND details - see the 2 URLs from step 1 + the Core Context"
+echo "=================================================================================================="
+orionCurl --url '/ngsi-ld/v1/jsonldContexts?details=true&kind=Cached'
+echo
+echo
+
+
+echo "09. GET all contexts, with kind=Nada - see 400 Bad Request"
+echo "=========================================================="
+orionCurl --url '/ngsi-ld/v1/jsonldContexts?details=true&kind=Nada'
+echo
+echo
+
+
+--REGEXPECT--
+01. Create context A in the broker (array of two URLs - Hosted + 2 Cached)
+==========================================================================
+HTTP/1.1 201 Created
+Content-Length: 0
+Date: REGEX(.*)
+Location: http://REGEX(.*)
+
+
+
+02. Create context B in the broker
+==================================
+HTTP/1.1 201 Created
+Content-Length: 0
+Date: REGEX(.*)
+Location: http://REGEX(.*)
+
+
+
+03. Create context C in the broker
+==================================
+HTTP/1.1 201 Created
+Content-Length: 0
+Date: REGEX(.*)
+Location: http://REGEX(.*)
+
+
+
+04. GET all contexts, with details, see A-B-C + the two Cached ones, and the core context
+=========================================================================================
+HTTP/1.1 200 OK
+Content-Length: REGEX(.*)
+Content-Type: application/json
+Date: REGEX(.*)
+
+[
+    {
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 283,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
+        },
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
+    },
+    {
+        "URL": "http://smartdatamodels.org/context.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 2,
+            "hash-table": {
+                "carSharing": "https://uri.fiware.org/ns/data-models#carSharing",
+                "copyMachineOrService": "https://uri.fiware.org/ns/data-models#copyMachineOrService",
+                "efficCurve": "https://smart-data-models.github.io/data-models/terms.jsonld#/definitions/efficCurve",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "roadClosed": "https://uri.fiware.org/ns/data-models#roadClosed"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
+        },
+        "kind": "Cached",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
+    },
+    {
+        "URL": "https://fiware.github.io/data-models/context.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "anyVehicle": "https://uri.fiware.org/ns/data-models#anyVehicle",
+                "areaServed": "https://schema.org/areaServed",
+                "carSharing": "https://uri.fiware.org/ns/data-models#carSharing",
+                "copyMachineOrService": "https://uri.fiware.org/ns/data-models#copyMachineOrService",
+                "roadClosed": "https://uri.fiware.org/ns/data-models#roadClosed"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
+        },
+        "kind": "Cached",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
+    },
+    {
+        "URL": "http://REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "URLs": [
+                "http://smartdatamodels.org/context.jsonld",
+                "https://fiware.github.io/data-models/context.jsonld"
+            ],
+            "compactions": 0,
+            "expansions": 0,
+            "origin": "UserCreated",
+            "type": "array"
+        },
+        "kind": "Hosted",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
+    },
+    {
+        "URL": "http://REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "B1": "urn:ngsi-ld:attributes:B1",
+                "B2": "urn:ngsi-ld:attributes:B2",
+                "B3": "urn:ngsi-ld:attributes:B3"
+            },
+            "origin": "UserCreated",
+            "type": "hash-table"
+        },
+        "kind": "Hosted",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
+    },
+    {
+        "URL": "http://REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "C1": "urn:ngsi-ld:attributes:C1",
+                "C2": "urn:ngsi-ld:attributes:C2",
+                "C3": "urn:ngsi-ld:attributes:C3"
+            },
+            "origin": "UserCreated",
+            "type": "hash-table"
+        },
+        "kind": "Hosted",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
+    }
+]
+
+
+05. GET all contexts, with kind=Hosted - see A-B-C
+==================================================
+HTTP/1.1 200 OK
+Content-Length: REGEX(.*)
+Content-Type: application/json
+Date: REGEX(.*)
+
+[
+    "http://REGEX(.*)",
+    "http://REGEX(.*)",
+    "http://REGEX(.*)"
+]
+
+
+06. GET all contexts, with kind=Hosted AND details - see A-B-C
+==============================================================
+HTTP/1.1 200 OK
+Content-Length: REGEX(.*)
+Content-Type: application/json
+Date: REGEX(.*)
+
+[
+    {
+        "URL": "http://REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "URLs": [
+                "http://smartdatamodels.org/context.jsonld",
+                "https://fiware.github.io/data-models/context.jsonld"
+            ],
+            "compactions": 0,
+            "expansions": 0,
+            "origin": "UserCreated",
+            "type": "array"
+        },
+        "kind": "Hosted",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
+    },
+    {
+        "URL": "http://REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "B1": "urn:ngsi-ld:attributes:B1",
+                "B2": "urn:ngsi-ld:attributes:B2",
+                "B3": "urn:ngsi-ld:attributes:B3"
+            },
+            "origin": "UserCreated",
+            "type": "hash-table"
+        },
+        "kind": "Hosted",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
+    },
+    {
+        "URL": "http://REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "C1": "urn:ngsi-ld:attributes:C1",
+                "C2": "urn:ngsi-ld:attributes:C2",
+                "C3": "urn:ngsi-ld:attributes:C3"
+            },
+            "origin": "UserCreated",
+            "type": "hash-table"
+        },
+        "kind": "Hosted",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
+    }
+]
+
+
+07. GET all contexts, with kind=Cached - see the 2 URLs from step 1 + the Core Context
+======================================================================================
+HTTP/1.1 200 OK
+Content-Length: 166
+Content-Type: application/json
+Date: REGEX(.*)
+
+[
+    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+    "http://smartdatamodels.org/context.jsonld",
+    "https://fiware.github.io/data-models/context.jsonld"
+]
+
+
+08. GET all contexts, with kind=Cached AND details - see the 2 URLs from step 1 + the Core Context
+==================================================================================================
+HTTP/1.1 200 OK
+Content-Length: 1887
+Content-Type: application/json
+Date: REGEX(.*)
+
+[
+    {
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 283,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
+        },
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
+    },
+    {
+        "URL": "http://smartdatamodels.org/context.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 2,
+            "hash-table": {
+                "carSharing": "https://uri.fiware.org/ns/data-models#carSharing",
+                "copyMachineOrService": "https://uri.fiware.org/ns/data-models#copyMachineOrService",
+                "efficCurve": "https://smart-data-models.github.io/data-models/terms.jsonld#/definitions/efficCurve",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "roadClosed": "https://uri.fiware.org/ns/data-models#roadClosed"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
+        },
+        "kind": "Cached",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
+    },
+    {
+        "URL": "https://fiware.github.io/data-models/context.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "anyVehicle": "https://uri.fiware.org/ns/data-models#anyVehicle",
+                "areaServed": "https://schema.org/areaServed",
+                "carSharing": "https://uri.fiware.org/ns/data-models#carSharing",
+                "copyMachineOrService": "https://uri.fiware.org/ns/data-models#copyMachineOrService",
+                "roadClosed": "https://uri.fiware.org/ns/data-models#roadClosed"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
+        },
+        "kind": "Cached",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
+    }
+]
+
+
+09. GET all contexts, with kind=Nada - see 400 Bad Request
+==========================================================
+HTTP/1.1 400 Bad Request
+Content-Length: 126
+Content-Type: application/json
+Date: REGEX(.*)
+
+{
+    "detail": "Nada",
+    "title": "Invalid value for uri parameter /kind/",
+    "type": "https://uri.etsi.org/ngsi-ld/errors/BadRequestData"
+}
+
+
+--TEARDOWN--
+brokerStop CB
+dbDrop CB
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_context_location.test b/test/functionalTest/cases/0000_ngsild/ngsild_context_location.test
index 78e2f8aeba..2ccf2b9a70 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_context_location.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_context_location.test
@@ -56,7 +56,16 @@ echo "02. GET the local location of the context from step 1 and save its URL"
 echo "======================================================================"
 orionCurl --url '/ngsi-ld/v1/jsonldContexts?location=true&url=https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testFullContext.jsonld'
 contextUrl=$(cat /tmp/httpHeaders.out | grep 'Location' | awk '{ print $2}')
+contextId=$(echo $contextUrl | awk -F/ '{ print $5 }')
 echo contextUrl: $contextUrl
+echo contextId: $contextId
+echo
+echo
+
+
+echo "02. Retrieve the context, with details"
+echo "======================================"
+orionCurl --url '/ngsi-ld/v1/jsonldContexts/$contextId?details=true'
 echo
 echo
 
@@ -93,6 +102,33 @@ Date: REGEX(.*)
 Location: /ngsi-ld/v1/jsonldContexts/REGEX(.*)
 
 contextUrl: /ngsi-ld/v1/jsonldContexts/REGEX(.*)
+contextId: REGEX(.*)
+
+
+02. Retrieve the context, with details
+======================================
+HTTP/1.1 200 OK
+Content-Length: 410
+Content-Type: application/json
+Date: REGEX(.*)
+
+{
+    "URL": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testFullContext.jsonld",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+        "URLs": [
+            "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld"
+        ],
+        "compactions": 0,
+        "expansions": 2,
+        "origin": "Downloaded",
+        "type": "array"
+    },
+    "kind": "Cached",
+    "lastUsage": "202REGEX(.*)",
+    "localId": "REGEX(.*)",
+    "numberOfHits": 1
+}
 
 
 03. DELETE the context from the cache
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_context_persist_on_download.test b/test/functionalTest/cases/0000_ngsild/ngsild_context_persist_on_download.test
index 2b9e26caa5..861b3ef55f 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_context_persist_on_download.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_context_persist_on_download.test
@@ -99,6 +99,7 @@ MongoDB server version: REGEX(.*)
 	"url" : "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
 	"parent" : null,
 	"origin" : "Downloaded",
+	"kind" : "Cached",
 	"createdAt" : REGEX(.*)
 }
 {
@@ -106,6 +107,7 @@ MongoDB server version: REGEX(.*)
 	"url" : "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld",
 	"parent" : null,
 	"origin" : "Downloaded",
+	"kind" : "Cached",
 	"createdAt" : REGEX(.*)
 }
 bye
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_context_persist_on_user_creation.test b/test/functionalTest/cases/0000_ngsild/ngsild_context_persist_on_user_creation.test
index bed81666dd..88fa17f92f 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_context_persist_on_user_creation.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_context_persist_on_user_creation.test
@@ -101,6 +101,7 @@ MongoDB server version: REGEX(.*)
 	"url" : "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
 	"parent" : null,
 	"origin" : "Downloaded",
+	"kind" : "Cached",
 	"createdAt" : REGEX(.*)
 }
 {
@@ -108,6 +109,7 @@ MongoDB server version: REGEX(.*)
 	"url" : "REGEX(.*)",
 	"parent" : null,
 	"origin" : "UserCreated",
+	"kind" : "Hosted",
 	"createdAt" : REGEX(.*)
 }
 bye
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_context_server_complex_user_context.test b/test/functionalTest/cases/0000_ngsild/ngsild_context_server_complex_user_context.test
index 010e066b73..cc78263d02 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_context_server_complex_user_context.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_context_server_complex_user_context.test
@@ -41,14 +41,16 @@ orionldStart CB
 
 echo "01. Create a new context to be served by the broker, one that is an array of a URL and a key-value list: 3 contexts in total"
 echo "============================================================================================================================"
-payload='[
-  "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld",
-  {
-    "A1": "urn:ngsi-ld:attributes:A1",
-    "A2": "urn:ngsi-ld:attributes:A2",
-    "A3": "urn:ngsi-ld:attributes:A3"    
-  }
-]'
+payload='{
+  "@context": [
+    "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld",
+    {
+      "A1": "urn:ngsi-ld:attributes:A1",
+      "A2": "urn:ngsi-ld:attributes:A2",
+      "A3": "urn:ngsi-ld:attributes:A3"
+    }
+  ]
+}'
 orionCurl --url /ngsi-ld/v1/jsonldContexts --payload "$payload"
 contextURL="/"$(echo "$_responseHeaders" | grep Location: | awk -F:9999/ '{ print $2 }' | tr -d "\r\n")
 echo
@@ -109,62 +111,82 @@ Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     },
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "StockOrder": "https://fiware.github.io/tutorials.Step-by-Step/schema/StockOrder",
-            "commercial": "https://uri.fiware.org/ns/data-models#commercial",
-            "inProgress": "https://fiware.github.io/tutorials.Step-by-Step/schema/inProgress",
-            "industrial": "https://uri.fiware.org/ns/data-models#industrial",
-            "stockCount": "https://fiware.github.io/tutorials.Step-by-Step/schema/stockCount"
+        "URL": "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 86,
+            "hash-table": {
+                "StockOrder": "https://fiware.github.io/tutorials.Step-by-Step/schema/StockOrder",
+                "commercial": "https://uri.fiware.org/ns/data-models#commercial",
+                "inProgress": "https://fiware.github.io/tutorials.Step-by-Step/schema/inProgress",
+                "industrial": "https://uri.fiware.org/ns/data-models#industrial",
+                "stockCount": "https://fiware.github.io/tutorials.Step-by-Step/schema/stockCount"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 0,
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld"
+        "kind": "Cached",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
     },
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "A1": "urn:ngsi-ld:attributes:A1",
-            "A2": "urn:ngsi-ld:attributes:A2",
-            "A3": "urn:ngsi-ld:attributes:A3"
+        "URL": "REGEX(.*)",
+        "createdAt": "1970-01-01T00:00:00.000Z",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "A1": "urn:ngsi-ld:attributes:A1",
+                "A2": "urn:ngsi-ld:attributes:A2",
+                "A3": "urn:ngsi-ld:attributes:A3"
+            },
+            "origin": "UserCreated",
+            "parent": "REGEX(.*)",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 0,
-        "origin": "UserCreated",
-        "parent": "REGEX(.*)",
-        "type": "hash-table",
-        "url": "http://REGEX(.*)"
+        "kind": "Cached",
+        "lastUsage": "1970-01-01T00:00:00.000Z",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
     },
     {
-        "URLs": [
-            "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld",
-            "http://REGEX(.*)
-        ],
-        "createdAt": "REGEX(.*)",
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 0,
-        "origin": "UserCreated",
-        "type": "array",
-        "url": "http://REGEX(.*)"
+        "URL": "REGEX(.*)",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "URLs": [
+                "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld",
+                "http://REGEX(.*)"
+            ],
+            "compactions": 0,
+            "expansions": 0,
+            "origin": "UserCreated",
+            "type": "array"
+        },
+        "kind": "Hosted",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
     }
 ]
 
@@ -214,6 +236,7 @@ MongoDB server version: REGEX(.*)
 	"url" : "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
 	"parent" : null,
 	"origin" : "Downloaded",
+	"kind" : "Cached",
 	"createdAt" : REGEX(.*)
 }
 {
@@ -221,6 +244,7 @@ MongoDB server version: REGEX(.*)
 	"url" : "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld",
 	"parent" : null,
 	"origin" : "Downloaded",
+	"kind" : "Cached",
 	"createdAt" : REGEX(.*)
 }
 bye
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_issue_807.test b/test/functionalTest/cases/0000_ngsild/ngsild_issue_807.test
index 0cd3d7c2fa..d5dc7ab35c 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_issue_807.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_issue_807.test
@@ -135,40 +135,50 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:ambient_temperature:335547901
 03. GET all contexts from the brokers context cache - see only 2
 ================================================================
 HTTP/1.1 200 OK
-Content-Length: 1028
+Content-Length: 1167
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     },
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "attributes": "https://uri.etsi.org/ngsi-ld/attributes",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
-            "properties": "https://uri.etsi.org/ngsi-ld/properties"
+        "URL": "http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "attributes": "https://uri.etsi.org/ngsi-ld/attributes",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
+                "properties": "https://uri.etsi.org/ngsi-ld/properties"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 200,
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+        "kind": "Cached",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
     }
 ]
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_mixed_context.test b/test/functionalTest/cases/0000_ngsild/ngsild_mixed_context.test
index b60c87b37f..a1e6e28986 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_mixed_context.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_mixed_context.test
@@ -144,52 +144,67 @@ Date: REGEX(.*)
 03. Get all contexts, with details
 ==================================
 HTTP/1.1 200 OK
-Content-Length: 1245
+Content-Length: 1459
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     },
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "P1": "http://example.org/P1",
-            "P2": "http://example.org/P2",
-            "P3": "http://example.org/P3",
-            "R1": "http://example.org/R1",
-            "T": "http://example.org/T"
+        "URL": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "P1": "http://example.org/P1",
+                "P2": "http://example.org/P2",
+                "P3": "http://example.org/P3",
+                "R1": "http://example.org/R1",
+                "T": "http://example.org/T"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 0,
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld"
+        "kind": "Cached",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)"
+        "numberOfHits": 1
     },
     {
-        "URLs": [
-            "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld"
-        ],
-        "createdAt": "REGEX(.*)",
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 0,
-        "origin": "Downloaded",
-        "type": "array",
-        "url": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testFullContext.jsonld"
+        "URL": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testFullContext.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "URLs": [
+                "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld"
+            ],
+            "compactions": 0,
+            "expansions": 0,
+            "origin": "Downloaded",
+            "type": "array"
+        },
+        "kind": "Cached",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)"
+        "numberOfHits": 1
     }
 ]
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert_and_contexts.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert_and_contexts.test
index 5f3a93614a..2a892b20f3 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert_and_contexts.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert_and_contexts.test
@@ -830,52 +830,67 @@ Link: <http://localhost:7080/jsonldContexts/schema_lab_fiware_org_ld_context.jso
 04. Get all contexts from the context cache
 ===========================================
 HTTP/1.1 200 OK
-Content-Length: 1638
+Content-Length: 2000
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
   {
-    "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
+    "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
     "createdAt": "202REGEX(.*)",
-    "hash-table": {
-      "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-      "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-      "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
-      "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-      "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 5,
+      "expansions": 286,
+      "hash-table": {
+        "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+        "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+        "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
+        "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+        "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+      }
     }
   },
   {
-    "url": "https://fiware.github.io/data-models/context.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
+    "URL": "https://fiware.github.io/data-models/context.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
     "createdAt": "202REGEX(.*)",
-    "lastUse": "202REGEX(.*)",
-    "lookups": 0,
-    "hash-table": {
-      "roadClosed": "https://uri.fiware.org/ns/data-models#roadClosed",
-      "copyMachineOrService": "https://uri.fiware.org/ns/data-models#copyMachineOrService",
-      "carSharing": "https://uri.fiware.org/ns/data-models#carSharing",
-      "areaServed": "https://schema.org/areaServed",
-      "anyVehicle": "https://uri.fiware.org/ns/data-models#anyVehicle"
-    }
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 26,
+      "hash-table": {
+        "roadClosed": "https://uri.fiware.org/ns/data-models#roadClosed",
+        "copyMachineOrService": "https://uri.fiware.org/ns/data-models#copyMachineOrService",
+        "carSharing": "https://uri.fiware.org/ns/data-models#carSharing",
+        "areaServed": "https://schema.org/areaServed",
+        "anyVehicle": "https://uri.fiware.org/ns/data-models#anyVehicle"
+      }
+    },
+    "lastUsage": "202REGEX(.*)",
+    "numberOfHits": 1
   },
   {
-    "url": "http://localhost:7080/jsonldContexts/schema_lab_fiware_org_ld_context.jsonld",
-    "id": "REGEX(.*)",
-    "type": "array",
-    "origin": "Downloaded",
+    "URL": "http://localhost:7080/jsonldContexts/schema_lab_fiware_org_ld_context.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
     "createdAt": "202REGEX(.*)",
-    "lastUse": "202REGEX(.*)",
-    "lookups": 5,
-    "URLs": [
-      "https://fiware.github.io/data-models/context.jsonld"
-    ]
+    "extraInfo": {
+      "type": "array",
+      "origin": "Downloaded",
+      "compactions": 25,
+      "expansions": 27,
+      "URLs": [
+        "https://fiware.github.io/data-models/context.jsonld"
+      ]
+    },
+    "lastUsage": "202REGEX(.*)",
+    "numberOfHits": 2
   }
 ]
 
@@ -1175,52 +1190,67 @@ bye
 07. Get all contexts from the context cache
 ===========================================
 HTTP/1.1 200 OK
-Content-Length: 1639
+Content-Length: 2001
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
   {
-    "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
+    "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
     "createdAt": "202REGEX(.*)",
-    "hash-table": {
-      "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-      "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-      "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
-      "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-      "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 10,
+      "expansions": 291,
+      "hash-table": {
+        "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+        "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+        "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
+        "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+        "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+      }
     }
   },
   {
-    "url": "https://fiware.github.io/data-models/context.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
+    "URL": "https://fiware.github.io/data-models/context.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
     "createdAt": "202REGEX(.*)",
-    "lastUse": "202REGEX(.*)",
-    "lookups": 0,
-    "hash-table": {
-      "roadClosed": "https://uri.fiware.org/ns/data-models#roadClosed",
-      "copyMachineOrService": "https://uri.fiware.org/ns/data-models#copyMachineOrService",
-      "carSharing": "https://uri.fiware.org/ns/data-models#carSharing",
-      "areaServed": "https://schema.org/areaServed",
-      "anyVehicle": "https://uri.fiware.org/ns/data-models#anyVehicle"
-    }
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 52,
+      "hash-table": {
+        "roadClosed": "https://uri.fiware.org/ns/data-models#roadClosed",
+        "copyMachineOrService": "https://uri.fiware.org/ns/data-models#copyMachineOrService",
+        "carSharing": "https://uri.fiware.org/ns/data-models#carSharing",
+        "areaServed": "https://schema.org/areaServed",
+        "anyVehicle": "https://uri.fiware.org/ns/data-models#anyVehicle"
+      }
+    },
+    "lastUsage": "202REGEX(.*)",
+    "numberOfHits": 1
   },
   {
-    "url": "http://localhost:7080/jsonldContexts/schema_lab_fiware_org_ld_context.jsonld",
-    "id": "REGEX(.*)",
-    "type": "array",
-    "origin": "Downloaded",
+    "URL": "http://localhost:7080/jsonldContexts/schema_lab_fiware_org_ld_context.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
     "createdAt": "202REGEX(.*)",
-    "lastUse": "202REGEX(.*)",
-    "lookups": 11,
-    "URLs": [
-      "https://fiware.github.io/data-models/context.jsonld"
-    ]
+    "extraInfo": {
+      "type": "array",
+      "origin": "Downloaded",
+      "compactions": 50,
+      "expansions": 54,
+      "URLs": [
+        "https://fiware.github.io/data-models/context.jsonld"
+      ]
+    },
+    "lastUsage": "202REGEX(.*)",
+    "numberOfHits": 3
   }
 ]
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_http-link-header.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_http-link-header.test
index e6580ba18c..46895c01b7 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_http-link-header.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_http-link-header.test
@@ -72,40 +72,50 @@ Location: /ngsi-ld/v1/entities/http://a.b.c/entity/E1
 02. Ask for the entire list of contexts in the context cache
 ============================================================
 HTTP/1.1 200 OK
-Content-Length: 1095
+Content-Length: 1338
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
   {
-    "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
-    "createdAt": "REGEX(.*)",
-    "hash-table": {
-      "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-      "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-      "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
-      "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-      "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+    "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 282,
+      "hash-table": {
+        "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+        "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+        "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
+        "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+        "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+      }
     }
   },
   {
-    "url": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
-    "createdAt": "REGEX(.*)",
-    "lastUse": "REGEX(.*)",
-    "lookups": 0,
-    "hash-table": {
-      "T": "http://example.org/T",
-      "P1": "http://example.org/P1",
-      "P2": "http://example.org/P2",
-      "R1": "http://example.org/R1",
-      "P3": "http://example.org/P3"
-    }
+    "URL": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 0,
+      "hash-table": {
+        "T": "http://example.org/T",
+        "P1": "http://example.org/P1",
+        "P2": "http://example.org/P2",
+        "R1": "http://example.org/R1",
+        "P3": "http://example.org/P3"
+      }
+    },
+    "lastUsage": "202REGEX(.*)",
+    "numberOfHits": 1
   }
 ]
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_mix-string-and-object.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_mix-string-and-object.test
index 34d2fc0dfb..261190950f 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_mix-string-and-object.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_mix-string-and-object.test
@@ -99,40 +99,50 @@ Location: /ngsi-ld/v1/entities/http://a.b.c/entity/E1
 02. Ask for the entire list of contexts in the context cache
 ============================================================
 HTTP/1.1 200 OK
-Content-Length: 1095
+Content-Length: 1338
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
   {
-    "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
-    "createdAt": "REGEX(.*)",
-    "hash-table": {
-      "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-      "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-      "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
-      "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-      "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+    "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 281,
+      "hash-table": {
+        "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+        "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+        "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
+        "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+        "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+      }
     }
   },
   {
-    "url": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
-    "createdAt": "REGEX(.*)",
-    "lastUse": "REGEX(.*)",
-    "lookups": 0,
-    "hash-table": {
-      "T": "http://example.org/T",
-      "P1": "http://example.org/P1",
-      "P2": "http://example.org/P2",
-      "R1": "http://example.org/R1",
-      "P3": "http://example.org/P3"
-    }
+    "URL": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 0,
+      "hash-table": {
+        "T": "http://example.org/T",
+        "P1": "http://example.org/P1",
+        "P2": "http://example.org/P2",
+        "R1": "http://example.org/R1",
+        "P3": "http://example.org/P3"
+      }
+    },
+    "lastUsage": "202REGEX(.*)",
+    "numberOfHits": 1
   }
 ]
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_one_string_that_IS_the_core_context.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_one_string_that_IS_the_core_context.test
index eddedff91c..9d536126b8 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_one_string_that_IS_the_core_context.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_one_string_that_IS_the_core_context.test
@@ -75,23 +75,28 @@ Location: /ngsi-ld/v1/entities/http://a.b.c/entity/E1
 02. Ask for the entire list of contexts in the context cache
 ============================================================
 HTTP/1.1 200 OK
-Content-Length: 582
+Content-Length: 701
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
   {
-    "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
-    "createdAt": "REGEX(.*)",
-    "hash-table": {
-      "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-      "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-      "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
-      "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-      "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+    "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 282,
+      "hash-table": {
+        "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+        "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+        "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
+        "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+        "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+      }
     }
   }
 ]
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_one_string_that_is_not_the_core_context.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_one_string_that_is_not_the_core_context.test
index 97a3ae6da5..d4b3a9dddb 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_one_string_that_is_not_the_core_context.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_one_string_that_is_not_the_core_context.test
@@ -75,40 +75,50 @@ Location: /ngsi-ld/v1/entities/http://a.b.c/entity/E1
 02. Ask for the entire list of contexts in the context cache
 ============================================================
 HTTP/1.1 200 OK
-Content-Length: 1095
+Content-Length: 1338
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
   {
-    "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
-    "createdAt": "REGEX(.*)",
-    "hash-table": {
-      "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-      "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-      "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
-      "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-      "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+    "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 282,
+      "hash-table": {
+        "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+        "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+        "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
+        "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+        "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+      }
     }
   },
   {
-    "url": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
-    "createdAt": "REGEX(.*)",
-    "lastUse": "REGEX(.*)",
-    "lookups": 0,
-    "hash-table": {
-      "T": "http://example.org/T",
-      "P1": "http://example.org/P1",
-      "P2": "http://example.org/P2",
-      "R1": "http://example.org/R1",
-      "P3": "http://example.org/P3"
-    }
+    "URL": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 0,
+      "hash-table": {
+        "T": "http://example.org/T",
+        "P1": "http://example.org/P1",
+        "P2": "http://example.org/P2",
+        "R1": "http://example.org/R1",
+        "P3": "http://example.org/P3"
+      }
+    },
+    "lastUsage": "202REGEX(.*)",
+    "numberOfHits": 1
   }
 ]
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_two_items_of_which_none_is_the_core_context.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_two_items_of_which_none_is_the_core_context.test
index 57e0ef13e8..5ec3d537de 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_two_items_of_which_none_is_the_core_context.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_two_items_of_which_none_is_the_core_context.test
@@ -82,56 +82,71 @@ Location: /ngsi-ld/v1/entities/http://a.b.c/entity/E1
 02. Ask for the entire list of contexts in the context cache
 ============================================================
 HTTP/1.1 200 OK
-Content-Length: REGEX(.*)
+Content-Length: 2205
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
   {
-    "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
-    "createdAt": "REGEX(.*)",
-    "hash-table": {
-      "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-      "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-      "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
-      "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-      "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+    "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 282,
+      "hash-table": {
+        "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+        "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+        "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
+        "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+        "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+      }
     }
   },
   {
-    "url": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
-    "createdAt": "REGEX(.*)",
-    "lastUse": "REGEX(.*)",
-    "lookups": 0,
-    "hash-table": {
-      "T": "http://example.org/T",
-      "P1": "http://example.org/P1",
-      "P2": "http://example.org/P2",
-      "R1": "http://example.org/R1",
-      "P3": "http://example.org/P3"
-    }
+    "URL": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 0,
+      "hash-table": {
+        "T": "http://example.org/T",
+        "P1": "http://example.org/P1",
+        "P2": "http://example.org/P2",
+        "R1": "http://example.org/R1",
+        "P3": "http://example.org/P3"
+      }
+    },
+    "lastUsage": "202REGEX(.*)",
+    "numberOfHits": 1
   },
   {
-    "url": "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
-    "createdAt": "REGEX(.*)",
-    "lastUse": "REGEX(.*)",
-    "lookups": 0,
-    "hash-table": {
-      "StockOrder": "https://fiware.github.io/tutorials.Step-by-Step/schema/StockOrder",
-      "commercial": "https://uri.fiware.org/ns/data-models#commercial",
-      "inProgress": "https://fiware.github.io/tutorials.Step-by-Step/schema/inProgress",
-      "stockCount": "https://fiware.github.io/tutorials.Step-by-Step/schema/stockCount",
-      "industrial": "https://uri.fiware.org/ns/data-models#industrial"
-    }
+    "URL": "https://fiware.github.io/tutorials.Step-by-Step/tutorials-context.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 86,
+      "hash-table": {
+        "StockOrder": "https://fiware.github.io/tutorials.Step-by-Step/schema/StockOrder",
+        "commercial": "https://uri.fiware.org/ns/data-models#commercial",
+        "inProgress": "https://fiware.github.io/tutorials.Step-by-Step/schema/inProgress",
+        "stockCount": "https://fiware.github.io/tutorials.Step-by-Step/schema/stockCount",
+        "industrial": "https://uri.fiware.org/ns/data-models#industrial"
+      }
+    },
+    "lastUsage": "202REGEX(.*)",
+    "numberOfHits": 1
   }
 ]
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_two_items_of_which_one_is_the_core_context.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_two_items_of_which_one_is_the_core_context.test
index f743a629b7..153e627e8e 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_two_items_of_which_one_is_the_core_context.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_array_with_two_items_of_which_one_is_the_core_context.test
@@ -76,40 +76,50 @@ Location: /ngsi-ld/v1/entities/http://a.b.c/entity/E1
 02. Ask for the entire list of contexts in the context cache
 ============================================================
 HTTP/1.1 200 OK
-Content-Length: REGEX(.*)
+Content-Length: 1338
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
   {
-    "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
-    "createdAt": "REGEX(.*)",
-    "hash-table": {
-      "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-      "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-      "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
-      "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-      "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+    "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 282,
+      "hash-table": {
+        "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+        "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+        "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
+        "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+        "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+      }
     }
   },
   {
-    "url": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
-    "createdAt": "REGEX(.*)",
-    "lastUse": "REGEX(.*)",
-    "lookups": 0,
-    "hash-table": {
-      "T": "http://example.org/T",
-      "P1": "http://example.org/P1",
-      "P2": "http://example.org/P2",
-      "R1": "http://example.org/R1",
-      "P3": "http://example.org/P3"
-    }
+    "URL": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 0,
+      "hash-table": {
+        "T": "http://example.org/T",
+        "P1": "http://example.org/P1",
+        "P2": "http://example.org/P2",
+        "R1": "http://example.org/R1",
+        "P3": "http://example.org/P3"
+      }
+    },
+    "lastUsage": "202REGEX(.*)",
+    "numberOfHits": 1
   }
 ]
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_object.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_object.test
index e20b76cd9e..7190239bf2 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_object.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_object.test
@@ -75,23 +75,28 @@ Location: /ngsi-ld/v1/entities/http://a.b.c/entity/E1
 02. Ask for the entire list of contexts in the context cache
 ============================================================
 HTTP/1.1 200 OK
-Content-Length: 582
+Content-Length: 701
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
   {
-    "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
-    "createdAt": "REGEX(.*)",
-    "hash-table": {
-      "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-      "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-      "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
-      "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-      "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+    "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 282,
+      "hash-table": {
+        "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+        "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+        "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
+        "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+        "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+      }
     }
   }
 ]
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_string.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_string.test
index c910c0d7f7..d03a4304fa 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_string.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_context_inline_string.test
@@ -73,40 +73,50 @@ Location: /ngsi-ld/v1/entities/http://a.b.c/entity/E1
 02. Ask for the entire list of contexts in the context cache
 ============================================================
 HTTP/1.1 200 OK
-Content-Length: 1095
+Content-Length: 1338
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
   {
-    "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
-    "createdAt": "REGEX(.*)",
-    "hash-table": {
-      "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-      "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-      "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
-      "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-      "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+    "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 282,
+      "hash-table": {
+        "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+        "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+        "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
+        "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+        "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated"
+      }
     }
   },
   {
-    "url": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld",
-    "id": "REGEX(.*)",
-    "type": "hash-table",
-    "origin": "Downloaded",
-    "createdAt": "REGEX(.*)",
-    "lastUse": "REGEX(.*)",
-    "lookups": 0,
-    "hash-table": {
-      "T": "http://example.org/T",
-      "P1": "http://example.org/P1",
-      "P2": "http://example.org/P2",
-      "R1": "http://example.org/R1",
-      "P3": "http://example.org/P3"
-    }
+    "URL": "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld",
+    "localId": "REGEX(.*)",
+    "kind": "Cached",
+    "createdAt": "202REGEX(.*)",
+    "extraInfo": {
+      "type": "hash-table",
+      "origin": "Downloaded",
+      "compactions": 0,
+      "expansions": 0,
+      "hash-table": {
+        "T": "http://example.org/T",
+        "P1": "http://example.org/P1",
+        "P2": "http://example.org/P2",
+        "R1": "http://example.org/R1",
+        "P3": "http://example.org/P3"
+      }
+    },
+    "lastUsage": "202REGEX(.*)",
+    "numberOfHits": 1
   }
 ]
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_issue_807.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_issue_807.test
index 8d9239973b..a8d45a77e7 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_new_issue_807.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_issue_807.test
@@ -136,40 +136,50 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:ambient_temperature:335547901
 03. GET all contexts from the brokers context cache - see only 2
 ================================================================
 HTTP/1.1 200 OK
-Content-Length: 1028
+Content-Length: 1167
 Content-Type: application/json
 Date: REGEX(.*)
 
 [
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+        "URL": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 281,
+            "hash-table": {
+                "MultiPoint": "https://purl.org/geojson/vocab#MultiPoint",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notUpdated": "https://uri.etsi.org/ngsi-ld/notUpdated",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
+        "kind": "Cached",
+        "localId": "REGEX(.*)"
     },
     {
-        "createdAt": "REGEX(.*)",
-        "hash-table": {
-            "attributes": "https://uri.etsi.org/ngsi-ld/attributes",
-            "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
-            "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
-            "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
-            "properties": "https://uri.etsi.org/ngsi-ld/properties"
+        "URL": "http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld",
+        "createdAt": "202REGEX(.*)",
+        "extraInfo": {
+            "compactions": 0,
+            "expansions": 0,
+            "hash-table": {
+                "attributes": "https://uri.etsi.org/ngsi-ld/attributes",
+                "instanceId": "https://uri.etsi.org/ngsi-ld/instanceId",
+                "notifiedAt": "https://uri.etsi.org/ngsi-ld/notifiedAt",
+                "observedAt": "https://uri.etsi.org/ngsi-ld/observedAt",
+                "properties": "https://uri.etsi.org/ngsi-ld/properties"
+            },
+            "origin": "Downloaded",
+            "type": "hash-table"
         },
-        "id": "REGEX(.*)",
-        "lastUse": "REGEX(.*)",
-        "lookups": 200,
-        "origin": "Downloaded",
-        "type": "hash-table",
-        "url": "http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+        "kind": "Cached",
+        "lastUsage": "202REGEX(.*)",
+        "localId": "REGEX(.*)",
+        "numberOfHits": 1
     }
 ]
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_subscription_cache_issue-1316.test b/test/functionalTest/cases/0000_ngsild/ngsild_subscription_cache_issue-1316.test
index 415db6800f..b83ea04c05 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_subscription_cache_issue-1316.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_subscription_cache_issue-1316.test
@@ -26,7 +26,7 @@ Subscription Creation Error - issue #1317
 --SHELL-INIT--
 dbInit CB
 dbInit CB t_02
-orionldStart CB -experimental -multiservice
+orionldStart CB -experimental -multiservice -t 0-255
 
 --SHELL--
 
@@ -77,7 +77,8 @@ echo
 echo "03. Restart the broker"
 echo "======================"
 brokerStop CB
-orionldStart CB -experimental -multiservice
+sleep 1
+orionldStart CB -experimental -multiservice -t 0-255
 echo
 echo
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_three_brokers_and_forwarding_loop_ALL-CONNECTED.test b/test/functionalTest/cases/0000_ngsild/ngsild_three_brokers_and_forwarding_loop_ALL-CONNECTED.test
index a7564cafdc..88de44acf5 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_three_brokers_and_forwarding_loop_ALL-CONNECTED.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_three_brokers_and_forwarding_loop_ALL-CONNECTED.test
@@ -46,7 +46,15 @@ orionldStart CP2 -experimental -forwarding -wip entityMaps
 # 10. Create an inclusive registration R2 in CP1 on entities of type T pointing to CP2
 # 11. Create an inclusive registration R1 in CP2 on entities of type T pointing to CB
 # 12. Create an inclusive registration R2 in CP2 on entities of type T pointing to CP1
+#
+# Due to timing, distributed entities come in aleatory order, and the SORT_START/SORT_END mechanism seems to not work here ...
+# Cases 13 and 14 will check only the HTTP headers (incl Content-Length) and the entity ids.
+# Any error here would change the Content-Length ... good enough
+#
 # 13. GET /entities?type=T in CB
+# 14. GET /entities?type=T&format=simplified in CB
+# 15. GET /entities?type=T&options=sysAttrs in CB
+# 16. GET /entities?type=T&format=concise in CB
 #
 
 #
@@ -294,8 +302,42 @@ echo
 
 echo "13. GET /entities?type=T in CB"
 echo "=============================="
-orionCurl --url '/ngsi-ld/v1/entities?type=T&count=true' -H "aerOS: true"
+orionCurl --url '/ngsi-ld/v1/entities?type=T&count=true' -H "aerOS: true" > /tmp/entities
 entityMap=$(echo "$_responseHeaders" | grep NGSILD-EntityMap: | awk -F ': ' '{ print $2 }' | tr -d "\r\n")
+head -7 /tmp/entities
+echo
+grep '"id": "' /tmp/entities | sort
+echo
+echo
+
+
+echo "14. GET /entities?type=T&format=simplified in CB"
+echo "================================================"
+orionCurl --url '/ngsi-ld/v1/entities?type=T&format=simplified' -H "aerOS: true" > /tmp/entities
+head -6 /tmp/entities
+echo
+grep '"id": "' /tmp/entities | sort
+echo
+echo
+
+
+echo '15. GET /entities?type=T&options=sysAttrs in CB'
+echo "==============================================="
+orionCurl --url '/ngsi-ld/v1/entities?type=T&options=sysAttrs' -H "aerOS: true" > /tmp/entities
+head -6 /tmp/entities
+echo
+grep '"id": "' /tmp/entities | sort
+\rm -f /tmp/entities
+echo
+echo
+
+echo "16. GET /entities?type=T&format=concise in CB"
+echo "============================================="
+orionCurl --url '/ngsi-ld/v1/entities?type=T&format=concise' -H "aerOS: true" > /tmp/entities
+head -6 /tmp/entities
+echo
+grep '"id": "' /tmp/entities | sort
+\rm -f /tmp/entities
 echo
 echo
 
@@ -412,87 +454,70 @@ Location: /ngsi-ld/v1/csourceRegistrations/urn:R2
 13. GET /entities?type=T in CB
 ==============================
 HTTP/1.1 200 OK
-Content-Length: REGEX(.*)
+Content-Length: 781
 Content-Type: application/json
 Date: REGEX(.*)
 Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)
 NGSILD-EntityMap: urn:ngsi-ld:entity-map:REGEX(.*)
 NGSILD-Results-Count: 6
 
-[
-    {
-        "P1": {
-            "type": "Property",
-            "value": "Entity E1 in Orion A"
-        },
-        "R1": {
-            "object": "urn:E2",
-            "type": "Relationship"
-        },
         "id": "urn:E1",
-        "type": "T"
-    },
-    {
-        "P1": {
-            "type": "Property",
-            "value": "Entity E2 in Orion A"
-        },
-        "R1": {
-            "object": "urn:E2",
-            "type": "Relationship"
-        },
         "id": "urn:E2",
-        "type": "T"
-    },
-    {
-        "P1": {
-            "type": "Property",
-            "value": "Entity E3 in Orion B"
-        },
-        "R1": {
-            "object": "urn:E4",
-            "type": "Relationship"
-        },
         "id": "urn:E3",
-        "type": "T"
-    },
-    {
-        "P1": {
-            "type": "Property",
-            "value": "Entity E4 in Orion B"
-        },
-        "R1": {
-            "object": "urn:E3",
-            "type": "Relationship"
-        },
         "id": "urn:E4",
-        "type": "T"
-    },
-    {
-        "P1": {
-            "type": "Property",
-            "value": "Entity E5 in Orion C"
-        },
-        "R1": {
-            "object": "urn:E6",
-            "type": "Relationship"
-        },
         "id": "urn:E5",
-        "type": "T"
-    },
-    {
-        "P1": {
-            "type": "Property",
-            "value": "Entity E6 in Orion C"
-        },
-        "R1": {
-            "object": "urn:E5",
-            "type": "Relationship"
-        },
         "id": "urn:E6",
-        "type": "T"
-    }
-]
+
+
+14. GET /entities?type=T&format=simplified in CB
+================================================
+HTTP/1.1 200 OK
+Content-Length: 415
+Content-Type: application/json
+Date: REGEX(.*)
+Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)
+NGSILD-EntityMap: urn:ngsi-ld:entity-map:REGEX(.*)
+
+        "id": "urn:E1",
+        "id": "urn:E2",
+        "id": "urn:E3",
+        "id": "urn:E4",
+        "id": "urn:E5",
+        "id": "urn:E6",
+
+
+15. GET /entities?type=T&options=sysAttrs in CB
+===============================================
+HTTP/1.1 200 OK
+Content-Length: 2203
+Content-Type: application/json
+Date: REGEX(.*)
+Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)
+NGSILD-EntityMap: urn:ngsi-ld:entity-map:REGEX(.*)
+
+        "id": "urn:E1",
+        "id": "urn:E2",
+        "id": "urn:E3",
+        "id": "urn:E4",
+        "id": "urn:E5",
+        "id": "urn:E6",
+
+
+16. GET /entities?type=T&format=concise in CB
+=============================================
+HTTP/1.1 200 OK
+Content-Length: 481
+Content-Type: application/json
+Date: REGEX(.*)
+Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)
+NGSILD-EntityMap: urn:ngsi-ld:entity-map:REGEX(.*)
+
+        "id": "urn:E1",
+        "id": "urn:E2",
+        "id": "urn:E3",
+        "id": "urn:E4",
+        "id": "urn:E5",
+        "id": "urn:E6",
 
 
 --TEARDOWN---