diff --git a/examples/ca-eccc-msc-gdc.global-discovery-catalogue.json b/examples/ca-eccc-msc-gdc.global-discovery-catalogue.json
index f1e4487..6f63682 100644
--- a/examples/ca-eccc-msc-gdc.global-discovery-catalogue.json
+++ b/examples/ca-eccc-msc-gdc.global-discovery-catalogue.json
@@ -114,7 +114,7 @@
                 ],
                 "links": [
                     {
-                        "rel": "canonical",
+                        "rel": "about",
                         "type": "text/html",
                         "href": "https://www.canada.ca/en/environment-climate-change.html"
                     }
@@ -132,39 +132,11 @@
         ]
     },
     "links": [
-        {
-            "rel": "data",
-            "type": "text/html",
-            "title": "WMO WIS Global Cache - Deutscher Wetterdienst (Cached files < 24h during pilot)",
-            "href": "https://opendata.dwd.de/test/wis2/cache"
-        },
         {
             "rel": "archives",
             "type": "text/html",
             "title": "Open Data Server DWD (Metadata Archive)",
-            "href": "https://opendata.dwd.de/test/wis2/cache_metadata"
-        },
-        {
-            "rel": "related",
-            "type": "application/json",
-            "title": "WMO WIS2 Global Broker - M\u00e9t\u00e9o-France",
-            "href": "mqtts://everyone:everyone@globalbroker.meteo.fr:8883",
-            "channel": "cache/a/wis2/#",
-            "distribution": {
-                "maxMSGsize": 4096,
-                "unit": "bytes"
-            }
-        },
-        {
-            "rel": "related",
-            "type": "application/json",
-            "title": "WMO WIS Global Broker - China Meteorological Administration",
-            "href": "mqtt://everyone:everyone@gb.wis.cma.cn:1883",
-            "channel": "cache/a/wis2/#",
-            "distribution": {
-                "maxMSGsize": 4096,
-                "unit": "bytes"
-            }
+            "href": "https://example.org/cache_metadata"
         }
     ]
 }
diff --git a/examples/ca-eccc-msc.surface-weather-observations-realtime.json b/examples/ca-eccc-msc.surface-weather-observations-realtime.json
index be80a84..eba07ab 100644
--- a/examples/ca-eccc-msc.surface-weather-observations-realtime.json
+++ b/examples/ca-eccc-msc.surface-weather-observations-realtime.json
@@ -108,7 +108,7 @@
                 ],
                 "links": [
                     {
-                        "rel": "canonical",
+                        "rel": "about",
                         "type": "text/html",
                         "href": "https://www.canada.ca/en/environment-climate-change.html"
                     }
@@ -145,7 +145,7 @@
             "title": "Data access API interface"
         },
         {
-            "rel": "related",
+            "rel": "about",
             "href": "https://eccc-msc.github.io/open-data/msc-data/obs_station/readme_obs_insitu_swobdatamart_en",
             "type": "text/html",
             "title": "Documentation"
@@ -153,7 +153,7 @@
         {
             "rel": "items",
             "href": "mqtts://example.org",
-            "channel": "origin/a/wis2/ca-eccc-msc/data/core/weather/observations/surface-land/landFixed",
+            "channel": "origin/a/wis2/ca-eccc-msc/data/core/weather/surface-based-observations/synop",
             "type": "application/json",
             "title": "Data notifications"
         }
diff --git a/examples/cn-cma-nmic.prediction-forecast.json b/examples/cn-cma-babj.nmic.prediction-forecast.json
similarity index 67%
rename from examples/cn-cma-nmic.prediction-forecast.json
rename to examples/cn-cma-babj.nmic.prediction-forecast.json
index 447415e..9471ac1 100644
--- a/examples/cn-cma-nmic.prediction-forecast.json
+++ b/examples/cn-cma-babj.nmic.prediction-forecast.json
@@ -46,51 +46,43 @@
                 "concepts": [
                     {
                         "id": "weather",
-                        "title": "Weather",
-                        "url": "https://codes.wmo.int/topic-hierarchy/earth-system-discipline/weather"
+                        "title": "Weather"
                     },
                     {
                         "id": "climate",
-                        "title": "Climate",
-                        "url": "https://codes.wmo.int/topic-hierarchy/earth-system-discipline/climate"
+                        "title": "Climate"
                     },
                     {
                         "id": "hydrology",
-                        "title": "Hydrology",
-                        "url": "https://codes.wmo.int/topic-hierarchy/earth-system-discipline/hydrology"
+                        "title": "Hydrology"
                     },
                     {
                         "id": "atmospheric-composition",
-                        "title": "Atmospheric Composition",
-                        "url": "https://codes.wmo.int/topic-hierarchy/earth-system-discipline/atmospheric-composition"
+                        "title": "Atmospheric Composition"
                     },
                     {
                         "id": "cryosphere",
-                        "title": "Cryosphere",
-                        "url": "https://codes.wmo.int/topic-hierarchy/earth-system-discipline/cryosphere"
+                        "title": "Cryosphere"
                     },
                     {
                         "id": "ocean",
-                        "title": "Ocean",
-                        "url": "https://codes.wmo.int/topic-hierarchy/earth-system-discipline/ocean"
+                        "title": "Ocean"
                     },
                     {
                         "id": "space-weather",
-                        "title": "Space Weather",
-                        "url": "https://codes.wmo.int/topic-hierarchy/earth-system-discipline/space-weather"
+                        "title": "Space Weather"
                     }
                 ],
-                "scheme": "https://codes.wmo.int/topic-hierarchy/earth-system-discipline"
+                "scheme": "https://github.com/wmo-im/wis2-topic-hierarchy/blob/main/topic-hierarchy/earth-system-discipline/index.csv"
             },
             {
                 "concepts": [
                     {
                         "id": "global-broker",
-                        "title": "Global Broker",
-                        "url": "https://codes.wmo.int/wis/global-service-type/global-broker"
+                        "title": "Global Broker"
                     }
                 ],
-                "scheme": "https://codes.wmo.int/wis/global-service-type"
+                "scheme": "https://github.com/wmo-im/wcmp2-codelists/blob/main/codelists/global-service-type.csv"
             }
         ],
         "contacts": [
@@ -152,17 +144,10 @@
         },
         {
             "rel": "items",
-            "channel": "cache/a/wis2/#",
-            "type": "application/json",
-            "title": "Data notifications - WMO WIS2 Global Broker - MF",
-            "href": "mqtts://everyone:everyone@globalbroker.meteo.fr:8883"
-        },
-        {
-            "rel": "items",
-            "channel": "cache/a/wis2/#",
+            "channel": "origin/a/wis2/cn-cma-babj/weather/prediction/forecast/#",
             "type": "application/json",
             "title": "Data notifications - WMO WIS Global Broker - CMA",
-            "href": "mqtt://everyone:everyone@gb.wis.cma.cn:1883"
+            "href": "mqtts://everyone:everyone@example.org:8883"
         }
     ]
 }
diff --git a/examples/cn-cma-nmic.surface-based-observations.json b/examples/cn-cma-babj.nmic.surface-based-observations.json
similarity index 81%
rename from examples/cn-cma-nmic.surface-based-observations.json
rename to examples/cn-cma-babj.nmic.surface-based-observations.json
index bf36ad5..0d92002 100644
--- a/examples/cn-cma-nmic.surface-based-observations.json
+++ b/examples/cn-cma-babj.nmic.surface-based-observations.json
@@ -46,16 +46,15 @@
                 "concepts": [
                     {
                         "id": "weather",
-                        "title": "Weather",
-                        "url": "https://codes.wmo.int/topic-hierarchy/earth-system-discipline/weather"
+                        "title": "Weather"
                     }
                 ],
-                "scheme": "https://codes.wmo.int/topic-hierarchy/earth-system-discipline"
+                "scheme": "https://github.com/wmo-im/wis2-topic-hierarchy/blob/main/topic-hierarchy/earth-system-discipline/weather/index.csv"
             }
         ],
         "contacts": [
             {
-                "name": "GISC Beijing",
+                "name": "GISC Beijing Team",
                 "organization": "China Meteorological Administration (CMA); National Meteorological Information Center (NMIC)",
                 "phones": [
                     {
@@ -110,19 +109,12 @@
             "title": "Raw data download (bufr4)",
             "href": "https://wisdev.kishou.go.jp/data/wis2/chn/babj/data/core/weather/surface-based-observations/synop/"
         },
-        {
-            "rel": "items",
-            "channel": "cache/a/wis2/#",
-            "type": "application/json",
-            "title": "Data notifications - WMO WIS2 Global Broker - MF",
-            "href": "mqtts://everyone:everyone@globalbroker.meteo.fr:8883"
-        },
         {
             "rel": "items",
             "channel": "cache/a/wis2/#",
             "type": "application/json",
             "title": "Data notifications - WMO WIS Global Broker - CMA",
-            "href": "mqtt://everyone:everyone@gb.wis.cma.cn:1883"
+            "href": "mqtts://everyone:everyone@example.org:8883"
         }
     ]
 }
diff --git a/examples/de-dwd.global-cache.json b/examples/de-dwd.global-cache.json
index eddaec9..a192e2f 100644
--- a/examples/de-dwd.global-cache.json
+++ b/examples/de-dwd.global-cache.json
@@ -4,12 +4,7 @@
     "conformsTo": [
         "http://wis.wmo.int/spec/wcmp/2/conf/core"
     ],
-    "time": {
-        "interval": [
-            "2024-01-01T00:00:00Z",
-            ".."
-        ]
-    },
+    "time": null,
     "geometry": {
         "type": "Polygon",
         "coordinates": [
@@ -153,14 +148,7 @@
         "keywords": [
             "WIS2",
             "Global Cache"
-        ],
-        "externalIds": [
-            {
-                "scheme": "DWD",
-                "value": "de.dwd.globalcache"
-            }
-        ],
-        "language": "eng"
+        ]
     },
     "links": [
         {
@@ -178,7 +166,7 @@
         {
             "rel": "items",
             "channel": "cache/a/wis2",
-            "href": "mqtts://everyone:everyone@wis2.dwd.de:8883",
+            "href": "mqtts://everyone:everyone@example.org:8883",
             "type": "application/json",
             "title": "Data notifications"
         }
diff --git a/examples/de-dwd.icon-eps-all.json b/examples/de-dwd.icon-eps-all.json
index c428c04..b938fda 100644
--- a/examples/de-dwd.icon-eps-all.json
+++ b/examples/de-dwd.icon-eps-all.json
@@ -198,7 +198,7 @@
         {
             "rel": "items",
             "channel": "origin/a/wis2/de-dwd/data/core/weather/prediction/forecast/medium-range",
-            "href": "mqtts://everyone:everyone@wis2.dwd.de:8883",
+            "href": "mqtts://everyone:everyone@example.org:8883",
             "type": "application/json",
             "title": "Data notifications"
         }
diff --git a/examples/de-dwd.surface-weather-observations-realtime.json b/examples/de-dwd.surface-weather-observations-realtime.json
index fd4a28b..3c2e804 100644
--- a/examples/de-dwd.surface-weather-observations-realtime.json
+++ b/examples/de-dwd.surface-weather-observations-realtime.json
@@ -126,7 +126,7 @@
 	{
             "rel": "items",
             "channel": "origin/a/wis2/de-dwd/data/core/weather/surface-based-observations/synop",
-            "href": "mqtts://everyone:everyone@wis2.dwd.de:8883",
+            "href": "mqtts://everyone:everyone@example.org:8883",
             "type": "application/json",
             "title": "Data notifications"
         }
diff --git a/examples/fr-meteo-france.global-broker.json b/examples/fr-meteo-france.global-broker.json
index cd132ed..d60d17b 100644
--- a/examples/fr-meteo-france.global-broker.json
+++ b/examples/fr-meteo-france.global-broker.json
@@ -130,22 +130,10 @@
     },
     "links": [
         {
-            "rel": "data",
-            "type": "text/html",
-            "title": "WMO WIS Global Cache - Deutscher Wetterdienst (Cached files < 24h during pilot)",
-            "href": "https://opendata.dwd.de/test/wis2/cache"
-        },
-        {
-            "rel": "archives",
-            "type": "text/html",
-            "title": "Open Data Server DWD (Metadata Archive)",
-            "href": "https://opendata.dwd.de/test/wis2/cache_metadata"
-        },
-        {
-            "rel": "related",
+            "rel": "items",
             "type": "application/json",
             "title": "WMO WIS2 Global Broker - M\u00e9t\u00e9o-France",
-            "href": "mqtts://everyone:everyone@globalbroker.meteo.fr:8883",
+            "href": "mqtts://everyone:everyone@example.org:8883",
             "channel": "cache/a/wis2/#",
             "distribution": {
                 "maxMSGsize": 4096,
@@ -156,7 +144,7 @@
             "rel": "related",
             "type": "application/json",
             "title": "WMO WIS Global Broker - China Meteorological Administration",
-            "href": "mqtt://everyone:everyone@gb.wis.cma.cn:1883",
+            "href": "mqtts://everyone:everyone@example.org:8883",
             "channel": "cache/a/wis2/#",
             "distribution": {
                 "maxMSGsize": 4096,
diff --git a/examples/us-noaa-nws.gfs-10deg.json b/examples/us-noaa-nws.gfs-10deg.json
index 29c06f5..aa6cfc1 100644
--- a/examples/us-noaa-nws.gfs-10deg.json
+++ b/examples/us-noaa-nws.gfs-10deg.json
@@ -41,6 +41,7 @@
         "created": "2022-06-23T18:36:00Z",
         "updated": "2022-06-23T18:36:00Z",
         "wmo:dataPolicy": "core",
+        "rights": "access",
         "type": "dataset",
         "title": "Global Forecast System 1 Degree Resolution",
         "description": "The Global Forecast System is a weather forecast model produced by the National Centers for Environmental Prediction.",
@@ -50,13 +51,10 @@
             "Tropopause",
             "Atmospheric Pressure Measurements",
             "Pressure Thickness",
-            "Sea Level Pressure",
             "Surface Pressure",
             "Land Cover",
             "Soil Moisture/Water Content",
-            "Soil Temperature",
             "Sea Surface Temperature",
-            "Albedo",
             "Incoming Solar Radiation",
             "Longwave Radiation",
             "Outgoing Longwave Radiation",
@@ -66,7 +64,6 @@
             "Atmospheric Stability",
             "Boundary Layer Temperature",
             "Dew Point Temperature",
-            "Surface Temperature",
             "Upper Air Temperature",
             "Water Vapor Processes",
             "Water Vapor Indicators",
@@ -81,8 +78,6 @@
             "Precipitation Rate",
             "Liquid Precipitation",
             "Solid Precipitation",
-            "Snow Cover",
-            "Snow Depth",
             "Sea Ice Concentration",
             "Land Use/Land Cover Classification",
             "Prediction",
@@ -122,8 +117,6 @@
             "middle_cloud_layer",
             "middle_cloud_top_level",
             "nominal_top_of_the_atmosphere",
-            "absolute_vorticity",
-            "albedo",
             "apparent_temperature",
             "best_(4_layer)_lifted_index",
             "categorical_freezing_rain_(yes=1;_no=0)",
@@ -200,13 +193,8 @@
             "u-component_storm_motion",
             "upward_long-wave_radiation_flux",
             "upward_short-wave_radiation_flux",
-            "v-component_of_wind",
-            "v-component_storm_motion",
-            "vegetation",
             "ventilation_rate",
             "vertical_speed_shear",
-            "vertical_velocity_(geometric)",
-            "vertical_velocity_(pressure)",
             "visibility",
             "volumetric_soil_moisture_content",
             "water_equivalent_of_accumulated_snow_depth",
@@ -220,18 +208,61 @@
             "weatherForecasts",
             "meteorology"
         ],
-        "keywordsCodespace": "http://codes.wmo.int/306/4678",
         "language": "en",
         "themes": [
             {
                 "concepts": [
                     {
-                        "id": "weather",
-                        "title": "Weather",
-                        "url": "https://codes.wmo.int/topic-hierarchy/earth-system-discipline/weather"
+                        "id": "weather"
+                    }
+                ],
+                "scheme": "https://github.com/wmo-im/wis2-topic-hierarchy/blob/main/topic-hierarchy/earth-system-discipline/index.csv"
+            },
+            {
+                "concepts": [
+                    {
+                        "id": "TODO - find a keyword matching old keywordsCodespace"
+                    }
+                ],
+                "scheme": "http://codes.wmo.int/306/4678"
+            },
+            {
+                "concepts": [
+                    {
+                        "id": "Absolute vorticity"
+                    },
+                    {
+                        "id": "Albedo"
+                    },
+                    {
+                        "id": "Pressure reduced to MSL"
+                    },
+                    {
+                        "id": "Snow cover"
+                    },
+                    {
+                        "id": "Snow depth"
+                    },
+                    {
+                        "id": "Soil temperature"
+                    },
+                    {
+                        "id": "v-component of wind"
+                    },
+                    {
+                        "id": "v-component storm motion"
+                    },
+                    {
+                        "id": "Vegetation"
+                    },
+                    {
+                        "id":"Vertical velocity (geometric))"
+                    },
+                    {
+                        "id":"Vertical velocity (pressure)"
                     }
                 ],
-                "scheme": "https://codes.wmo.int/topic-hierarchy/earth-system-discipline"
+                "scheme": "https://codes.wmo.int/grib2/codeflag/_4.2"
             }
         ],
         "contacts": [
@@ -260,9 +291,10 @@
                 ],
                 "links": [
                     {
-                        "href": "https://nomads.ncep.noaa.gov/pub/data/nccf/com/gfs/prod/",
-                        "rel": "canonical",
-                        "type": "text/html"
+                        "href": "https://nomads.ncep.noaa.gov/info.php?page=documents",
+                        "rel": "about",
+                        "type": "text/html",
+                        "title": "NOMADS Documents"
                     }
                 ],
                 "contactInstructions": "email",
@@ -271,12 +303,7 @@
                     "producer"
                 ]
             }
-        ],
-        "formats": [
-            "GRIB2"
-        ],
-        "license": "http://codes.wmo.int/wmdr/DataPolicy/_WMOOther",
-        "rights": "access"
+        ]
     },
     "links": [
         {