eodag 3.0.1__py3-none-any.whl → 3.1.0__py3-none-any.whl

eodag/resources/providers.yml

@@ -55,31 +55,22 @@
     # see also https://dds.cr.usgs.gov/ee-data/coveragemaps/shp/ee/
     LANDSAT_C2L1:
       dataset: landsat_ot_c2_l1
-      output_extension: .tar.gz
     LANDSAT_C2L2:
       dataset: landsat_ot_c2_l2
-      output_extension: .tar.gz
     LANDSAT_TM_C1:
       dataset: landsat_tm_c1
-      output_extension: .tar.gz
     LANDSAT_TM_C2L1:
       dataset: landsat_tm_c2_l1
-      output_extension: .tar.gz
     LANDSAT_TM_C2L2:
       dataset: landsat_tm_c2_l2
-      output_extension: .tar.gz
     LANDSAT_ETM_C1:
       dataset: landsat_etm_c1
-      output_extension: .tar.gz
     LANDSAT_ETM_C2L1:
       dataset: landsat_etm_c2_l1
-      output_extension: .tar.gz
     LANDSAT_ETM_C2L2:
       dataset: landsat_etm_c2_l2
-      output_extension: .tar.gz
     S2_MSI_L1C:
       dataset: SENTINEL_2A
-      output_extension: .zip
     GENERIC_PRODUCT_TYPE:
       dataset: '{productType}'
 
@@ -1260,315 +1251,6 @@
       productType: '{productType}'
       collection: '{collection}'
 ---
-!provider # MARK: onda
-  name: onda
-  priority: 0
-  description: Serco DIAS
-  roles:
-    - host
-  url: https://www.onda-dias.eu/cms/
-  search: !plugin
-    type: ODataV4Search
-    api_endpoint: 'https://catalogue.onda-dias.eu/dias-catalogue/Products'
-    timeout: 60
-    need_auth: false
-    ssl_verify: true
-    dont_quote:
-      - '['
-      - ']'
-      - '$'
-      - '='
-      - '&'
-      - ':'
-    pagination:
-      count_endpoint: 'https://catalogue.onda-dias.eu/dias-catalogue/Products/$count'
-      next_page_url_tpl: '{url}?{search}&$top={items_per_page}&$skip={skip}&$expand=Metadata'
-      # 2021/03/19: 2000 is the max, if greater 200 response but contains an error message
-      max_items_per_page: 2_000
-    sort:
-      sort_by_default:
-        - !!python/tuple [startTimeFromAscendingNode, ASC]
-      sort_by_tpl: '&$orderby={sort_param} {sort_order}'
-      sort_param_mapping:
-        startTimeFromAscendingNode: beginPosition
-        uid: id
-        storageStatus: offline
-      sort_order_mapping:
-        ascending: asc
-        descending: desc
-      max_sort_params: 1
-    results_entry: 'value'
-    literal_search_params:
-      $format: json
-    free_text_search_operations:
-      $search:
-        union: ' OR '
-        wrapper: '"{}"'
-        operations:
-          AND:
-            - 'footprint:"Intersects({geometry#to_rounded_wkt})"'
-            - 'productType:{productType}'
-            - 'platformName:{platform}'
-            - 'cloudCoverPercentage:[0 TO {cloudCover}]'
-            - 'beginPosition:[{startTimeFromAscendingNode#to_iso_utc_datetime} TO *]'
-            - 'endPosition:[* TO {completionTimeFromAscendingNode#to_iso_utc_datetime}]'
-            - '{id#remove_extension}'
-            - 'platformSerialIdentifier:{platformSerialIdentifier}'
-            - 'instrumentShortName:{instrument}'
-            - 'processingLevel:{processingLevel}'
-            - 'sensorType:{sensorType}'
-            - 'topicCategory:{topicCategory}'
-            - 'lineage:{lineage}'
-            - 'orbitNumber:{orbitNumber}'
-            - 'orbitDirection:{orbitDirection}'
-            - 'processingBaseline:{productVersion}'
-            - 'generalQualityFlag:{productQualityStatus}'
-            - 'sensorOperationalMode:{sensorMode}'
-            - 'tileIdentifier:{tileIdentifier}'
-    discover_metadata:
-      auto_discovery: true
-      metadata_pattern: '^[a-zA-Z0-9]+$'
-      search_param:
-        free_text_search_operations:
-          $search:
-            operations:
-              AND:
-                - '{metadata}:{{{metadata}}}'
-      metadata_path: '$.Metadata.*'
-    per_product_metadata_query: false
-    metadata_pre_mapping:
-      metadata_path: '$.Metadata'
-      metadata_path_id: 'id'
-      metadata_path_value: 'value'
-    metadata_mapping:
-      # Opensearch resource identifier within the search engine context (in our case
-      # within the context of the data provider)
-      # Queryable parameters are set with null as 1st configuration list value to mark them as queryable,
-      #   but `free_text_search_operations.$search.operations.AND` entries are then used instead.
-      uid: '$.id'
-      # OpenSearch Parameters for Collection Search (Table 3)
-      productType:
-        - null
-        - '$.Metadata.productType'
-      platform:
-        - null
-        - '$.Metadata.platformName'
-      platformSerialIdentifier:
-        - null
-        - '$.Metadata.platformSerialIdentifier'
-      instrument:
-        - null
-        - '$.Metadata.instrumentShortName'
-      processingLevel:
-        - null
-        - '$.Metadata.processingLevel'
-      sensorType:
-        - null
-        - '$.Metadata.sensorType'
-
-      # INSPIRE obligated OpenSearch Parameters for Collection Search (Table 4)
-      title: '{$.Metadata.filename#remove_extension}'
-      topicCategory:
-        - null
-        - '$.Metadata.topicCategory'
-      lineage:
-        - null
-        - '$.Metadata.lineage'
-
-      # OpenSearch Parameters for Product Search (Table 5)
-      orbitNumber:
-        - null
-        - '$.Metadata.orbitNumber'
-      orbitDirection:
-        - null
-        - '$.Metadata.orbitDirection'
-      cloudCover:
-        - null
-        - '$.Metadata.cloudCoverPercentage'
-      productVersion:
-        - null
-        - '$.Metadata.processingBaseline'
-      productQualityStatus:
-        - null
-        - '$.Metadata.generalQualityFlag'
-      creationDate: '$.Metadata.creationDate'
-      processingDate: '$.Metadata.processingDate'
-      sensorMode:
-        - null
-        - '$.Metadata.sensorOperationalMode'
-
-      # OpenSearch Parameters for Acquistion Parameters Search (Table 6)
-      startTimeFromAscendingNode:
-        - null
-        - '$.beginPosition'
-      completionTimeFromAscendingNode:
-        - null
-        - '$.endPosition'
-      polarizationChannels: '{$.Metadata.polarisationChannels#replace_str(","," ")}'
-
-      # Custom parameters (not defined in the base document referenced above)
-      id:
-        - null
-        - '{$.Metadata.filename#remove_extension}'
-      tileIdentifier:
-        - null
-        - '$.Metadata.tileIdentifier'
-      # The geographic extent of the product
-      geometry:
-        - null
-        - '$.footprint'
-      # The url of the quicklook
-      quicklook: '$.quicklook'
-      # The url to download the product "as is" (literal or as a template to be completed either after the search result
-      # is obtained from the provider or during the eodag download phase)
-      downloadLink: '%(base_uri)s({uid})/$value'
-      # storageStatus: must be one of ONLINE, STAGING, OFFLINE
-      storageStatus: '{$.offline#get_group_name((?P<ONLINE>False)|(?P<OFFLINE>True))}'
-      # Url used for ordering product if it is offline/archived
-      orderLink: 'https://catalogue.onda-dias.eu/dias-catalogue/Products({uid})/Ens.Order'
-  products:
-    # S1
-    S1_SAR_OCN:
-      productType: '*OCN*'
-      metadata_mapping:
-        cloudCover: '$.null'
-    S1_SAR_GRD:
-      productType: '*GRD*'
-      metadata_mapping:
-        cloudCover: '$.null'
-    S1_SAR_SLC:
-      productType: '*SLC*'
-      metadata_mapping:
-        cloudCover: '$.null'
-    S1_SAR_RAW:
-      productType: '*RAW*'
-      metadata_mapping:
-        cloudCover: '$.null'
-    # S2
-    S2_MSI_L1C:
-      productType: S2MSI1C
-    S2_MSI_L2A:
-      productType: S2MSI2A
-    # S3 SRAL
-    S3_SRA:
-      productType: SR_1_SRA___
-      metadata_mapping:
-        cloudCover: '$.null'
-    S3_SRA_A:
-      productType: SR_1_SRA_A_
-      metadata_mapping:
-        cloudCover: '$.null'
-    S3_SRA_BS:
-      productType: SR_1_SRA_BS
-      metadata_mapping:
-        cloudCover: '$.null'
-    S3_LAN:
-      productType: SR_2_LAN___
-      metadata_mapping:
-        cloudCover: '$.null'
-    S3_WAT:
-      productType: SR_2_WAT___
-      metadata_mapping:
-        cloudCover: '$.null'
-    # S3 OLCI
-    S3_EFR:
-      productType: OL_1_EFR___
-    S3_ERR:
-      productType: OL_1_ERR___
-    S3_OLCI_L2LFR:
-      productType: OL_2_LFR___
-    S3_OLCI_L2LRR:
-      productType: OL_2_LRR___
-    S3_OLCI_L2WRR:
-      productType: OL_2_WRR___
-    S3_OLCI_L2WFR:
-      productType: OL_2_WFR___
-    # S3 SLSTR
-    S3_SLSTR_L1RBT:
-      productType: SL_1_RBT___
-    S3_SLSTR_L2LST:
-      productType: SL_2_LST___
-    S3_SLSTR_L2WST:
-      productType: SL_2_WST___
-    S3_SLSTR_L2FRP:
-      productType: SL_2_FRP___
-    # S3 SY
-    S3_SY_AOD:
-      productType: SY_2_AOD___
-    S3_SY_SYN:
-      productType: SY_2_SYN___
-    S3_SY_V10:
-      productType: SY_2_V10___
-    S3_SY_VG1:
-      productType: SY_2_VG1___
-    S3_SY_VGP:
-      productType: SY_2_VGP___
-    # S5P L1
-    S5P_L1B_RA_BD1:
-      productType: L1B_RA_BD1
-    S5P_L1B_RA_BD2:
-      productType: L1B_RA_BD2
-    S5P_L1B_RA_BD3:
-      productType: L1B_RA_BD3
-    S5P_L1B_RA_BD4:
-      productType: L1B_RA_BD4
-    S5P_L1B_RA_BD5:
-      productType: L1B_RA_BD5
-    S5P_L1B_RA_BD6:
-      productType: L1B_RA_BD6
-    S5P_L1B_RA_BD7:
-      productType: L1B_RA_BD7
-    S5P_L1B_RA_BD8:
-      productType: L1B_RA_BD8
-    # S5P L2
-    S5P_L2_NO2:
-      productType: L2__NO2___
-    S5P_L2_CLOUD:
-      productType: L2__CLOUD_
-    S5P_L2_O3:
-      productType: L2__O3____
-    S5P_L2_CO:
-      productType: L2__CO____
-    S5P_L2_AER_AI:
-      productType: L2__AER_AI
-    S5P_L2_O3_PR:
-      productType: L2__O3__PR
-    S5P_L2_AER_LH:
-      productType: L2__AER_LH
-    S5P_L2_HCHO:
-      productType: L2__HCHO__
-    S5P_L2_CH4:
-      productType: L2__CH4___
-    S5P_L2_NP_BD3:
-      productType: L2__NP_BD3
-    S5P_L2_NP_BD6:
-      productType: L2__NP_BD6
-    S5P_L2_NP_BD7:
-      productType: L2__NP_BD7
-    S5P_L2_SO2:
-      productType: L2__SO2___
-    # Landsat
-    L8_OLI_TIRS_C1L1:
-      platform: 'Landsat-*'
-    GENERIC_PRODUCT_TYPE:
-      productType: '{productType}'
-      platform: '{platform}'
-  download: !plugin
-    type: HTTPDownload
-    # base_uri used to parse downloadLink
-    base_uri: 'https://catalogue.onda-dias.eu/dias-catalogue/Products'
-    extract: true
-    archive_depth: 2
-    auth_error_code: 401
-    order_enabled: true
-    order_method: 'POST'
-    ssl_verify: true
-    order_headers:
-      Content-Type: application/json
-  auth: !plugin
-    type: GenericAuth
-
----
 !provider # MARK: usgs_satapi_aws
   name: usgs_satapi_aws
   priority: 0
@@ -1869,15 +1551,13 @@
   url: https://www.ecmwf.int
   api: !plugin
     type: EcmwfApi
-    api_endpoint: https://api.ecmwf.int/v1
+    auth_endpoint: https://api.ecmwf.int/v1
     metadata_mapping:
-      productType: '$.productType'
-      title: '$.id'
+      productType: $.productType
       startTimeFromAscendingNode: '{$.startTimeFromAscendingNode#to_iso_date}'
       completionTimeFromAscendingNode:
         - 'date={startTimeFromAscendingNode#to_iso_date}/to/{completionTimeFromAscendingNode#to_iso_date(-1,)}'
         - '{$.completionTimeFromAscendingNode#to_iso_date}'
-      id: '$.id'
       # The geographic extent of the product
       geometry:
         - 'area={geometry#to_nwse_bounds_str(/)}'
@@ -1885,186 +1565,8 @@
       defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
       # storageStatus set to ONLINE for consistency between providers
       storageStatus: '{$.null#replace_str("Not Available","ONLINE")}'
-      downloadLink: 'https://apps.ecmwf.int/datasets/data/{dataset}'
-      # ECMWF/MARS specific parameters
-      # Full list here https://confluence.ecmwf.int/display/UDOC/Keywords+in+MARS+and+Dissemination+requests
-      accuracy:
-        - accuracy
-        - '$.accuracy'
-      anoffset:
-        - anoffset
-        - '$.anoffset'
-      bitmap:
-        - bitmap
-        - '$.bitmap'
-      block:
-        - block
-        - '$.block'
-      channel:
-        - channel
-        - '$.channel'
-      class:
-        - class
-        - '$.class'
-      database:
-        - database
-        - '$.database'
-      dataset:
-        - dataset
-        - '$.dataset'
-      diagnostic:
-        - diagnostic
-        - '$.diagnostic'
-      direction:
-        - direction
-        - '$.direction'
-      domain:
-        - domain
-        - '$.domain'
-      duplicates:
-        - duplicates
-        - '$.duplicates'
-      expect:
-        - expect
-        - '$.expect'
-      expver:
-        - expver
-        - '$.expver'
-      fcmonth:
-        - fcmonth
-        - '$.fcmonth'
-      fcperiod:
-        - fcperiod
-        - '$.fcperiod'
-      fieldset:
-        - fieldset
-        - '$.fieldset'
-      filter:
-        - filter
-        - '$.filter'
-      format:
-        - format
-        - '$.format'
-      frame:
-        - frame
-        - '$.frame'
-      frequency:
-        - frequency
-        - '$.frequency'
-      grid:
-        - grid
-        - '$.grid'
-      hdate:
-        - hdate
-        - '$.hdate'
-      ident:
-        - ident
-        - '$.ident'
-      interpolation:
-        - interpolation
-        - '$.interpolation'
-      intgrid:
-        - intgrid
-        - '$.intgrid'
-      iteration:
-        - iteration
-        - '$.iteration'
-      latitude:
-        - latitude
-        - '$.latitude'
-      levelist:
-        - levelist
-        - '$.levelist'
-      levtype:
-        - levtype
-        - '$.levtype'
-      longitude:
-        - longitude
-        - '$.longitude'
-      lsm:
-        - lsm
-        - '$.lsm'
-      method:
-        - method
-        - '$.method'
-      number:
-        - number
-        - '$.number'
-      obsgroup:
-        - obsgroup
-        - '$.obsgroup'
-      obstype:
-        - obstype
-        - '$.obstype'
-      origin:
-        - origin
-        - '$.origin'
-      packing:
-        - packing
-        - '$.packing'
-      padding:
-        - padding
-        - '$.padding'
-      param:
-        - param
-        - '$.param'
-      priority:
-        - priority
-        - '$.priority'
-      product:
-        - product
-        - '$.product'
-      range:
-        - range
-        - '$.range'
-      refdate:
-        - refdate
-        - '$.refdate'
-      reference:
-        - reference
-        - '$.reference'
-      reportype:
-        - reportype
-        - '$.reportype'
-      repres:
-        - repres
-        - '$.repres'
-      resol:
-        - resol
-        - '$.resol'
-      rotation:
-        - rotation
-        - '$.rotation'
-      section:
-        - section
-        - '$.section'
-      source:
-        - source
-        - '$.source'
-      step:
-        - step
-        - '$.step'
-      stream:
-        - stream
-        - '$.stream'
-      system:
-        - system
-        - '$.system'
-      target:
-        - target
-        - '$.target'
-      time:
-        - time
-        - '$.time'
-      truncation:
-        - truncation
-        - '$.truncation'
-      type:
-        - type
-        - '$.type'
-      use:
-        - use
-        - '$.use'
+      qs: $.qs
+      downloadLink: 'https://apps.ecmwf.int/datasets/data/{dataset}?{qs#to_geojson}'
   products:
     # See Archive Catalog in https://apps.ecmwf.int/archive-catalogue/
     # See available Public Datasets in https://apps.ecmwf.int/datasets/
@@ -2074,7 +1576,7 @@
       expver: prod
       type: cf
       levtype: sfc
-      origin: ecmf
+      origin: ecmwf
       grid: 0.5/0.5
       param: 59/134/136/146/147/151/165/166/167/168/172/176/177/179/189/235/228002/228039/228139/228141/228144/228164/228228
       step: 0
@@ -2100,7 +1602,7 @@
       - '{$.completionTimeFromAscendingNode#to_iso_date}'
   auth: !plugin
     type: HTTPHeaderAuth
-    matching_url: https://ads-beta.atmosphere.copernicus.eu
+    matching_url: https://ads.atmosphere.copernicus.eu
     ssl_verify: true
     headers:
       PRIVATE-TOKEN: "{apikey}"
@@ -2108,15 +1610,14 @@
     type: HTTPDownload
     timeout: 30
     ssl_verify: true
-    extract: false
     auth_error_code: 401
     order_enabled: true
     order_method: POST
     order_on_response:
       metadata_mapping:
         orderId: $.json.jobID
-        orderStatusLink: https://ads-beta.atmosphere.copernicus.eu/api/retrieve/v1/jobs/{orderId}
-        searchLink: https://ads-beta.atmosphere.copernicus.eu/api/retrieve/v1/jobs/{orderId}/results
+        orderStatusLink: https://ads.atmosphere.copernicus.eu/api/retrieve/v1/jobs/{orderId}
+        searchLink: https://ads.atmosphere.copernicus.eu/api/retrieve/v1/jobs/{orderId}/results
     order_status:
       request:
         method: GET
@@ -2130,216 +1631,78 @@
         need_search: true
         metadata_mapping:
           downloadLink: $.json.asset.value.href
-    products:
-      CAMS_GAC_FORECAST:
-        output_extension: .grib
-      CAMS_GFE_GFAS:
-        output_extension: .grib
-      CAMS_EU_AIR_QUALITY_FORECAST:
-        output_extension: .grib
-      CAMS_EU_AIR_QUALITY_RE:
-        output_extension: .zip
-        extract: true
-      CAMS_GRF:
-        output_extension: .zip
-        extract: true
-      CAMS_GRF_AUX:
-        output_extension: .zip
-        extract: true
-      CAMS_SOLAR_RADIATION:
-        output_extension: .csv
-      CAMS_GREENHOUSE_EGG4_MONTHLY:
-        output_extension: .grib
-      CAMS_GREENHOUSE_EGG4:
-        output_extension: .grib
-      CAMS_GREENHOUSE_INVERSION:
-        output_extension: .grib
-      CAMS_GLOBAL_EMISSIONS:
-        output_extension: .zip
-        extract: true
-      CAMS_EAC4:
-        output_extension: .grib
-      CAMS_EAC4_MONTHLY:
-        output_extension: .grib
   search: !plugin
-    type: BuildSearchResult
+    type: ECMWFSearch
     ssl_verify: true
     end_date_excluded: false
+    dates_required: true
     remove_from_query:
       - dataset
     discover_queryables:
       fetch_url: null
       product_type_fetch_url: null
-    constraints_file_url: "https://ads-beta.atmosphere.copernicus.eu/api/catalogue/v1/collections/{dataset}/constraints.json"
+      constraints_url: "https://ads.atmosphere.copernicus.eu/api/catalogue/v1/collections/{dataset}/constraints.json"
+      form_url: https://ads.atmosphere.copernicus.eu/api/catalogue/v1/collections/{dataset}/form.json
     metadata_mapping:
-      productType: '$.productType'
-      title: '$.id'
+      productType: $.productType
       startTimeFromAscendingNode: '{$.startTimeFromAscendingNode#to_iso_date}'
       completionTimeFromAscendingNode:
         - 'date={startTimeFromAscendingNode#to_iso_date}/{completionTimeFromAscendingNode#to_iso_date}'
         - '{$.completionTimeFromAscendingNode#to_iso_date}'
-      _date: '{startTimeFromAscendingNode}/{completionTimeFromAscendingNode}'
-      id: '$.id'
       # The geographic extent of the product
       geometry:
         - '{{"area": {geometry#to_nwse_bounds}}}'
-        - '$.geometry'
-      defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-      storageStatus: '{$.null#replace_str("Not Available","OFFLINE")}'
-      downloadLink: '$.null'
+        - $.geometry
       qs: $.qs
-      orderLink: 'https://ads-beta.atmosphere.copernicus.eu/api/retrieve/v1/processes/{dataset}/execution?{{"inputs": {qs#to_geojson}}}'
-      # Copernicus ADS specific parameters
-      aerosol_type:
-        - aerosol_type
-        - '$.aerosol_type'
-      altitude:
-        - altitude
-        - '$.altitude'
-      api_product_type:
-        - product_type
-        - '$.api_product_type'
-      band:
-        - band
-        - '$.band'
-      dataset:
-        - dataset
-        - '$.dataset'
-      day:
-        - day
-        - '$.day'
-      forcing_type:
-        - forcing_type
-        - '$.forcing_type'
-      format:
-        - data_format
-        - '$.format'
-      input_observations:
-        - input_observations
-        - '$.input_observations'
-      latitude:
-        - '{{"location": {{"latitude": {latitude}, "longitude": {longitude}}}}}'
-        - '$.latitude'
-      level:
-        - level
-        - '$.level'
-      leadtime_hour:
-        - leadtime_hour
-        - '$.leadtime_hour'
-      levtype:
-        - levtype
-        - '$.levtype'
-      location:
-        - location
-        - '$.location'
-      longitude:
-        - '{{"location": {{"latitude": {latitude}, "longitude": {longitude}}}}}'
-        - '$.longitude'
-      model:
-        - model
-        - '$.model'
-      model_level:
-        - model_level
-        - '$.model_level'
-      month:
-        - month
-        - '$.month'
-      param:
-        - param
-        - '$.param'
-      pressure_level:
-        - pressure_level
-        - '$.pressure_level'
-      product:
-        - product
-        - '$.product'
-      sky_type:
-        - sky_type
-        - '$.sky_type'
-      source:
-        - source
-        - '$.source'
-      step:
-        - step
-        - '$.step'
-      target:
-        - target
-        - '$.target'
-      time:
-        - time
-        - '$.time'
-      time_aggregation:
-        - time_aggregation
-        - '$.time_aggregation'
-      time_reference:
-        - time_reference
-        - '$.time_reference'
-      time_step:
-        - time_step
-        - '$.time_step'
-      type:
-        - type
-        - '$.type'
-      variable:
-        - variable
-        - '$.variable'
-      version:
-        - version
-        - '{$.version#to_geojson}'
-      quantity:
-        - quantity
-        - '$.quantity'
-      year:
-        - year
-        - '$.year'
+      orderLink: 'https://ads.atmosphere.copernicus.eu/api/retrieve/v1/processes/{dataset}/execution?{{"inputs": {qs#to_geojson}}}'
   products:
     # See available Public Datasets in https://ads.atmosphere.copernicus.eu/cdsapp#!/search?type=dataset
     CAMS_GAC_FORECAST:
       dataset: cams-global-atmospheric-composition-forecasts
       type: forecast
-      format: grib
-      variable: ammonium_aerosol_optical_depth_550nm
-      time: '00:00'
-      leadtime_hour: '0'
+      data_format: grib
+      variable: 10m_u_component_of_wind
+      time: 00:00
+      leadtime_hour: 0
     CAMS_GFE_GFAS:
       dataset: cams-global-fire-emissions-gfas
-      format: grib
-      variable: altitude_of_plume_bottom
+      data_format: grib
+      variable: wildfire_combustion_rate
     CAMS_EU_AIR_QUALITY_FORECAST:
       dataset: cams-europe-air-quality-forecasts
       model: ensemble
-      format: grib
+      data_format: grib
       variable: ammonia
       type: forecast
-      time: '00:00'
-      level: '0'
-      leadtime_hour: '0'
+      time: 00:00
+      level: 0
+      leadtime_hour: 0
     CAMS_EU_AIR_QUALITY_RE:
       dataset: cams-europe-air-quality-reanalyses
       type: validated_reanalysis
-      format: zip
+      data_format: zip
       variable: nitrogen_dioxide
       model: ensemble
-      level: '0'
+      level: 0
       metadata_mapping:
         <<: *month_year
     CAMS_GRF:
       dataset: cams-global-radiative-forcings
-      format: zip
+      data_format: zip
       variable: radiative_forcing_of_carbon_dioxide
       forcing_type: instantaneous
       band: long_wave
       sky_type: all_sky
       level: surface
-      version: '2'
+      version: 2
       metadata_mapping:
         <<: *month_year
     CAMS_GRF_AUX:
       dataset: cams-global-radiative-forcing-auxilliary-variables
       band: short_wave
       sky_type: clear_sky
-      version: '1.5'
-      format: zip
+      version: 1.5
+      data_format: zip
       variable: aerosol_radiation_effect
       aerosol_type: marine
       level: surface
@@ -2355,18 +1718,25 @@
         longitude: 0
       altitude: -999
       format: csv
+      metadata_mapping:
+        latitude:
+          - '{{"location": {{"latitude": {"latitude"}, "longitude": {"longitude"}}}}}'
+          - $."latitude"
+        longitude:
+          - '{{"location": {{"latitude": {"latitude"}, "longitude": {"longitude"}}}}}'
+          - $."longitude"
     CAMS_GREENHOUSE_EGG4_MONTHLY:
       dataset: cams-global-ghg-reanalysis-egg4-monthly
-      format: grib
+      data_format: grib
       variable: snow_albedo
-      api_product_type: monthly_mean
+      product_type: monthly_mean
       metadata_mapping:
         <<: *month_year
     CAMS_GREENHOUSE_EGG4:
       dataset: cams-global-ghg-reanalysis-egg4
-      format: grib
+      data_format: grib
       variable: snow_albedo
-      step: '0'
+      step: 0
     CAMS_GREENHOUSE_INVERSION:
       dataset: cams-global-greenhouse-gas-inversion
       version: latest
@@ -2379,7 +1749,7 @@
     CAMS_GLOBAL_EMISSIONS:
       dataset: cams-global-emission-inventories
       version: latest
-      format: zip
+      data_format: zip
       variable: acids
       source: anthropogenic
       metadata_mapping:
@@ -2391,14 +1761,14 @@
           - '{$.completionTimeFromAscendingNode#to_iso_date}'
     CAMS_EAC4:
       dataset: cams-global-reanalysis-eac4
-      format: grib
-      variable: '2m_dewpoint_temperature'
-      time: '00:00'
+      data_format: grib
+      variable: 2m_dewpoint_temperature
+      time: 00:00
     CAMS_EAC4_MONTHLY:
       dataset: cams-global-reanalysis-eac4-monthly
-      format: grib
+      data_format: grib
       variable: 2m_dewpoint_temperature
-      api_product_type: monthly_mean
+      product_type: monthly_mean
       metadata_mapping:
         <<: *month_year
     GENERIC_PRODUCT_TYPE:
@@ -2410,8 +1780,17 @@
   description: Copernicus Climate Data Store
   roles:
     - host
-  url: https://cds-beta.climate.copernicus.eu
+  url: https://cds.climate.copernicus.eu
   # anchors to avoid duplications
+  anchor_day_month_year: &nday_month_year
+    completionTimeFromAscendingNode:
+      - |
+        {{
+          "year": {_date#interval_to_datetime_dict}["year"],
+          "month": {_date#interval_to_datetime_dict}["month"],
+          "nominal_day": {_date#interval_to_datetime_dict}["day"]
+        }}
+      - '{$.completionTimeFromAscendingNode#to_iso_date}'
   anchor_day_month_year: &day_month_year
     completionTimeFromAscendingNode:
       - |
@@ -2421,7 +1800,7 @@
           "day": {_date#interval_to_datetime_dict}["day"]
         }}
       - '{$.completionTimeFromAscendingNode#to_iso_date}'
-  anchor_day_month_year_time: &day_month_year_time
+  anchor_time_day_month_year: &time_day_month_year
     completionTimeFromAscendingNode:
       - |
         {{
@@ -2439,7 +1818,7 @@
         "month": {_date#interval_to_datetime_dict}["month"]
       }}
     - '{$.completionTimeFromAscendingNode#to_iso_date}'
-  anchor_month_year_time: &month_year_time
+  anchor_time_month_year: &time_month_year
     completionTimeFromAscendingNode:
       - |
         {{
@@ -2450,7 +1829,7 @@
       - '{$.completionTimeFromAscendingNode#to_iso_date}'
   auth: !plugin
     type: HTTPHeaderAuth
-    matching_url: https://cds-beta.climate.copernicus.eu
+    matching_url: https://cds.climate.copernicus.eu
     ssl_verify: true
     headers:
       PRIVATE-TOKEN: "{apikey}"
@@ -2458,15 +1837,14 @@
     type: HTTPDownload
     timeout: 30
     ssl_verify: true
-    extract: false
     auth_error_code: 401
     order_enabled: true
     order_method: POST
     order_on_response:
       metadata_mapping:
         orderId: $.json.jobID
-        orderStatusLink: https://cds-beta.climate.copernicus.eu/api/retrieve/v1/jobs/{orderId}
-        searchLink: https://cds-beta.climate.copernicus.eu/api/retrieve/v1/jobs/{orderId}/results
+        orderStatusLink: https://cds.climate.copernicus.eu/api/retrieve/v1/jobs/{orderId}
+        searchLink: https://cds.climate.copernicus.eu/api/retrieve/v1/jobs/{orderId}/results
     order_status:
       request:
         method: GET
@@ -2480,231 +1858,31 @@
         need_search: true
         metadata_mapping:
           downloadLink: $.json.asset.value.href
-    products:
-      AG_ERA5:
-        output_extension: .zip
-        extract: true
-      ERA5_SL:
-        output_extension: .grib
-      ERA5_PL:
-        output_extension: .grib
-      ERA5_PL_MONTHLY:
-        output_extension: .grib
-      ERA5_LAND:
-        output_extension: .grib
-      ERA5_LAND_MONTHLY:
-        output_extension: .grib
-      ERA5_SL_MONTHLY:
-        output_extension: .grib
-      UERRA_EUROPE_SL:
-        output_extension: .grib
-      GLACIERS_DIST_RANDOLPH:
-        output_extension: .zip
-        extract: true
-      SATELLITE_CARBON_DIOXIDE:
-        output_extension: .zip
-        extract: true
-      SATELLITE_FIRE_BURNED_AREA:
-        output_extension: .zip
-        extract: true
-      SATELLITE_METHANE:
-        output_extension: .zip
-        extract: true
-      SEASONAL_POSTPROCESSED_PL:
-        output_extension: .grib
-      SEASONAL_POSTPROCESSED_SL:
-        output_extension: .grib
-      SEASONAL_ORIGINAL_SL:
-        output_extension: .grib
-      SEASONAL_ORIGINAL_PL:
-        output_extension: .grib
-      SEASONAL_MONTHLY_PL:
-        output_extension: .grib
-      SEASONAL_MONTHLY_SL:
-        output_extension: .grib
-      SIS_HYDRO_MET_PROJ:
-        output_extension: .zip
-        extract: true
   search: !plugin
-    type: BuildSearchResult
+    type: ECMWFSearch
     ssl_verify: true
     end_date_excluded: false
+    dates_required: true
     remove_from_query:
       - dataset
       - date
     discover_queryables:
       fetch_url: null
       product_type_fetch_url: null
-    constraints_file_url: https://cds-beta.climate.copernicus.eu/api/catalogue/v1/collections/{dataset}/constraints.json
+      constraints_url: https://cds.climate.copernicus.eu/api/catalogue/v1/collections/{dataset}/constraints.json
+      form_url: https://cds.climate.copernicus.eu/api/catalogue/v1/collections/{dataset}/form.json
     metadata_mapping:
       productType: $.productType
-      title: $.id
       startTimeFromAscendingNode: '{$.startTimeFromAscendingNode#to_iso_utc_datetime}'
       completionTimeFromAscendingNode:
         - date={startTimeFromAscendingNode#to_iso_date}/{completionTimeFromAscendingNode#to_iso_date}
         - '{$.completionTimeFromAscendingNode#to_iso_utc_datetime}'
-      _date: '{startTimeFromAscendingNode#to_iso_date}/{completionTimeFromAscendingNode#to_iso_date}'
-      id: $.id
       # The geographic extent of the product
       geometry:
         - '{{"area": {geometry#to_nwse_bounds}}}'
         - $.geometry
-      defaultGeometry: POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))
-      storageStatus: '{$.null#replace_str("Not Available","OFFLINE")}'
-      downloadLink: $.null
       qs: $.qs
-      orderLink: 'https://cds-beta.climate.copernicus.eu/api/retrieve/v1/processes/{dataset}/execution?{{"inputs": {qs#to_geojson}}}'
-      # Copernicus CDS specific parameters
-      api_product_type:
-        - product_type
-        - $.api_product_type
-      cdr_type:
-        - cdr_type
-        - $.cdr_type
-      dataset:
-        - dataset
-        - $.dataset
-      dataset_type:
-        - dataset_type
-        - $.dataset_type
-      day:
-        - day
-        - $.day
-      download_format:
-        - download_format
-        - $.download_format
-      ensemble_member:
-        - ensemble_member
-        - $.ensemble_member
-      experiment:
-        - experiment
-        - $.experiment
-      filter:
-        - filter
-        - $.filter
-      format:
-        - data_format
-        - $.format
-      gcm:
-        - gcm
-        - $.gcm
-      grid:
-        - grid
-        - $.grid
-      hdate:
-        - hdate
-        - $.hdate
-      horizontal_resolution:
-        - horizontal_resolution
-        - $.horizontal_resolution
-      hydrological_model:
-        - hydrological_model
-        - $.hydrological_model
-      latitude:
-        - latitude
-        - $.latitude
-      leadtime_hour:
-        - leadtime_hour
-        - $.leadtime_hour
-      leadtime_month:
-        - leadtime_month
-        - $.leadtime_month
-      longitude:
-        - longitude
-        - $.longitude
-      model_levels:
-        - model_levels
-        - $.model_levels
-      month:
-        - month
-        - $.month
-      nominal_day:
-        - nominal_day
-        - $.nominal_day
-      origin:
-        - origin
-        - $.origin
-      originating_centre:
-        - originating_centre
-        - $.originating_centre
-      param:
-        - param
-        - $.param
-      period:
-        - period
-        - $.period
-      pressure_level:
-        - pressure_level
-        - $.pressure_level
-      processing_level:
-        - processing_level
-        - $.processing_level
-      processing_type:
-        - processing_type
-        - $.processing_type
-      product:
-        - product
-        - $.product
-      product_version:
-        - product_version
-        - $.product_version
-      rcm:
-        - rcm
-        - $.rcm
-      region:
-        - region
-        - $.region
-      satellite:
-        - satellite
-        - $.satellite
-      sensor:
-        - sensor
-        - $.sensor
-      sensor_and_algorithm:
-        - sensor_and_algorithm
-        - $.sensor_and_algorithm
-      source:
-        - source
-        - $.source
-      statistic:
-        - statistic
-        - $.statistic
-      step:
-        - step
-        - $.step
-      system:
-        - system
-        - $.system
-      system_version:
-        - system_version
-        - '{$.system_version#to_geojson}'
-      target:
-        - target
-        - $.target
-      temporal_aggregation:
-        - temporal_aggregation
-        - $.temporal_aggregation
-      time:
-        - time
-        - $.time
-      time_aggregation:
-        - time_aggregation
-        - $.time_aggregation
-      type:
-        - type
-        - $.type
-      variable:
-        - variable
-        - $.variable
-      variable_type:
-        - variable_type
-        - $.variable_type
-      version:
-        - version
-        - '{$.version#to_geojson}'
-      year:
-        - year
-        - $.year
+      orderLink: 'https://cds.climate.copernicus.eu/api/retrieve/v1/processes/{dataset}/execution?{{"inputs": {qs#to_geojson}}}'
   products:
     # See available Public Datasets in https://cds.climate.copernicus.eu/cdsapp#!/search?type=dataset
     AG_ERA5:
@@ -2712,69 +1890,74 @@
       version: '1_1'
       variable: cloud_cover
       statistic: 24_hour_mean
-      format: zip
       metadata_mapping:
         <<: *day_month_year
     ERA5_SL:
       dataset: reanalysis-era5-single-levels
-      api_product_type: reanalysis
-      format: grib
+      product_type: reanalysis
       variable: 10m_u_component_of_wind
+      data_format: grib
+      download_format: zip
       metadata_mapping:
-        <<: *day_month_year_time
+        <<: *time_day_month_year
     ERA5_PL:
       dataset: reanalysis-era5-pressure-levels
-      api_product_type: reanalysis
-      format: grib
+      product_type: reanalysis
       variable: geopotential
+      data_format: grib
+      download_format: zip
       metadata_mapping:
-        <<: *day_month_year_time
+        <<: *time_day_month_year
     ERA5_PL_MONTHLY:
       dataset: reanalysis-era5-pressure-levels-monthly-means
-      api_product_type: monthly_averaged_reanalysis_by_hour_of_day
-      format: grib
+      product_type: monthly_averaged_reanalysis_by_hour_of_day
       variable: divergence
-      pressure_level: '1'
+      pressure_level: 1
+      data_format: grib
+      download_format: zip
       metadata_mapping:
-        <<: *month_year_time
+        <<: *time_month_year
     ERA5_LAND:
       dataset: reanalysis-era5-land
       variable: 2m_dewpoint_temperature
-      format: grib
+      data_format: grib
+      download_format: zip
       metadata_mapping:
-        <<: *day_month_year_time
+        <<: *time_day_month_year
     ERA5_LAND_MONTHLY:
       dataset: reanalysis-era5-land-monthly-means
-      api_product_type: monthly_averaged_reanalysis_by_hour_of_day
+      product_type: monthly_averaged_reanalysis_by_hour_of_day
       variable: 2m_dewpoint_temperature
-      format: grib
+      data_format: grib
+      download_format: zip
       metadata_mapping:
-        <<: *month_year_time
+        <<: *time_month_year
     ERA5_SL_MONTHLY:
       dataset: reanalysis-era5-single-levels-monthly-means
-      api_product_type: monthly_averaged_reanalysis_by_hour_of_day
-      format: grib
+      product_type: monthly_averaged_reanalysis_by_hour_of_day
+      data_format: grib
+      download_format: zip
       metadata_mapping:
-        <<: *month_year_time
+        <<: *time_month_year
     UERRA_EUROPE_SL:
       dataset: reanalysis-uerra-europe-single-levels
       origin: mescan_surfex
       variable: 10m_wind_direction
       time: 00:00
-      format: grib
+      data_format: grib
       metadata_mapping:
         <<: *day_month_year
     GLACIERS_DIST_RANDOLPH:
       dataset: insitu-glaciers-extent
       variable: glacier_area
-      api_product_type: gridded
-      version: '6_0'
-      format: zip
+      product_type: gridded
+      version: rgi_6_0
+      data_format: zip
     GRIDDED_GLACIERS_MASS_CHANGE:
       dataset: derived-gridded-glacier-mass-change
       variable: glacier_mass_change
       product_version: wgms_fog_2023_09
-      format: zip
+      data_format: zip
       metadata_mapping:
         completionTimeFromAscendingNode:
           - |
@@ -2794,11 +1977,11 @@
       dataset: satellite-fire-burned-area
       origin: esa_cci
       sensor: modis
-      variable: grid_variables
+      variable: pixel_variables
       version: '5_1_1cds'
-      nominal_day: '01'
+      region: europe
       metadata_mapping:
-        <<: *month_year
+        <<: *nday_month_year
     SATELLITE_METHANE:
       dataset: satellite-methane
       processing_level: level_2
@@ -2808,8 +1991,8 @@
       metadata_mapping:
         <<: *day_month_year
     SATELLITE_SEA_ICE_EDGE_TYPE:
-      cdr_type: cdr
       dataset: satellite-sea-ice-edge-type
+      cdr_type: cdr
       region: northern_hemisphere
       variable:
         - sea_ice_edge
@@ -2818,16 +2001,16 @@
       metadata_mapping:
         <<: *day_month_year
     SATELLITE_SEA_ICE_THICKNESS:
-      cdr_type: cdr
       dataset: satellite-sea-ice-thickness
+      cdr_type: cdr
       satellite: envisat
       variable: all
       version: '3_0'
       metadata_mapping:
         <<: *month_year
     SATELLITE_SEA_ICE_CONCENTRATION:
-      cdr_type: cdr
       dataset: satellite-sea-ice-concentration
+      cdr_type: cdr
       origin: eumetsat_osi_saf
       region:
         - northern_hemisphere
@@ -2847,71 +2030,69 @@
         <<: *day_month_year
     SEASONAL_POSTPROCESSED_PL:
       dataset: seasonal-postprocessed-pressure-levels
-      format: grib
+      data_format: grib
       originating_centre: ecmwf
-      system: '5'
+      system: 5
       variable: geopotential_anomaly
-      pressure_level: '10'
-      api_product_type: ensemble_mean
-      leadtime_month: '1'
+      pressure_level: 10
+      product_type: ensemble_mean
+      leadtime_month: 1
       metadata_mapping:
         <<: *month_year
     SEASONAL_POSTPROCESSED_SL:
       dataset: seasonal-postprocessed-single-levels
-      format: grib
+      data_format: grib
       originating_centre: ecmwf
-      system: '5'
+      system: 5
       variable: 2m_dewpoint_temperature_anomaly
-      api_product_type: ensemble_mean
-      leadtime_month: '1'
+      product_type: ensemble_mean
+      leadtime_month: 1
       metadata_mapping:
         <<: *month_year
     SEASONAL_ORIGINAL_SL:
       dataset: seasonal-original-single-levels
-      format: grib
+      data_format: grib
       originating_centre: ecmwf
-      system: '5'
+      system: 5
       variable: 10m_u_component_of_wind
-      leadtime_hour: '6'
-      day: '01'
+      leadtime_hour: 6
       metadata_mapping:
-        <<: *month_year
+        <<: *day_month_year
     SEASONAL_ORIGINAL_PL:
       dataset: seasonal-original-pressure-levels
-      format: grib
+      data_format: grib
       originating_centre: ecmwf
-      system: '5'
+      system: 5
       variable: geopotential
-      pressure_level: '10'
-      leadtime_hour: '12'
-      day: '01'
+      pressure_level: 10
+      leadtime_hour: 12
       metadata_mapping:
-        <<: *month_year
+        <<: *day_month_year
     SEASONAL_MONTHLY_PL:
       dataset: seasonal-monthly-pressure-levels
-      format: grib
+      data_format: grib
       originating_centre: ecmwf
-      system: '5'
+      system: 5
       variable: geopotential
-      pressure_level: '10'
-      api_product_type: monthly_mean
-      leadtime_month: '1'
+      pressure_level: 10
+      product_type: monthly_mean
+      leadtime_month: 1
       metadata_mapping:
         <<: *month_year
     SEASONAL_MONTHLY_SL:
       dataset: seasonal-monthly-single-levels
-      format: grib
+      data_format: grib
       originating_centre: ecmwf
-      system: '5'
+      system: 5
       variable: 10m_u_component_of_wind
-      api_product_type: monthly_mean
-      leadtime_month: '1'
+      product_type: monthly_mean
+      leadtime_month: 1
       metadata_mapping:
         <<: *month_year
     SIS_HYDRO_MET_PROJ:
       dataset: sis-hydrology-meteorology-derived-projections
-      format: zip
-      api_product_type: climate_impact_indicators
+      data_format: zip
+      product_type: climate_impact_indicators
       variable: 2m_air_temperature
       variable_type: absolute_change_from_reference_period
       processing_type: original
@@ -3215,7 +2396,7 @@
   description: Meteoblue
   url: https://www.meteoblue.com
   search: !plugin
-    type: BuildPostSearchResult
+    type: MeteoblueSearch
     api_endpoint: 'https://my.meteoblue.com/dataset/query'
     need_auth: true
     ssl_verify: true
@@ -3237,7 +2418,8 @@
       defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
       productType: '$.queries[0].domain'
       storageStatus: '{$.requiresJobQueue#get_group_name((?P<ONLINE>False)|(?P<OFFLINE>True))}'
-      downloadLink: 'https://my.meteoblue.com/dataset/query'
+      qs: $.qs
+      downloadLink: https://my.meteoblue.com/dataset/query?{qs#to_geojson}
       # Meteoblue specific parameters
       datapoints: '$.datapoints'
       requiresJobQueue: '$.requiresJobQueue'
@@ -3254,15 +2436,18 @@
       timeIntervalsAlignment:
         - '{{"timeIntervalsAlignment": {timeIntervalsAlignment#to_geojson} }}'
         - '$.timeIntervalsAlignment'
-      orderLink: '{$.downloadLink#replace_str(r"^(.*)(\")(queries\")(.)",r"\1\2runOnJobQueue\2\4 true, \2\3\4")}'
+      orderLink: https://my.meteoblue.com/dataset/query?{qs#replace_str(r"^(.*)(\")(queries\")(.)",r"\1\2runOnJobQueue\2\4 true, \2\3\4")}
+      # orderLink: '{$.downloadLink#replace_str(r"^(.*)(\")(queries\")(.)",r"\1\2runOnJobQueue\2\4 true, \2\3\4")}'
   products:
     NEMSGLOBAL_TCDC:
+      productType: NEMSGLOBAL
       queries: [{'domain':'NEMSGLOBAL','gapFillDomain':null,'timeResolution':'daily','codes':[{'code':71,'level':'sfc','aggregation':'mean'}]}]
       format: netCDF
       units: {'temperature':'C','velocity':'km/h','length':'metric','energy':'watts'}
       timeIntervalsAlignment:
       geometry: {"type": "Polygon", "coordinates": [[[180, -90], [180, 90], [-180, 90], [-180, -90], [180, -90]]]}
     NEMSAUTO_TCDC:
+      productType: NEMSAUTO
       queries: [{'domain':'NEMSAUTO','gapFillDomain':null,'timeResolution':'daily','codes':[{'code':71,'level':'sfc','aggregation':'mean'}]}]
       format: netCDF
       units: {'temperature':'C','velocity':'km/h','length':'metric','energy':'watts'}
@@ -3295,7 +2480,6 @@
           orderId: '$.json.id'
           downloadLink: 'http://queueresults.meteoblue.com/{orderId}'
           downloadMethod: '{$.null#replace_str("Not Available","GET")}'
-    output_extension: .nc
   auth: !plugin
     type: HttpQueryStringAuth
     matching_url: https?://[a-z]+.meteoblue.com
@@ -3796,20 +2980,6 @@
   description: WEkEO - Sentinel and some various Copernicus data
   url: https://www.wekeo.eu/
   # anchors to avoid duplications
-  anchor_dates_eum: &eo_eum_dates
-    startTimeFromAscendingNode:
-      - '{{"dtstart": "{startTimeFromAscendingNode}"}}'
-      - '$.properties.startdate'
-    completionTimeFromAscendingNode:
-      - '{{"dtend": "{completionTimeFromAscendingNode}"}}'
-      - '$.properties.enddate'
-  anchor_dates_clms: &clms_dates
-    startTimeFromAscendingNode:
-      - '{{"start": "{startTimeFromAscendingNode}"}}'
-      - '$.properties.startdate'
-    completionTimeFromAscendingNode:
-      - '{{"end": "{completionTimeFromAscendingNode}"}}'
-      - '$.properties.enddate'
   anchor_s1_sar: &s1_sar_params
     processingLevel:
       - '{{"processingLevel": "{processingLevel}"}}'
@@ -3843,8 +3013,8 @@
     id:
       - |
         {{
-          "start": "{id#replace_str(r'^.*_([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])_.*$',r'\1-\2-\3T\4%3A\5%3A00Z')}",
-          "end": "{id#replace_str(r'^.*_([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])_.*$',r'\1-\2-\3T\4%3A\5%3A00Z')}"
+          "startdate": "{id#replace_str(r'^.*_([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])_.*$',r'\1-\2-\3T\4%3A\5%3A00Z')}",
+          "enddate": "{id#replace_str(r'^.*_([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])_.*$',r'\1-\2-\3T\4%3A\5%3A00Z')}"
         }}
       - '$.id'
   search: !plugin
@@ -3877,10 +3047,10 @@
         - '{{"productIdentifier": "{id}"}}'
         - '{$.id#remove_extension}'
       startTimeFromAscendingNode:
-        - '{{"startDate": "{startTimeFromAscendingNode}"}}'
+        - '{{"startdate": "{startTimeFromAscendingNode}"}}'
         - '$.properties.startdate'
       completionTimeFromAscendingNode:
-        - '{{"completionDate": "{completionTimeFromAscendingNode}"}}'
+        - '{{"enddate": "{completionTimeFromAscendingNode}"}}'
         - '$.properties.enddate'
       downloadLink: '$.properties.location'
       title: '$.id'
@@ -3927,9 +3097,6 @@
       satellite:
         - '{{"satellite": {satellite}}}'
         - '$.null'
-      sensor:
-        - '{{"sensor": "{sensor}"}}'
-        - '$.null'
   products:
     S1_SAR_GRD:
       productType: EO:ESA:DAT:SENTINEL-1
@@ -3957,6 +3124,7 @@
         orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ESA:DAT:SENTINEL-1"}}'
     S2_MSI_L1C:
       productType: EO:ESA:DAT:SENTINEL-2
+      providerProductType: S2MSI1C
       processingLevel: S2MSI1C
       metadata_mapping:
         processingLevel:
@@ -3968,6 +3136,7 @@
         orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ESA:DAT:SENTINEL-2"}}'
     S2_MSI_L2A:
       productType: EO:ESA:DAT:SENTINEL-2
+      providerProductType: S2MSI2A
       processingLevel: S2MSI2A
       metadata_mapping:
         processingLevel:
@@ -3977,17 +3146,6 @@
           - '{{"cloudCover": "{cloudCover}"}}'
           - '$.null'
         orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ESA:DAT:SENTINEL-2"}}'
-    S2_MSI_L2AP:
-      productType: EO:ESA:DAT:SENTINEL-2
-      processingLevel: S2MSI2AP
-      metadata_mapping:
-        processingLevel:
-          - '{{"processingLevel": "{processingLevel}"}}'
-          - '$.id.`sub(/^[^_]([^_]+)_([^_]+)_.*/, S2\\2)`'
-        cloudCover:
-          - '{{"cloudCover": "{cloudCover}"}}'
-          - '$.null'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ESA:DAT:SENTINEL-2"}}'
     S3_LAN_HY:
       productType: EO:ESA:DAT:SENTINEL-3
       providerProductType: SR_2_LAN_HY
@@ -4046,9 +3204,8 @@
       productType: EO:EUM:DAT:SENTINEL-3:OL_1_EFR___
       metadata_mapping:
         id:
-          - '{{"timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "dtstart": {id#split_id_into_s3_params}["startDate"], "dtend": {id#split_id_into_s3_params}["endDate"]}}'
+          - '{{"timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "startdate": {id#split_id_into_s3_params}["startDate"], "enddate": {id#split_id_into_s3_params}["endDate"]}}'
           - '{$.id#remove_extension}'
-        <<: *eo_eum_dates
         platform:
           - '{{"sat": "{platform}"}}'
           - '$.id.`sub(/^[^_]([^_]+)_.*/, Sentinel-\\1)`'
@@ -4059,9 +3216,8 @@
       productType: EO:EUM:DAT:SENTINEL-3:OL_1_ERR___
       metadata_mapping:
         id:
-          - '{{"timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "dtstart": {id#split_id_into_s3_params}["startDate"], "dtend": {id#split_id_into_s3_params}["endDate"]}}'
+          - '{{"timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "startdate": {id#split_id_into_s3_params}["startDate"], "enddate": {id#split_id_into_s3_params}["endDate"]}}'
           - '{$.id#remove_extension}'
-        <<: *eo_eum_dates
         platform:
           - '{{"sat": "{platform}"}}'
           - '$.id.`sub(/^[^_]([^_]+)_.*/, Sentinel-\\1)`'
@@ -4072,9 +3228,8 @@
       productType: EO:EUM:DAT:SENTINEL-3:OL_2_WFR___
       metadata_mapping:
         id:
-          - '{{"timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "dtstart": {id#split_id_into_s3_params}["startDate"], "dtend": {id#split_id_into_s3_params}["endDate"]}}'
+          - '{{"timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "startdate": {id#split_id_into_s3_params}["startDate"], "enddate": {id#split_id_into_s3_params}["endDate"]}}'
           - '{$.id#remove_extension}'
-        <<: *eo_eum_dates
         platform:
           - '{{"sat": "{platform}"}}'
           - '$.id.`sub(/^[^_]([^_]+)_.*/, Sentinel-\\1)`'
@@ -4085,9 +3240,8 @@
       productType: EO:EUM:DAT:SENTINEL-3:OL_2_WRR___
       metadata_mapping:
         id:
-          - '{{"timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "dtstart": {id#split_id_into_s3_params}["startDate"], "dtend": {id#split_id_into_s3_params}["endDate"]}}'
+          - '{{"timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "startdate": {id#split_id_into_s3_params}["startDate"], "enddate": {id#split_id_into_s3_params}["endDate"]}}'
           - '{$.id#remove_extension}'
-        <<: *eo_eum_dates
         platform:
           - '{{"sat": "{platform}"}}'
           - '$.id.`sub(/^[^_]([^_]+)_.*/, Sentinel-\\1)`'
@@ -4098,9 +3252,8 @@
       productType: EO:EUM:DAT:SENTINEL-3:SR_1_SRA___
       metadata_mapping:
         id:
-          - '{{"timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "dtstart": {id#split_id_into_s3_params}["startDate"], "dtend": {id#split_id_into_s3_params}["endDate"]}}'
+          - '{{"timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "startdate": {id#split_id_into_s3_params}["startDate"], "enddate": {id#split_id_into_s3_params}["endDate"]}}'
           - '{$.id#remove_extension}'
-        <<: *eo_eum_dates
         platform:
           - '{{"sat": "{platform}"}}'
           - '$.id.`sub(/^[^_]([^_]+)_.*/, Sentinel-\\1)`'
@@ -4111,9 +3264,8 @@
       productType: EO:EUM:DAT:SENTINEL-3:SR_1_SRA_A_
       metadata_mapping:
         id:
-          - '{{"timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "dtstart": {id#split_id_into_s3_params}["startDate"], "dtend": {id#split_id_into_s3_params}["endDate"]}}'
+          - '{{"timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "startdate": {id#split_id_into_s3_params}["startDate"], "enddate": {id#split_id_into_s3_params}["endDate"]}}'
           - '{$.id#remove_extension}'
-        <<: *eo_eum_dates
         platform:
           - '{{"sat": "{platform}"}}'
           - '$.id.`sub(/^[^_]([^_]+)_.*/, Sentinel-\\1)`'
@@ -4124,24 +3276,21 @@
       productType: EO:EUM:DAT:SENTINEL-3:SR_1_SRA_BS
       metadata_mapping:
         id:
-          - '{{"timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "dtstart": {id#split_id_into_s3_params}["startDate"], "dtend": {id#split_id_into_s3_params}["endDate"]}}'
+          - '{{"timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "startdate": {id#split_id_into_s3_params}["startDate"], "enddate": {id#split_id_into_s3_params}["endDate"]}}'
           - '{$.id#remove_extension}'
-        <<: *eo_eum_dates
         platform:
           - '{{"sat": "{platform}"}}'
           - '$.id.`sub(/^[^_]([^_]+)_.*/, Sentinel-\\1)`'
         platformSerialIdentifier: '$.id.`sub(/^[^_]([^_]+)_.*/, S\\1)`'
         <<: *orbit_cycle
         orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:EUM:DAT:SENTINEL-3:SR_1_SRA_BS"}}'
-
     S3_SLSTR_L1RBT:
       productType: EO:EUM:DAT:SENTINEL-3:SL_1_RBT___
       providerProductType: SL_1_RBT___
       metadata_mapping:
         id:
-          - '{{"productType": "SL_1_RBT___", "timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "dtstart": {id#split_id_into_s3_params}["startDate"], "dtend": {id#split_id_into_s3_params}["endDate"]}}'
+          - '{{"productType": "SL_1_RBT___", "timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "startdate": {id#split_id_into_s3_params}["startDate"], "enddate": {id#split_id_into_s3_params}["endDate"]}}'
           - '{$.id#remove_extension}'
-        <<: *eo_eum_dates
         platform:
           - '{{"sat": "{platform}"}}'
           - '$.id.`sub(/^[^_]([^_]+)_.*/, Sentinel-\\1)`'
@@ -4152,9 +3301,8 @@
       productType: EO:EUM:DAT:SENTINEL-3:SR_2_WAT___
       metadata_mapping:
         id:
-          - '{{"type": "SR_2_WAT___", "timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "dtstart": {id#split_id_into_s3_params}["startDate"], "dtend": {id#split_id_into_s3_params}["endDate"]}}'
+          - '{{"type": "SR_2_WAT___", "timeliness": {id#split_id_into_s3_params}["timeliness"], "sat": {id#split_id_into_s3_params}["sat"], "startdate": {id#split_id_into_s3_params}["startDate"], "enddate": {id#split_id_into_s3_params}["endDate"]}}'
           - '{$.id#remove_extension}'
-        <<: *eo_eum_dates
         orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:EUM:DAT:SENTINEL-3:SR_2_WAT___"}}'
     S5P_L1B_IR_ALL:
       productType: EO:ESA:DAT:SENTINEL-5P
@@ -4182,9 +3330,8 @@
       productType: EO:EEA:DAT:CLMS_HRVPP_VI
       metadata_mapping:
         id:
-          - '{{"uid": {id}}}'
+          - '{{"uid": "{id}"}}'
           - '$.id'
-        <<: *clms_dates
         relativeOrbitNumber:
           - '{{"relativeOrbitNumber": "{relativeOrbitNumber}"}}'
           - '$.null'
@@ -4199,36 +3346,36 @@
           - '$.null'
         orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:EEA:DAT:CLMS_HRVPP_VI"}}'
     COP_DEM_GLO30_DGED:
-      productType: EO:DEM:DAT:COP-DEM_GLO-30-DGED__2023_1
+      productType: EO:ESA:DAT:COP-DEM
+      providerProductType: DGE_30
       metadata_mapping:
-        id: '$.id'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:DEM:DAT:COP-DEM_GLO-30-DGED__2023_1"}}'
+        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ESA:DAT:COP-DEM"}}'
     COP_DEM_GLO30_DTED:
-      productType: EO:DEM:DAT:COP-DEM_GLO-30-DTED__2023_1
+      productType: EO:ESA:DAT:COP-DEM
+      providerProductType: DTE_30
       metadata_mapping:
-        id: '$.id'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:DEM:DAT:COP-DEM_GLO-30-DTED__2023_1"}}'
+        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ESA:DAT:COP-DEM"}}'
     COP_DEM_GLO90_DGED:
-      productType: EO:DEM:DAT:COP-DEM_GLO-90-DGED__2023_1
+      productType: EO:ESA:DAT:COP-DEM
+      providerProductType: DGE_90
       metadata_mapping:
-        id: '$.id'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:DEM:DAT:COP-DEM_GLO-90-DGED__2023_1"}}'
+        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ESA:DAT:COP-DEM"}}'
     COP_DEM_GLO90_DTED:
-      productType: EO:DEM:DAT:COP-DEM_GLO-90-DTED__2023_1
+      productType: EO:ESA:DAT:COP-DEM
+      providerProductType: DTE_90
       metadata_mapping:
-        id: '$.id'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:DEM:DAT:COP-DEM_GLO-90-DTED__2023_1"}}'
+        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ESA:DAT:COP-DEM"}}'
     CLMS_GLO_NDVI_333M:
       productType: EO:CLMS:DAT:CLMS_GLOBAL_NDVI_300M_V1_10DAILY_NETCDF
+      providerProductType: NDVI300
       metadata_mapping:
         <<: *id_from_date
-        <<: *clms_dates
         orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:CLMS:DAT:CLMS_GLOBAL_NDVI_300M_V1_10DAILY_NETCDF"}}'
     CLMS_GLO_NDVI_1KM_LTS:
       productType: EO:CLMS:DAT:CLMS_GLOBAL_NDVI_1KM_V2_10DAILY_NETCDF
+      providerProductType: NDVI
       metadata_mapping:
         <<: *id_from_date
-        <<: *clms_dates
         orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:CLMS:DAT:CLMS_GLOBAL_NDVI_1KM_V2_10DAILY_NETCDF"}}'
     CLMS_CORINE:
       productType: EO:CLMS:DAT:CORINE
@@ -4243,45 +3390,45 @@
         orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:CLMS:DAT:CORINE"}}'
     CLMS_GLO_FCOVER_333M:
       productType: EO:CLMS:DAT:CLMS_GLOBAL_FCOVER_300M_V1_10DAILY_NETCDF
+      providerProductType: FCOVER300
       metadata_mapping:
         <<: *id_from_date
-        <<: *clms_dates
         productGroupId:
           - '{{"productGroupId": "{productGroupId}"}}'
           - '$.null'
         orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:CLMS:DAT:CLMS_GLOBAL_FCOVER_300M_V1_10DAILY_NETCDF"}}'
     CLMS_GLO_DMP_333M:
       productType: EO:CLMS:DAT:CLMS_GLOBAL_DMP_300M_V1_10DAILY_NETCDF
+      providerProductType: DMP300
       metadata_mapping:
         <<: *id_from_date
-        <<: *clms_dates
         productGroupId:
           - '{{"productGroupId": "{productGroupId}"}}'
           - '$.null'
         orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:CLMS:DAT:CLMS_GLOBAL_DMP_300M_V1_10DAILY_NETCDF"}}'
     CLMS_GLO_GDMP_333M:
       productType: EO:CLMS:DAT:CLMS_GLOBAL_GDMP_300M_V1_10DAILY_NETCDF
+      providerProductType: GDMP300
       metadata_mapping:
         <<: *id_from_date
-        <<: *clms_dates
         productGroupId:
           - '{{"productGroupId": "{productGroupId}"}}'
           - '$.null'
         orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:CLMS:DAT:CLMS_GLOBAL_GDMP_300M_V1_10DAILY_NETCDF"}}'
     CLMS_GLO_FAPAR_333M:
       productType: EO:CLMS:DAT:CLMS_GLOBAL_FAPAR_300M_V1_10DAILY_NETCDF
+      providerProductType: FAPAR300
       metadata_mapping:
         <<: *id_from_date
-        <<: *clms_dates
         productGroupId:
           - '{{"productGroupId": "{productGroupId}"}}'
           - '$.null'
         orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:CLMS:DAT:CLMS_GLOBAL_FAPAR_300M_V1_10DAILY_NETCDF"}}'
     CLMS_GLO_LAI_333M:
       productType: EO:CLMS:DAT:CLMS_GLOBAL_LAI_300M_V1_10DAILY_NETCDF
+      providerProductType: LAI300
       metadata_mapping:
         <<: *id_from_date
-        <<: *clms_dates
         productGroupId:
           - '{{"productGroupId": "{productGroupId}"}}'
           - '$.null'
@@ -4332,921 +3479,431 @@
   description: WEkEO - ECMWF data
   url: https://www.wekeo.eu/
   # anchors to avoid duplications
+  anchor_time_day_month_year: &time_day_month_year
+    startTimeFromAscendingNode:
+      - |
+        {{
+          "year": {_date#interval_to_datetime_dict}["year"],
+          "month": {_date#interval_to_datetime_dict}["month"],
+          "day": {_date#interval_to_datetime_dict}["day"],
+          "time": {startTimeFromAscendingNode#get_ecmwf_time}
+        }}
+      - $.properties.startdate
+    completionTimeFromAscendingNode: $.properties.enddate
   anchor_day_month_year: &day_month_year
     startTimeFromAscendingNode:
       - |
         {{
-          "year": {startTimeFromAscendingNode#to_datetime_dict(list)}["year"],
-          "month": {startTimeFromAscendingNode#to_datetime_dict(list)}["month"],
-          "day": {startTimeFromAscendingNode#to_datetime_dict(list)}["day"]
+          "year": {_date#interval_to_datetime_dict}["year"],
+          "month": {_date#interval_to_datetime_dict}["month"],
+          "day": {_date#interval_to_datetime_dict}["day"]
         }}
-      - $.properties.startDate
-    completionTimeFromAscendingNode: $.properties.endDate
-  anchor_year_month: &month_year
+      - $.properties.startdate
+    completionTimeFromAscendingNode: $.properties.enddate
+  anchor_month_year: &month_year
     startTimeFromAscendingNode:
       - |
         {{
-          "year": {startTimeFromAscendingNode#to_datetime_dict(list)}["year"],
-          "month": {startTimeFromAscendingNode#to_datetime_dict(list)}["month"]
+          "year": {_date#interval_to_datetime_dict}["year"],
+          "month": {_date#interval_to_datetime_dict}["month"]
         }}
-      - $.properties.startDate
-    completionTimeFromAscendingNode: $.properties.endDate
-  anchor_variable_list: &variable_list
-    variable:
-      - '{{"variable": {variable}}}'
-      - '$.null'
+      - $.properties.startdate
+    completionTimeFromAscendingNode: $.properties.enddate
   search: !plugin
-    type: PostJsonSearch
+    type: WekeoECMWFSearch
     api_endpoint: https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/search
     timeout: 60
     need_auth: true
     auth_error_code: 401
-    results_entry: 'features'
     dates_required: true
+    results_entry: 'features'
     pagination:
       total_items_nb_key_path: '$.properties.totalResults'
       next_page_query_obj: '{{"itemsPerPage":{items_per_page},"startIndex":{skip}}}'
       max_items_per_page: 200
     discover_product_types:
       fetch_url: null
-    constraints_file_url: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/queryable/{dataset}'
-    constraints_file_dataset_key: productType
-    constraints_entry: constraints
-    stop_without_constraints_entry_key: true
+    available_values_url: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/queryable/{dataset}'
     metadata_mapping:
-      productType:
-        - '{{"dataset_id": "{productType}"}}'
-        - '$.null'
       geometry:
         - '{{"bbox": {geometry#to_bounds}}}'
-        - '$.geometry'
-      defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-      id:
-        - '{{"productIdentifier": "{id}"}}'
-        - '{$.id#remove_extension}'
+        - $.geometry
       startTimeFromAscendingNode:
-        - '{{"dtstart": "{startTimeFromAscendingNode#to_iso_utc_datetime}"}}'
-        - '$.properties.startdate'
+        - '{{"startdate": "{startTimeFromAscendingNode#to_iso_utc_datetime}"}}'
+        - $.properties.startdate
       completionTimeFromAscendingNode:
-        - '{{"dtend": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}'
-        - '$.properties.enddate'
-      downloadLink: '$.properties.location'
-      title: '$.id'
-      storageStatus: 'OFFLINE'
-      processingLevel:
-        - '{{"processingLevel": "{processingLevel}"}}'
-        - '$.null'
-      providerProductType:
-        - '{{"productType": "{providerProductType}"}}'
-        - '$.null'
-      variable:
-        - '{{"variable": {variable}}}'
-        - '$.null'
-      leadtime_hour:
-        - '{{"leadtime_hour": {leadtime_hour}}}'
-        - '$.null'
-      leadtime_month:
-        - '{{"leadtime_month": {leadtime_month}}}'
-        - '$.null'
-      origin:
-        - '{{"origin": "{origin}"}}'
-        - '$.null'
-      system:
-        - '{{"system": "{system}"}}'
-        - '$.null'
-      format:
-        - '{{"format": "{format}"}}'
-        - '$.null'
-      pressure_level:
-        - '{{"pressure_level": {pressure_level}}}'
-        - '$.null'
-      model_level:
-        - '{{"model_level": {model_level}}}'
-        - '$.null'
-      sensor_and_algorithm:
-        - '{{"sensor_and_algorithm": "{sensor_and_algorithm}"}}'
-        - '$.null'
-      version:
-        - '{{"version": {version}}}'
-        - '$.null'
-      time:
-        - '{{"time": {time}}}'
-        - '$.null'
-      region:
-        - '{{"region": "{region}"}}'
-        - '$.null'
-      type:
-        - '{{"type": "{type}"}}'
-        - '$.null'
-      source:
-        - '{{"source": {source}}}'
-        - '$.null'
-      quantity:
-        - '{{"quantity": "{quantity}"}}'
-        - '$.null'
-      input_observations:
-        - '{{"input_observations": "{input_observations}"}}'
-        - '$.null'
-      aggregation:
-        - '{{"aggregation": "{aggregation}"}}'
-        - '$.null'
-      model:
-        - '{{"model": {model}}}'
-        - '$.null'
-      level:
-        - '{{"level": {level}}}'
-        - '$.null'
-      forcing_type:
-        - '{{"forcing_type": "{forcing_type}"}}'
-        - '$.null'
-      sky_type:
-        - '{{"sky_type": {sky_type}}}'
-        - '$.null'
-      band:
-        - '{{"band": {band}}}'
-        - '$.null'
-      aerosol_type:
-        - '{{"aerosol_type": {aerosol_type}}}'
-        - '$.null'
-      step:
-        - '{{"step": {step}}}'
-        - '$.null'
-      longitude:
-        - '{{"longitude": "{longitude}"}}'
-        - '$.null'
-      latitude:
-        - '{{"latitude": "{latitude}"}}'
-        - '$.null'
-      altitude:
-        - '{{"altitude": "{altitude}"}}'
-        - '$.null'
-      time_reference:
-        - '{{"time_reference": "{time_reference}"}}'
-        - '$.null'
-      grid:
-        - '{{"grid": "{grid}"}}'
-        - '$.null'
-      soil_level:
-        - '{{"soil_level": {soil_level}}}'
-        - '$.null'
-      year:
-        - '{{"year": {year}}}'
-        - '$.null'
-      month:
-        - '{{"month": {month}}}'
-        - '$.null'
-      day:
-        - '{{"day": {day}}}'
-        - '$.null'
-      hyear:
-        - '{{"year": {hyear}}}'
-        - '$.null'
-      hmonth:
-        - '{{"month": {hmonth}}}'
-        - '$.null'
-      hday:
-        - '{{"day": {hday}}}'
-        - '$.null'
-      satellite:
-        - '{{"satellite": {satellite}}}'
-        - '$.null'
-      cdr_type:
-        - '{{"cdr_type": "{cdr_type}"}}'
-        - '$.null'
-      statistic:
-        - '{{"statistic": {statistic}}}'
-        - '$.null'
-      hydrological_year:
-        - '{{"hydrological_year": {hydrological_year}}}'
-        - '$.null'
+        - '{{"enddate": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}'
+        - $.properties.enddate
+      downloadLink: $.properties.location
+      dataset:
+        - dataset_id
+        - $.dataset
+      orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "{dataset}"}}'
   products:
     SATELLITE_CARBON_DIOXIDE:
-      productType: EO:ECMWF:DAT:SATELLITE_CARBON_DIOXIDE
-      processingLevel:
-        - level_2
-      version:
-        - "4.0"
+      dataset: EO:ECMWF:DAT:SATELLITE_CARBON_DIOXIDE
+      processing_level: level_2
+      version: '4_5'
       variable: xco2
-      sensor_and_algorithm: sciamachy_wfmd
-      format: zip
+      sensor_and_algorithm: merged_emma
       metadata_mapping:
-        id: '$.id'
         <<: *day_month_year
-        variable:
-          - '{{"variable": "{variable}"}}'
-          - '$.null'
-        processingLevel:
-          - '{{"processing_level": {processingLevel}}}'
-          - '$.null'
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:SATELLITE_CARBON_DIOXIDE"}}'
     SATELLITE_FIRE_BURNED_AREA:
-      productType: EO:ECMWF:DAT:SATELLITE_FIRE_BURNED_AREA
-      origin: c3s
+      dataset: EO:ECMWF:DAT:SATELLITE_FIRE_BURNED_AREA
+      origin: esa_cci
       sensor: modis
-      variable: grid_variables
+      variable: pixel_variables
       version: 5_1_1cds
-      region:
-        - europe
-      format: zip
+      region: europe
       metadata_mapping:
-        variable:
-          - '{{"variable": "{variable}"}}'
-          - '$.null'
-        version:
-          - '{{"version": "{version}"}}'
-          - '$.null'
         startTimeFromAscendingNode:
           - |
             {{
               "year": {startTimeFromAscendingNode#to_datetime_dict(list)}["year"],
               "month": {startTimeFromAscendingNode#to_datetime_dict(list)}["month"],
-              "day": {startTimeFromAscendingNode#to_datetime_dict(list)}["day"]
+              "nominal_day": {startTimeFromAscendingNode#to_datetime_dict(list)}["day"]
             }}
-          - $.properties.startDate
-        completionTimeFromAscendingNode: $.properties.endDate
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:SATELLITE_FIRE_BURNED_AREA"}}'
+          - $.properties.startdate
+        completionTimeFromAscendingNode: $.properties.enddate
     SATELLITE_METHANE:
-      productType: EO:ECMWF:DAT:SATELLITE_METHANE
-      processingLevel:
-        - level_2
-      version:
-        - "4.0"
+      dataset: EO:ECMWF:DAT:SATELLITE_METHANE
+      processing_level: level_2
+      version: '4_0'
       variable: xch4
       sensor_and_algorithm: sciamachy_wfmd
-      format: zip
       metadata_mapping:
-        id: '$.id'
         <<: *day_month_year
-        processingLevel:
-          - '{{"processing_level": {processingLevel}}}'
-          - '$.null'
-        variable:
-          - '{{"variable": "{variable}"}}'
-          - '$.null'
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:SATELLITE_METHANE"}}'
     SATELLITE_SEA_ICE_EDGE_TYPE:
-      productType: EO:ECMWF:DAT:SATELLITE_SEA_ICE_EDGE_TYPE
-      variable:
-        - sea_ice_type
+      dataset: EO:ECMWF:DAT:SATELLITE_SEA_ICE_EDGE_TYPE
+      variable: sea_ice_type
       region: northern_hemisphere
       cdr_type: cdr
       version: '3_0'
-      format: zip
       metadata_mapping:
-        id: '$.id'
         <<: *day_month_year
-        region:
-          - '{{"region": "{region}"}}'
-          - '$.null'
-        version:
-          - '{{"version": "{version}"}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:SATELLITE_SEA_ICE_EDGE_TYPE"}}'
     SATELLITE_SEA_ICE_THICKNESS:
-      productType: EO:ECMWF:DAT:SATELLITE_SEA_ICE_THICKNESS
-      satellite:
-        - envisat
+      dataset: EO:ECMWF:DAT:SATELLITE_SEA_ICE_THICKNESS
+      satellite: envisat
       cdr_type: cdr
       variable: all
       version: '3_0'
-      format: zip
       metadata_mapping:
-        id: '$.id'
-        variable:
-          - '{{"variable": "{variable}"}}'
-          - '$.null'
-        version:
-          - '{{"version": "{version}"}}'
-          - '$.null'
         <<: *month_year
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:SATELLITE_SEA_ICE_THICKNESS"}}'
     SATELLITE_SEA_ICE_CONCENTRATION:
-      productType: EO:ECMWF:DAT:SATELLITE_SEA_ICE_CONCENTRATION
-      cdr_type:
-        - cdr
-      variable: all
-      version: v3
-      sensor: ssmis
-      origin: ESA CCI
+      dataset: EO:ECMWF:DAT:SATELLITE_SEA_ICE_CONCENTRATION
+      cdr_type: cdr
+      origin: eumetsat_osi_saf
       region:
         - northern_hemisphere
+        - southern_hemisphere
+      sensor: ssmis
       temporal_aggregation: daily
-      format: zip
+      variable: all
+      version: v3
       metadata_mapping:
-        id: '$.id'
         <<: *day_month_year
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:SATELLITE_SEA_ICE_CONCENTRATION"}}'
     SATELLITE_SEA_LEVEL_GLOBAL:
-      productType: EO:ECMWF:DAT:SATELLITE_SEA_LEVEL_GLOBAL
-      variable:
-        - daily
-      format: zip
-      version: vDT2021
+      dataset: EO:ECMWF:DAT:SATELLITE_SEA_LEVEL_GLOBAL
+      variable: daily
+      version: vdt2021
       metadata_mapping:
-        id: '$.id'
         <<: *day_month_year
-        version:
-          - '{{"version": "{version}"}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:SATELLITE_SEA_LEVEL_GLOBAL"}}'
     SEASONAL_ORIGINAL_SL:
-      productType: EO:ECMWF:DAT:SEASONAL_ORIGINAL_SINGLE_LEVELS
-      variable:
-        - land_sea_mask
-      leadtime_hour:
-        - "0"
-      origin: ecmwf
-      system: "51"
-      format: grib
+      dataset: EO:ECMWF:DAT:SEASONAL_ORIGINAL_SINGLE_LEVELS
+      variable: land_sea_mask
+      leadtime_hour: 0
+      originating_centre: ecmwf
+      system: 5
+      data_format: grib
       metadata_mapping:
-        id: '$.id'
         <<: *day_month_year
-        origin:
-          - '{{"originating_centre": "{origin}"}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:SEASONAL_ORIGINAL_SINGLE_LEVELS"}}'
     SEASONAL_ORIGINAL_PL:
-      productType: EO:ECMWF:DAT:SEASONAL_ORIGINAL_PRESSURE_LEVELS
-      variable:
-        - geopotential
-      pressure_level:
-        - "10"
-      leadtime_hour:
-        - "12"
-      origin: ecmwf
-      system: "51"
-      format: grib
+      dataset: EO:ECMWF:DAT:SEASONAL_ORIGINAL_PRESSURE_LEVELS
+      variable: geopotential
+      pressure_level: 10
+      leadtime_hour: 12
+      originating_centre: ecmwf
+      system: 5
+      data_format: grib
       metadata_mapping:
-        id: '$.id'
         <<: *day_month_year
-        origin:
-          - '{{"originating_centre": "{origin}"}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:SEASONAL_ORIGINAL_PRESSURE_LEVELS"}}'
     SEASONAL_POSTPROCESSED_SL:
-      productType: EO:ECMWF:DAT:SEASONAL_POSTPROCESSED_SINGLE_LEVELS
-      providerProductType:
-        - ensemble_mean
-      variable:
-        - 10m_u_component_of_wind_anomaly
-      leadtime_month:
-        - "1"
+      dataset: EO:ECMWF:DAT:SEASONAL_POSTPROCESSED_SINGLE_LEVELS
+      product_type: ensemble_mean
+      originating_centre: ecmwf
+      variable: 2m_dewpoint_temperature_anomaly
+      leadtime_month: 1
       origin: ecmwf
-      system: "51"
-      format: grib
+      system: 5
+      data_format: grib
       metadata_mapping:
-        id: '$.id'
-        providerProductType:
-          - '{{"product_type": {providerProductType}}}'
-          - '$.null'
         <<: *month_year
-        origin:
-          - '{{"originating_centre": "{origin}"}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:SEASONAL_POSTPROCESSED_SINGLE_LEVELS"}}'
     SEASONAL_POSTPROCESSED_PL:
-      productType: EO:ECMWF:DAT:SEASONAL_POSTPROCESSED_PRESSURE_LEVELS
-      providerProductType:
-        - ensemble_mean
-      variable:
-        - geopotential_anomaly
-      pressure_level:
-        - "10"
-      leadtime_month:
-        - "1"
-      origin: ecmwf
-      system: "5"
-      format: grib
+      dataset: EO:ECMWF:DAT:SEASONAL_POSTPROCESSED_PRESSURE_LEVELS
+      product_type: ensemble_mean
+      variable: geopotential_anomaly
+      pressure_level: 10
+      leadtime_month: 1
+      originating_centre: ecmwf
+      system: 5
+      data_format: grib
       metadata_mapping:
-        id: '$.id'
-        providerProductType:
-          - '{{"product_type": {providerProductType}}}'
-          - '$.null'
         <<: *month_year
-        origin:
-          - '{{"originating_centre": "{origin}"}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:SEASONAL_POSTPROCESSED_PRESSURE_LEVELS"}}'
     SEASONAL_MONTHLY_SL:
-      productType: EO:ECMWF:DAT:SEASONAL_MONTHLY_SINGLE_LEVELS
-      variable:
-        - 10m_u_component_of_wind
-      providerProductType:
-        - ensemble_mean
-      leadtime_month:
-        - "1"
-      origin: ecmwf
-      system: "51"
-      format: grib
+      dataset: EO:ECMWF:DAT:SEASONAL_MONTHLY_SINGLE_LEVELS
+      variable: 10m_u_component_of_wind
+      product_type: monthly_mean
+      leadtime_month: 1
+      originating_centre: ecmwf
+      system: 5
+      data_format: grib
       metadata_mapping:
-        id: '$.id'
-        providerProductType:
-          - '{{"product_type": {providerProductType}}}'
-          - '$.null'
         <<: *month_year
-        origin:
-          - '{{"originating_centre": "{origin}"}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:SEASONAL_MONTHLY_SINGLE_LEVELS"}}'
     SEASONAL_MONTHLY_PL:
-      productType: EO:ECMWF:DAT:SEASONAL_MONTHLY_PRESSURE_LEVELS
-      variable:
-        - geopotential
-        - temperature
-      providerProductType:
-        - ensemble_mean
-      leadtime_month:
-        - "1"
-      pressure_level:
-        - "10"
-      origin: ecmwf
-      system: "51"
-      format: grib
+      dataset: EO:ECMWF:DAT:SEASONAL_MONTHLY_PRESSURE_LEVELS
+      variable: geopotential
+      product_type: monthly_mean
+      leadtime_month: 1
+      pressure_level: 10
+      originating_centre: ecmwf
+      system: 5
+      data_format: grib
       metadata_mapping:
-        id: '$.id'
-        providerProductType:
-          - '{{"product_type": {providerProductType}}}'
-          - '$.null'
         <<: *month_year
-        origin:
-          - '{{"originating_centre": "{origin}"}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:SEASONAL_MONTHLY_PRESSURE_LEVELS"}}'
     GLACIERS_DIST_RANDOLPH:
-      productType: EO:ECMWF:DAT:INSITU_GLACIERS_EXTENT
-      variable:
-        - glacier_area
-      providerProductType:
-        - gridded
-      format: zip
-      version: "6_0"
+      dataset: EO:ECMWF:DAT:INSITU_GLACIERS_EXTENT
+      variable: glacier_area
+      product_type: gridded
+      data_format: zip
+      version: rgi_6_0
+      metadata_mapping:
+        <<: *day_month_year
+    FIRE_HISTORICAL:
+      dataset: EO:ECMWF:DAT:CEMS_FIRE_HISTORICAL_V1
+      product_type: reanalysis
+      variable: fire_weather_index
+      system_version: '4_1'
+      data_format: grib
+      grid: original_grid
+      dataset_type: consolidated_dataset
       metadata_mapping:
-        id: '$.id'
         <<: *day_month_year
-        providerProductType:
-          - '{{"product_type": {providerProductType}}}'
-          - '$.null'
-        version:
-          - '{{"version": "{version}"}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:INSITU_GLACIERS_EXTENT"}}'
     GRIDDED_GLACIERS_MASS_CHANGE:
-      productType: EO:ECMWF:DAT:DERIVED_GRIDDED_GLACIER_MASS_CHANGE
+      dataset: EO:ECMWF:DAT:DERIVED_GRIDDED_GLACIER_MASS_CHANGE
       variable: glacier_mass_change
-      format: zip
-      version: "wgms_fog_2022_09"
+      data_format: zip
+      product_version: wgms_fog_2022_09
       metadata_mapping:
-        id: '$.id'
-        hydrological_year:
-          - '{{"hydrological_year": {hydrological_year}}}'
-          - '$.null'
         startTimeFromAscendingNode:
           - |
             {{
               "hydrological_year": {startTimeFromAscendingNode#get_hydrological_year}
             }}
-          - $.properties.startDate
-        completionTimeFromAscendingNode: $.properties.endDate
-        version:
-          - '{{"product_version": "{version}"}}'
-          - '$.null'
-        variable:
-          - '{{"variable": "{variable}"}}'
-          - '$.null'
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:DERIVED_GRIDDED_GLACIER_MASS_CHANGE"}}'
+          - $.properties.startdate
+        completionTimeFromAscendingNode: $.properties.enddate
     UERRA_EUROPE_SL:
-      productType: EO:ECMWF:DAT:REANALYSIS_UERRA_EUROPE_SINGLE_LEVELS
+      dataset: EO:ECMWF:DAT:REANALYSIS_UERRA_EUROPE_SINGLE_LEVELS
       variable: total_cloud_cover
       origin: uerra_harmonie
-      format: grib # netcdf format may fail
+      data_format: grib # netcdf format may fail
       metadata_mapping:
-        id: '$.id'
-        <<: *day_month_year
-        variable:
-          - '{{"variable": "{variable}"}}'
-          - '$.null'
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:REANALYSIS_UERRA_EUROPE_SINGLE_LEVELS"}}'
+        <<: *time_day_month_year
     AG_ERA5:
-      productType: EO:ECMWF:DAT:SIS_AGROMETEOROLOGICAL_INDICATORS
+      dataset: EO:ECMWF:DAT:SIS_AGROMETEOROLOGICAL_INDICATORS
       variable: cloud_cover
       version: '1_1'
-      time:
-        - "06_00"
-      format: zip
-      statistic:
-        - 24_hour_mean
+      time: '06_00'
+      data_format: zip
+      statistic: 24_hour_mean
       metadata_mapping:
-        id: '$.id'
         <<: *day_month_year
-        version:
-          - '{{"version": "{version}"}}'
-          - '$.null'
-        variable:
-          - '{{"variable": "{variable}"}}'
-          - '$.null'
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:SIS_AGROMETEOROLOGICAL_INDICATORS"}}'
     ERA5_SL:
-      productType: EO:ECMWF:DAT:REANALYSIS_ERA5_SINGLE_LEVELS
-      providerProductType:
-        - ensemble_mean
-      variable:
-        - 10m_u_component_of_wind
-      format: grib # netcdf format may fail
+      dataset: EO:ECMWF:DAT:REANALYSIS_ERA5_SINGLE_LEVELS
+      product_type: ensemble_mean
+      variable: 10m_u_component_of_wind
+      download_format: unarchived
+      data_format: grib # netcdf format may fail
       metadata_mapping:
-        id: '$.id'
-        startTimeFromAscendingNode:
-          - |
-            {{
-              "year": {startTimeFromAscendingNode#to_datetime_dict(string)}["year"],
-              "month": {startTimeFromAscendingNode#to_datetime_dict(list)}["month"],
-              "day": {startTimeFromAscendingNode#to_datetime_dict(list)}["day"],
-              "time": {startTimeFromAscendingNode#get_ecmwf_time}
-            }}
-          - $.properties.startDate
-        completionTimeFromAscendingNode: $.properties.endDate
-        providerProductType:
-          - '{{"product_type": {providerProductType}}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:REANALYSIS_ERA5_SINGLE_LEVELS"}}'
+        <<: *time_day_month_year
     ERA5_PL:
-      productType: EO:ECMWF:DAT:REANALYSIS_ERA5_PRESSURE_LEVELS
-      providerProductType:
-        - ensemble_mean
-      variable:
-        - temperature
-      pressure_level:
-        - "1"
-      format: grib
-      metadata_mapping:
-        id: '$.id'
-        startTimeFromAscendingNode:
-          - |
-            {{
-              "year": {startTimeFromAscendingNode#to_datetime_dict(string)}["year"],
-              "month": {startTimeFromAscendingNode#to_datetime_dict(list)}["month"],
-              "day": {startTimeFromAscendingNode#to_datetime_dict(list)}["day"],
-              "time": {startTimeFromAscendingNode#get_ecmwf_time}
-            }}
-          - $.properties.startDate
-        completionTimeFromAscendingNode: $.properties.endDate
-        providerProductType:
-          - '{{"product_type": {providerProductType}}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:REANALYSIS_ERA5_PRESSURE_LEVELS"}}'
+      dataset: EO:ECMWF:DAT:REANALYSIS_ERA5_PRESSURE_LEVELS
+      product_type: ensemble_mean
+      variable: temperature
+      pressure_level: 1
+      data_format: grib
+      download_format: unarchived
+      metadata_mapping:
+        <<: *time_day_month_year
     ERA5_SL_MONTHLY:
-      productType: EO:ECMWF:DAT:REANALYSIS_ERA5_SINGLE_LEVELS_MONTHLY_MEANS
-      providerProductType:
-        - monthly_averaged_ensemble_members
-      variable:
-        - 10m_u_component_of_wind
-      format: grib
-      time:
-        - "00:00"
+      dataset: EO:ECMWF:DAT:REANALYSIS_ERA5_SINGLE_LEVELS_MONTHLY_MEANS
+      product_type: monthly_averaged_ensemble_members
+      variable: 10m_u_component_of_wind
+      data_format: grib
+      download_format: unarchived
       metadata_mapping:
-        id: '$.id'
         startTimeFromAscendingNode:
           - |
             {{
               "year": {startTimeFromAscendingNode#to_datetime_dict(list)}["year"],
-              "month": {startTimeFromAscendingNode#to_datetime_dict(list)}["month"]
+              "month": {startTimeFromAscendingNode#to_datetime_dict(list)}["month"],
+              "time": {startTimeFromAscendingNode#get_ecmwf_time}
             }}
-          - $.properties.startDate
-        completionTimeFromAscendingNode: $.properties.endDate
-        providerProductType:
-          - '{{"product_type": {providerProductType}}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:REANALYSIS_ERA5_SINGLE_LEVELS_MONTHLY_MEANS"}}'
+          - $.properties.startdate
+        completionTimeFromAscendingNode: $.properties.enddate
     ERA5_PL_MONTHLY:
-      productType: EO:ECMWF:DAT:REANALYSIS_ERA5_PRESSURE_LEVELS_MONTHLY_MEANS
-      providerProductType:
-        - monthly_averaged_ensemble_members
-      variable:
-        - divergence
-      pressure_level:
-        - "1"
-      format: grib
-      time:
-        - "00:00"
+      dataset: EO:ECMWF:DAT:REANALYSIS_ERA5_PRESSURE_LEVELS_MONTHLY_MEANS
+      product_type: monthly_averaged_ensemble_members
+      variable: divergence
+      pressure_level: 1
+      data_format: grib
+      download_format: unarchived
       metadata_mapping:
-        id: '$.id'
         startTimeFromAscendingNode:
           - |
             {{
               "year": {startTimeFromAscendingNode#to_datetime_dict(list)}["year"],
-              "month": {startTimeFromAscendingNode#to_datetime_dict(list)}["month"]
+              "month": {startTimeFromAscendingNode#to_datetime_dict(list)}["month"],
+              "time": {startTimeFromAscendingNode#get_ecmwf_time}
             }}
-          - $.properties.startDate
-        completionTimeFromAscendingNode: $.properties.endDate
-        providerProductType:
-          - '{{"product_type": {providerProductType}}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:REANALYSIS_ERA5_PRESSURE_LEVELS_MONTHLY_MEANS"}}'
+          - $.properties.startdate
+        completionTimeFromAscendingNode: $.properties.enddate
     ERA5_LAND:
-      productType: EO:ECMWF:DAT:REANALYSIS_ERA5_LAND
-      variable:
-        - 2m_dewpoint_temperature
-      format: grib
+      dataset: EO:ECMWF:DAT:REANALYSIS_ERA5_LAND
+      variable: 2m_dewpoint_temperature
+      data_format: grib
+      download_format: unarchived
       metadata_mapping:
-        id: '$.id'
-        month:
-          - '{{"month": "{month}"}}'
-          - '$.null'
-        startTimeFromAscendingNode:
-          - |
-            {{
-              "year": {startTimeFromAscendingNode#to_datetime_dict(string)}["year"],
-              "month": {startTimeFromAscendingNode#to_datetime_dict(string)}["month"],
-              "day": {startTimeFromAscendingNode#to_datetime_dict(list)}["day"],
-              "time": {startTimeFromAscendingNode#get_ecmwf_time}
-            }}
-          - $.properties.startDate
-        completionTimeFromAscendingNode: $.properties.endDate
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:REANALYSIS_ERA5_LAND"}}'
+        <<: *time_day_month_year
     ERA5_LAND_MONTHLY:
-      productType: EO:ECMWF:DAT:REANALYSIS_ERA5_LAND_MONTHLY_MEANS
-      providerProductType:
-        - monthly_averaged_reanalysis
-      variable:
-        - 2m_dewpoint_temperature
-      format: grib
-      time:
-        - "00:00"
+      dataset: EO:ECMWF:DAT:REANALYSIS_ERA5_LAND_MONTHLY_MEANS
+      product_type: monthly_averaged_reanalysis
+      variable: 2m_dewpoint_temperature
+      data_format: grib
+      download_format: unarchived
       metadata_mapping:
-        id: '$.id'
         startTimeFromAscendingNode:
           - |
             {{
               "year": {startTimeFromAscendingNode#to_datetime_dict(list)}["year"],
-              "month": {startTimeFromAscendingNode#to_datetime_dict(list)}["month"]
+              "month": {startTimeFromAscendingNode#to_datetime_dict(list)}["month"],
+              "time": {startTimeFromAscendingNode#get_ecmwf_time}
             }}
-          - $.properties.startDate
-        completionTimeFromAscendingNode: $.properties.endDate
-        providerProductType:
-          - '{{"product_type": {providerProductType}}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:REANALYSIS_ERA5_LAND_MONTHLY_MEANS"}}'
+          - $.properties.startdate
+        completionTimeFromAscendingNode: $.properties.enddate
     CAMS_EAC4:
-      productType: EO:ECMWF:DAT:CAMS_GLOBAL_REANALYSIS_EAC4
-      format: grib
-      variable:
-        - '2m_dewpoint_temperature'
-      time:
-        - '00:00'
-      metadata_mapping:
-        id: '$.id'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:CAMS_GLOBAL_REANALYSIS_EAC4"}}'
+      dataset: EO:ECMWF:DAT:CAMS_GLOBAL_REANALYSIS_EAC4
+      data_format: grib
+      variable: 2m_dewpoint_temperature
+      time: 00:00
     CAMS_GLOBAL_EMISSIONS:
-      productType: EO:ECMWF:DAT:CAMS_GLOBAL_EMISSION_INVENTORIES
-      version:
-        - latest
-      format: zip
-      variable:
-        - acids
-      source:
-        - anthropogenic
+      dataset: EO:ECMWF:DAT:CAMS_GLOBAL_EMISSION_INVENTORIES
+      version: latest
+      data_format: zip
+      variable: acids
+      source: anthropogenic
       metadata_mapping:
-        id: '$.id'
         startTimeFromAscendingNode:
           - |
             {{
               "year": {startTimeFromAscendingNode#to_datetime_dict(list)}["year"]
             }}
-          - $.properties.startDate
-        completionTimeFromAscendingNode: $.properties.endDate
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:CAMS_GLOBAL_EMISSION_INVENTORIES"}}'
+          - $.properties.startdate
+        completionTimeFromAscendingNode: $.properties.enddate
     CAMS_EAC4_MONTHLY:
-      productType: EO:ECMWF:DAT:CAMS_GLOBAL_REANALYSIS_EAC4_MONTHLY
-      format: grib
-      variable:
-        - 2m_dewpoint_temperature
-      api_product_type:
-        - monthly_mean
+      dataset: EO:ECMWF:DAT:CAMS_GLOBAL_REANALYSIS_EAC4_MONTHLY
+      data_format: grib
+      variable: 2m_dewpoint_temperature
+      product_type: monthly_mean
       metadata_mapping:
-        id: '$.id'
         <<: *month_year
-        providerProductType:
-          - '{{"product_type": {providerProductType}}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:CAMS_GLOBAL_REANALYSIS_EAC4_MONTHLY"}}'
     CAMS_GREENHOUSE_INVERSION:
-      productType: EO:ECMWF:DAT:CAMS_GLOBAL_GREENHOUSE_GAS_INVERSION
+      dataset: EO:ECMWF:DAT:CAMS_GLOBAL_GREENHOUSE_GAS_INVERSION
       version: latest
       variable: carbon_dioxide
       quantity: mean_column
       input_observations: surface
-      aggregation: instantaneous
+      time_aggregation: instantaneous
       metadata_mapping:
-        id: '$.id'
         <<: *month_year
-        aggregation:
-          - '{{"time_aggregation": "{aggregation}"}}'
-          - '$.null'
-        variable:
-          - '{{"variable": "{variable}"}}'
-          - '$.null'
-        version:
-          - '{{"version": "{version}"}}'
-          - '$.null'
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:CAMS_GLOBAL_GREENHOUSE_GAS_INVERSION"}}'
     CAMS_EU_AIR_QUALITY_RE:
-      productType: EO:ECMWF:DAT:CAMS_EUROPE_AIR_QUALITY_REANALYSES
-      type:
-        - validated_reanalysis
-      format: zip
-      variable:
-       - nitrogen_dioxide
-      model:
-       - ensemble
-      level:
-        - '0'
+      dataset: EO:ECMWF:DAT:CAMS_EUROPE_AIR_QUALITY_REANALYSES
+      type: validated_reanalysis
+      data_format: zip
+      variable: nitrogen_dioxide
+      model: ensemble
+      level: 0
       metadata_mapping:
-        id: '$.id'
         <<: *month_year
-        type:
-          - '{{"type": {type}}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:CAMS_EUROPE_AIR_QUALITY_REANALYSES"}}'
     CAMS_GRF:
-      productType: EO:ECMWF:DAT:CAMS_GLOBAL_RADIATIVE_FORCINGS
-      format: zip
-      variable:
-        - radiative_forcing_of_carbon_dioxide
+      dataset: EO:ECMWF:DAT:CAMS_GLOBAL_RADIATIVE_FORCINGS
+      data_format: zip
+      variable: radiative_forcing_of_carbon_dioxide
       forcing_type: instantaneous
-      band:
-        - long_wave
-      sky_type:
-        - all_sky
-      level:
-        - surface
-      version:
-        - '2'
+      band: long_wave
+      sky_type: all_sky
+      level: surface
+      version: 2
       metadata_mapping:
-        id: '$.id'
         <<: *month_year
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:CAMS_GLOBAL_RADIATIVE_FORCINGS"}}'
     CAMS_GRF_AUX:
-      productType: EO:ECMWF:DAT:CAMS_GLOBAL_RADIATIVE_FORCING_AUXILLIARY_VARIABLES
-      band:
-        - short_wave
-      sky_type:
-        - clear_sky
-      version:
-        - '1.5'
-      format: zip
-      variable:
-        - aerosol_radiation_effect
-      aerosol_type:
-        - marine
-      level:
-        - surface
+      dataset: EO:ECMWF:DAT:CAMS_GLOBAL_RADIATIVE_FORCING_AUXILLIARY_VARIABLES
+      band: short_wave
+      sky_type: clear_sky
+      version: 1.5
+      data_format: zip
+      variable: aerosol_radiation_effect
+      aerosol_type: marine
+      level: surface
       metadata_mapping:
-        id: '$.id'
         <<: *month_year
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:CAMS_GLOBAL_RADIATIVE_FORCING_AUXILLIARY_VARIABLES"}}'
     CAMS_GREENHOUSE_EGG4:
-      productType: EO:ECMWF:DAT:CAMS_GLOBAL_GHG_REANALYSIS_EGG4
-      format: grib
-      variable:
-        - snow_albedo
-      step:
-        - '0'
-      metadata_mapping:
-        id: '$.id'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:CAMS_GLOBAL_GHG_REANALYSIS_EGG4"}}'
+      dataset: EO:ECMWF:DAT:CAMS_GLOBAL_GHG_REANALYSIS_EGG4
+      data_format: grib
+      variable: snow_albedo
+      step: 0
     CAMS_GREENHOUSE_EGG4_MONTHLY:
-      productType: EO:ECMWF:DAT:CAMS_GLOBAL_GHG_REANALYSIS_EGG4_MONTHLY
-      format: grib
-      variable:
-        - snow_albedo
-      providerProductType:
-        - monthly_mean_by_hour_of_day
-      step:
-        - '3'
-      time:
-        - '00:00'
+      dataset: EO:ECMWF:DAT:CAMS_GLOBAL_GHG_REANALYSIS_EGG4_MONTHLY
+      data_format: grib
+      variable: snow_albedo
+      product_type: monthly_mean_by_hour_of_day
+      step: 3
+      time: 00:00
       metadata_mapping:
-        id: '$.id'
         <<: *month_year
-        providerProductType:
-          - '{{"product_type": {providerProductType}}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:CAMS_GLOBAL_GHG_REANALYSIS_EGG4_MONTHLY"}}'
     CAMS_EU_AIR_QUALITY_FORECAST:
-      productType: EO:ECMWF:DAT:CAMS_EUROPE_AIR_QUALITY_FORECASTS
-      model:
-        - ensemble
-      format: grib
-      variable:
-        - alder_pollen
-      type:
-        - forecast
-      time:
-        - '00:00'
-      level:
-        - '0'
-      leadtime_hour:
-        - '0'
-      metadata_mapping:
-        id: '$.id'
-        type:
-          - '{{"type": {type}}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:CAMS_EUROPE_AIR_QUALITY_FORECASTS"}}'
+      dataset: EO:ECMWF:DAT:CAMS_EUROPE_AIR_QUALITY_FORECASTS
+      model: ensemble
+      data_format: grib
+      variable: alder_pollen
+      type: forecast
+      time: 00:00
+      level: 0
+      leadtime_hour: 0
     CAMS_GAC_FORECAST:
-      productType: EO:ECMWF:DAT:CAMS_GLOBAL_ATMOSPHERIC_COMPOSITION_FORECASTS
-      type:
-        - forecast
-      format: grib
-      variable:
-        - ammonium_aerosol_optical_depth_550nm
-      time:
-        - '00:00'
-      leadtime_hour:
-        - '0'
-      metadata_mapping:
-        id: '$.id'
-        type:
-          - '{{"type": {type}}}'
-          - '$.null'
-        <<: *variable_list
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:CAMS_GLOBAL_ATMOSPHERIC_COMPOSITION_FORECASTS"}}'
+      dataset: EO:ECMWF:DAT:CAMS_GLOBAL_ATMOSPHERIC_COMPOSITION_FORECASTS
+      type: forecast
+      data_format: grib
+      variable: 10m_u_component_of_wind
+      time: 00:00
+      leadtime_hour: 0
+    CAMS_GFE_GFAS:
+      dataset: EO:ECMWF:DAT:CAMS_GLOBAL_FIRE_EMISSIONS_GFAS
+      data_format: grib
+      variable: wildfire_combustion_rate
+      time: 00:00
+      leadtime_hour: 0
     CAMS_SOLAR_RADIATION:
-      productType: EO:ECMWF:DAT:CAMS_SOLAR_RADIATION_TIMESERIES
+      dataset: EO:ECMWF:DAT:CAMS_SOLAR_RADIATION_TIMESERIES
       sky_type: clear
-      step: 1minute
+      time_step: 1minute
       time_reference: true_solar_time
       altitude: -999
       format: csv
+      geometry: POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))
       metadata_mapping:
-        id: '$.id'
-        step:
-          - '{{"time_step": "{step}"}}'
-          - '$.null'
-        sky_type:
-          - '{{"sky_type": "{sky_type}"}}'
-          - '$.null'
         geometry:
           - '{{"longitude": {geometry#to_longitude_latitude}["lon"], "latitude": {geometry#to_longitude_latitude}["lat"]}}'
           - '$.null'
-        defaultGeometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-        orderLink: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download?{{"location": "{downloadLink}","product_id":"{id}", "dataset_id": "EO:ECMWF:DAT:CAMS_SOLAR_RADIATION_TIMESERIES"}}'
   auth: !plugin
     type: TokenAuth
     matching_url: https://[-\w\.]+.wekeo2.eu
@@ -5280,6 +3937,9 @@
         metadata_mapping:
           download_id: $.json.features[0]._id
           downloadLink: https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/download/{download_id}
+    products:
+      FIRE_HISTORICAL:
+        output_extension: .grib
 
 ---
 !provider  # MARK: wekeo_cmems
@@ -5321,10 +3981,11 @@
         missionEndDate: '$.metadata._source.tempextent_end'
         processingLevel: '$.null'
         keywords: '$.metadata._source.keywords'
-    constraints_file_url: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/queryable/{dataset}'
-    constraints_file_dataset_key: productType
-    constraints_entry: constraints
-    stop_without_constraints_entry_key: true
+    discover_queryables:
+      fetch_url: null
+      product_type_fetch_url: null
+      constraints_url: 'https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/queryable/{dataset}'
+      constraints_entry: constraints
     metadata_mapping:
       productType:
         - '{{"dataset_id": "{productType}"}}'
@@ -5533,7 +4194,7 @@
         - '{$.Footprint#from_ewkt}'
       # The url to download the product "as is" (literal or as a template to be completed either after the search result
       # is obtained from the provider or during the eodag download phase)
-      downloadLink: 'https://zipper.creodias.eu/odata/v1/Products({uid})/$value'
+      downloadLink: '$.S3Path.`sub(/^(.*)$/, s3:/\\1)`'
       # storageStatus: must be one of ONLINE, STAGING, OFFLINE
       storageStatus: '{$.Online#get_group_name((?P<ONLINE>True)|(?P<OFFLINE>False))}'
       collection:
@@ -5541,8 +4202,6 @@
         - $.null
       quicklook: '$.Assets[?(@.Type="QUICKLOOK")].DownloadLink'
       thumbnail: '$.Assets[?(@.Type="QUICKLOOK")].DownloadLink'
-        # Additional metadata provided by the providers but that don't appear in the reference spec
-      productIdentifier: '$.S3Path'
   download: !plugin
     type: CreodiasS3Download
     s3_endpoint: 'https://eodata.cloudferro.com'
@@ -5766,101 +4425,44 @@
   description: Destination Earth Digital Twin Outputs from LUMI through Polytope API
   url: https://polytope.lumi.apps.dte.destination-earth.eu/openapi
   search: !plugin
-    type: BuildSearchResult
+    type: ECMWFSearch
     ssl_verify: true
+    dates_required: True
     discover_queryables:
       fetch_url: null
       product_type_fetch_url: null
-    constraints_file_url: "https://s3.central.data.destination-earth.eu/swift/v1/dedt-lumi-constraints/{dataset}.json"
+      constraints_url: "https://s3.central.data.destination-earth.eu/swift/v1/dedt-lumi-constraints/{dataset}.json"
     metadata_mapping:
-      productType: destination-earth
-      storageStatus: OFFLINE
       startTimeFromAscendingNode: '{$.startTimeFromAscendingNode#to_iso_date}'
       completionTimeFromAscendingNode:
         - '{{"date": "{startTimeFromAscendingNode#to_non_separated_date}/to/{completionTimeFromAscendingNode#to_non_separated_date}"}}'
         - '{$.completionTimeFromAscendingNode#to_iso_date}'
-      geometry: POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))
       qs: $.qs
       orderLink: 'https://polytope.lumi.apps.dte.destination-earth.eu/api/v1/requests/destination-earth?{{"verb": "retrieve", "request": {qs#to_geojson} }}'
-      downloadLink: $.null
-      activity:
-        - activity
-        - $.activity
-      anoffset:
-        - anoffset
-        - $.anoffset
-      class:
-        - class
-        - $.class
-      dataset:
-        - dataset
-        - $.dataset
-      domain:
-        - domain
-        - $.domain
-      experiment:
-        - experiment
-        - $.experiment
-      expver:
-        - expver
-        - $.expver
-      generation:
-        - generation
-        - $.generation
-      levelist:
-        - levelist
-        - $.levelist
-      levtype:
-        - levtype
-        - $.levtype
-      model:
-        - model
-        - $.model
-      param:
-        - param
-        - $.param
-      realization:
-        - realization
-        - $.realization
-      resolution:
-        - resolution
-        - $.resolution
-      step:
-        - step
-        - $.step
-      stream:
-        - stream
-        - $.stream
-      time:
-        - time
-        - $.time
-      type:
-        - type
-        - $.type
   products:
     DT_EXTREMES:
-      class: d1
       dataset: extremes-dt
+      class: d1
       expver: "0001"
       stream: oper
       type: fc
       levtype: sfc
-      step: "0"
-      param: "31"
+      step: 0
+      param: 31
       time: "0000"
     DT_CLIMATE_ADAPTATION:
-      activity: ScenarioMIP
-      class: d1
       dataset: climate-dt
-      experiment: SSP3-7.0
-      expver: "0001"
+      class: d1
       generation: 1
+      expver: "0001"
+      stream: clte
+      type: fc
+      activity: ScenarioMIP
+      experiment: SSP3-7.0
+      realization: 1
       model: IFS-NEMO
       param: 134/165/166
-      realization: 1
       resolution: high
-      stream: clte
-      type: fc
       levtype: sfc
       time: "0000"
   download: !plugin
@@ -5894,9 +4496,7 @@
     no_auth_download: True
     products:
       DT_EXTREMES:
-        output_extension: .grib
       DT_CLIMATE_ADAPTATION:
-        output_extension: .grib
   auth: !plugin
     type: OIDCAuthorizationCodeFlowAuth
     matching_url: https://[-\w\.]+.dte.destination-earth.eu
@@ -5964,6 +4564,7 @@
     timeout: 20
     ssl_verify: true
     extract: true
+    archive_depth: 2
     order_enabled: True
     order_method: GET
     order_on_response:
@@ -5980,11 +4581,6 @@
       on_success:
         metadata_mapping:
           downloadLink: '{orderStatusLink}'
-    products:
-      DT_EXTREMES:
-        output_extension: .grib
-      DT_CLIMATE_ADAPTATION:
-        output_extension: .grib
   auth: !plugin
     type: OIDCTokenExchangeAuth
     matching_url: https://[-\w\.]+.data.destination-earth.eu
@@ -6114,6 +4710,14 @@
       productType: EO.ECMWF.DAT.SATELLITE_SEA_ICE_EDGE_TYPE
       metadata_mapping:
         <<: *orderable_mm
+    SATELLITE_SEA_ICE_THICKNESS:
+      productType: EO.ECMWF.DAT.SATELLITE_SEA_ICE_THICKNESS
+      metadata_mapping:
+        <<: *orderable_mm
+    SATELLITE_SEA_ICE_CONCENTRATION:
+      productType: EO.ECMWF.DAT.SATELLITE_SEA_ICE_CONCENTRATION
+      metadata_mapping:
+        <<: *orderable_mm
     SEASONAL_POSTPROCESSED_SL:
       productType: EO.ECMWF.DAT.SEASONAL_FORECAST_ANOMALIES_ON_SINGLE_LEVELS_2017_PRESENT
       metadata_mapping:
@@ -6214,7 +4818,7 @@
       productType: EO.ECMWF.DAT.CAMS_GLOBAL_EMISSION_INVENTORIES
       metadata_mapping:
         <<: *orderable_mm
-    # COPERNICUS ADS -  Digital Elevation Model
+    # COPERNICUS ADS - Digital Elevation Model
     COP_DEM_GLO30_DGED:
       productType: EO.DEM.DAT.COP-DEM_GLO-30-DGED
     COP_DEM_GLO30_DTED:
@@ -6224,6 +4828,85 @@
       productType: EO.DEM.DAT.COP-DEM_GLO-90-DGED
     COP_DEM_GLO90_DTED:
       productType: EO.DEM.DAT.COP-DEM_GLO-90-DTED
+    # COPERNICUS Marine
+    MO_GLOBAL_ANALYSISFORECAST_PHY_001_024:
+      productType: EO.MO.DAT.GLOBAL_ANALYSISFORECAST_PHY_001_024
+    MO_GLOBAL_ANALYSISFORECAST_WAV_001_027:
+      productType: EO.MO.DAT.GLOBAL_ANALYSISFORECAST_WAV_001_027
+    MO_GLOBAL_ANALYSISFORECAST_BGC_001_028:
+      productType: EO.MO.DAT.GLOBAL_ANALYSISFORECAST_BGC_001_028
+    MO_GLOBAL_MULTIYEAR_PHY_ENS_001_031:
+      productType: EO.MO.DAT.GLOBAL_MULTIYEAR_PHY_ENS_001_031
+    MO_GLOBAL_MULTIYEAR_WAV_001_032:
+      productType: EO.MO.DAT.GLOBAL_MULTIYEAR_WAV_001_032
+    MO_GLOBAL_MULTIYEAR_BGC_001_033:
+      productType: EO.MO.DAT.GLOBAL_MULTIYEAR_BGC_001_033
+    MO_INSITU_GLO_PHY_TS_OA_NRT_013_002:
+      productType: EO.MO.DAT.INSITU_GLO_PHY_TS_OA_NRT_013_002
+    MO_INSITU_GLO_PHY_TS_OA_MY_013_052:
+      productType: EO.MO.DAT.INSITU_GLO_PHY_TS_OA_MY_013_052
+    MO_INSITU_GLO_PHY_UV_DISCRETE_NRT_013_048:
+      productType: EO.MO.DAT.INSITU_GLO_PHY_UV_DISCRETE_NRT_013_048
+    MO_MULTIOBS_GLO_BIO_BGC_3D_REP_015_010:
+      productType: EO.MO.DAT.MULTIOBS_GLO_BIO_BGC_3D_REP_015_010
+    MO_MULTIOBS_GLO_BIO_CARBON_SURFACE_MYNRT_015_008:
+      productType: EO.MO.DAT.MULTIOBS_GLO_BIO_CARBON_SURFACE_MYNRT_015_008
+    MO_MULTIOBS_GLO_BGC_NUTRIENTS_CARBON_PROFILES_MYNRT_015_009:
+      productType: EO.MO.DAT.MULTIOBS_GLO_BGC_NUTRIENTS_CARBON_PROFILES_MYNRT_015_009
+    MO_MULTIOBS_GLO_PHY_MYNRT_015_003:
+      productType: EO.MO.DAT.MULTIOBS_GLO_PHY_MYNRT_015_003
+    MO_MULTIOBS_GLO_PHY_S_SURFACE_MYNRT_015_013:
+      productType: EO.MO.DAT.MULTIOBS_GLO_PHY_S_SURFACE_MYNRT_015_013
+    MO_MULTIOBS_GLO_PHY_TSUV_3D_MYNRT_015_012:
+      productType: EO.MO.DAT.MULTIOBS_GLO_PHY_TSUV_3D_MYNRT_015_012
+    MO_MULTIOBS_GLO_PHY_W_3D_REP_015_007:
+      productType: EO.MO.DAT.MULTIOBS_GLO_PHY_W_3D_REP_015_007
+    MO_OCEANCOLOUR_GLO_BGC_L3_MY_009_103:
+      productType: EO.MO.DAT.OCEANCOLOUR_GLO_BGC_L3_MY_009_103
+    MO_OCEANCOLOUR_GLO_BGC_L3_MY_009_107:
+      productType: EO.MO.DAT.OCEANCOLOUR_GLO_BGC_L3_MY_009_107
+    MO_OCEANCOLOUR_GLO_BGC_L3_NRT_009_101:
+      productType: EO.MO.DAT.OCEANCOLOUR_GLO_BGC_L3_NRT_009_101
+    MO_OCEANCOLOUR_GLO_BGC_L4_MY_009_104:
+      productType: EO.MO.DAT.OCEANCOLOUR_GLO_BGC_L4_MY_009_104
+    MO_OCEANCOLOUR_GLO_BGC_L4_MY_009_108:
+      productType: EO.MO.DAT.OCEANCOLOUR_GLO_BGC_L4_MY_009_108
+    MO_OCEANCOLOUR_GLO_BGC_L4_NRT_009_102:
+      productType: EO.MO.DAT.OCEANCOLOUR_GLO_BGC_L4_NRT_009_102
+    MO_SEAICE_GLO_SEAICE_L4_NRT_OBSERVATIONS_011_001:
+      productType: EO.MO.DAT.SEAICE_GLO_SEAICE_L4_NRT_OBSERVATIONS_011_001
+    MO_SEAICE_GLO_SEAICE_L4_NRT_OBSERVATIONS_011_006:
+      productType: EO.MO.DAT.SEAICE_GLO_SEAICE_L4_NRT_OBSERVATIONS_011_006
+    MO_SEAICE_GLO_SEAICE_L4_REP_OBSERVATIONS_011_009:
+      productType: EO.MO.DAT.SEAICE_GLO_SEAICE_L4_REP_OBSERVATIONS_011_009
+    MO_SEALEVEL_GLO_PHY_L4_NRT_008_046:
+      productType: EO.MO.DAT.SEALEVEL_GLO_PHY_L4_NRT_008_046
+    MO_SEALEVEL_GLO_PHY_MDT_008_063:
+      productType: EO.MO.DAT.SEALEVEL_GLO_PHY_MDT_008_063
+    MO_SST_GLO_SST_L3S_NRT_OBSERVATIONS_010_010:
+      productType: EO.MO.DAT.SST_GLO_SST_L3S_NRT_OBSERVATIONS_010_010
+    MO_SST_GLO_SST_L4_NRT_OBSERVATIONS_010_001:
+      productType: EO.MO.DAT.SST_GLO_SST_L4_NRT_OBSERVATIONS_010_001
+    MO_SST_GLO_SST_L4_REP_OBSERVATIONS_010_011:
+      productType: EO.MO.DAT.SST_GLO_SST_L4_REP_OBSERVATIONS_010_011
+    MO_SST_GLO_SST_L4_REP_OBSERVATIONS_010_024:
+      productType: EO.MO.DAT.SST_GLO_SST_L4_REP_OBSERVATIONS_010_024
+    MO_WIND_GLO_PHY_CLIMATE_L4_MY_012_003:
+      productType: EO.MO.DAT.WIND_GLO_PHY_CLIMATE_L4_MY_012_003
+    MO_WIND_GLO_PHY_L3_MY_012_005:
+      productType: EO.MO.DAT.WIND_GLO_PHY_L3_MY_012_005
+    MO_WIND_GLO_PHY_L3_NRT_012_002:
+      productType: EO.MO.DAT.WIND_GLO_PHY_L3_NRT_012_002
+    MO_WIND_GLO_PHY_L4_MY_012_006:
+      productType: EO.MO.DAT.WIND_GLO_PHY_L4_MY_012_006
+    MO_WIND_GLO_PHY_L4_NRT_012_004:
+      productType: EO.MO.DAT.WIND_GLO_PHY_L4_NRT_012_004
+    MO_WAVE_GLO_PHY_SWH_L3_NRT_014_001:
+      productType: EO.MO.DAT.WAVE_GLO_PHY_SWH_L3_NRT_014_001
+    MO_WAVE_GLO_PHY_SWH_L4_NRT_014_003:
+      productType: EO.MO.DAT.WAVE_GLO_PHY_SWH_L4_NRT_014_003
+    MO_WAVE_GLO_PHY_SPC_FWK_L3_NRT_014_002:
+      productType: EO.MO.DAT.WAVE_GLO_PHY_SPC_FWK_L3_NRT_014_002
     # CLMS
     CLMS_CORINE:
       productType: EO.CLMS.DAT.CORINE
@@ -6259,6 +4942,108 @@
       metadata_mapping:
         storageStatus: '{$.null#replace_str("Not Available","OFFLINE")}'
         <<: *orderable_mm
+    # AERIS
+    AERIS_IAGOS:
+      productType: EO.AERIS.DAT.IAGOS
+    # METOP
+    METOP_ASCSZFR02:
+      productType: EO.EUM.CM.METOP.ASCSZFR02
+    METOP_ASCSZOR02:
+      productType: EO.EUM.CM.METOP.ASCSZOR02
+    METOP_ASCSZRR02:
+      productType: EO.EUM.CM.METOP.ASCSZRR02
+    METOP_AMSU_L1:
+      productType: EO.EUM.DAT.METOP.AMSUL1
+    METOP_ASCSZF1B:
+      productType: EO.EUM.DAT.METOP.ASCSZF1B
+    METOP_ASCSZR1B:
+      productType: EO.EUM.DAT.METOP.ASCSZR1B
+    METOP_ASCSZO1B:
+      productType: EO.EUM.DAT.METOP.ASCSZO1B
+    METOP_AVHRRGACR02:
+      productType: EO.EUM.DAT.METOP.AVHRRGACR02
+    METOP_AVHRRL1:
+      productType: EO.EUM.DAT.METOP.AVHRRL1
+    METOP_GLB_SST_NC:
+      productType: EO.EUM.DAT.METOP.GLB-SST-NC
+    METOP_GOMEL1:
+      productType: EO.EUM.DAT.METOP.GOMEL1
+    METOP_GOMEL1R03:
+      productType: EO.EUM.DAT.METOP.GOMEL1R03
+    METOP_HIRSL1:
+      productType: EO.EUM.DAT.MULT.HIRSL1
+    METOP_IASIL1C_ALL:
+      productType: EO.EUM.DAT.METOP.IASIL1C-ALL
+    METOP_IASSND02:
+      productType: EO.EUM.DAT.METOP.IASSND02
+    METOP_IASTHR011:
+      productType: EO.EUM.DAT.METOP.IASTHR011
+    METOP_LSA_002:
+      productType: EO.EUM.DAT.METOP.LSA-002
+    METOP_MHSL1:
+      productType: EO.EUM.DAT.METOP.MHSL1
+    METOP_OSI_104:
+      productType: EO.EUM.DAT.METOP.OSI-104
+    METOP_OSI_150A:
+      productType: EO.EUM.DAT.METOP.OSI-150-A
+    METOP_OSI_150B:
+      productType: EO.EUM.DAT.METOP.OSI-150-B
+    METOP_SOMO12:
+      productType: EO.EUM.DAT.METOP.SOMO12
+    METOP_SOMO25:
+      productType: EO.EUM.DAT.METOP.SOMO25
+    # MSG
+    MSG_AMVR02:
+      productType: EO.EUM.DAT.AMVR02
+    MSG_GSAL2R02:
+      productType: EO.EUM.DAT.GSAL2R02
+    MSG_CLM:
+      productType: EO.EUM.DAT.MSG.CLM
+    MSG_CLM_IODC:
+      productType: EO.EUM.DAT.MSG.CLM-IODC
+    MSG_HRSEVIRI:
+      productType: EO.EUM.DAT.MSG.HRSEVIRI
+    MSG_HRSEVIRI_IODC:
+      productType: EO.EUM.DAT.MSG.HRSEVIRI-IODC
+    MSG_LSA_FRM:
+      productType: EO.EUM.DAT.MSG.LSA-FRM
+    MSG_LSA_LST_CDR:
+      productType: EO.EUM.DAT.MSG.LSA-LST-CDR
+    MSG_LSA_LSTDE:
+      productType: EO.EUM.DAT.MSG.LSA-LSTDE
+    MSG_RSS_CLM:
+      productType: EO.EUM.DAT.MSG.RSS-CLM
+    MSG_MSG15_RSS:
+      productType: EO.EUM.DAT.MSG.MSG15-RSS
+    # GSW
+    GSW_CHANGE:
+      productType: EO.GSW.DAT.CHANGE
+    GSW_EXTENT:
+      productType: EO.GSW.DAT.EXTENT
+    GSW_OCCURRENCE:
+      productType: EO.GSW.DAT.OCCURRENCE
+    GSW_RECURRENCE:
+      productType: EO.GSW.DAT.RECURRENCE
+    GSW_SEASONALITY:
+      productType: EO.GSW.DAT.SEASONALITY
+    GSW_TRANSITIONS:
+      productType: EO.GSW.DAT.TRANSITIONS
+    # Eurostat
+    EUSTAT_GREENHOUSE_GAS_EMISSION_AGRICULTURE:
+      productType: STAT.EUSTAT.DAT.GREENHOUSE_GAS_EMISSION_AGRICULTURE
+    EUSTAT_POP_AGE_GROUP_SEX_NUTS3:
+      productType: STAT.EUSTAT.DAT.POP_AGE_GROUP_SEX_NUTS3
+    EUSTAT_POP_AGE_SEX_NUTS2:
+      productType: STAT.EUSTAT.DAT.POP_AGE_SEX_NUTS2
+    EUSTAT_POP_CHANGE_DEMO_BALANCE_CRUDE_RATES_NUTS3:
+      productType: STAT.EUSTAT.DAT.POP_CHANGE_DEMO_BALANCE_CRUDE_RATES_NUTS3
+    EUSTAT_SHARE_ENERGY_FROM_RENEWABLE:
+      productType: STAT.EUSTAT.DAT.SHARE_ENERGY_FROM_RENEWABLE
+    # ISIMIP
+    ISIMIP_CLIMATE_FORCING_ISIMIP3B:
+      productType: EO.ISIMIP.DAT.CLIMATE-FORCING_ISIMIP3b
+    ISIMIP_SOCIO_ECONOMIC_FORCING_ISIMIP3B:
+      productType: EO.ISIMIP.DAT.SOCIO-ECONOMIC-FORCING_ISIMIP3b
     GENERIC_PRODUCT_TYPE:
       productType: '{productType}'
 ---
@@ -6270,28 +5055,14 @@
     - host
   url: https://data.eumetsat.int
   anchor_sentinel: &sentinel_params
-    orbitDirection:
-      - orbitdir
-      - '$.properties.acquisitionInformation[0].acquisitionParameters.orbitDirection'
-    relativeOrbitNumber:
-      - relorbit
-      - '$.properties.acquisitionInformation[0].acquisitionParameters.relativeOrbitNumber'
-    timeliness:
-      - timeliness
-      - '$.properties.productInformation.timeliness'
-    cycleNumber:
-      - cycle
-      - '$.properties.acquisitionInformation[0].acquisitionParameters.cycleNumber'
+    orbitDirection: '$.properties.acquisitionInformation[0].acquisitionParameters.orbitDirection'
+    relativeOrbitNumber: '$.properties.acquisitionInformation[0].acquisitionParameters.relativeOrbitNumber'
+    timeliness: '$.properties.productInformation.timeliness'
+    cycleNumber: '$.properties.acquisitionInformation[0].acquisitionParameters.cycleNumber'
   anchor_orbit_zone_tile: &orbit_zone_tile
     orbitNumber:
       - orbit
       - '$.properties.acquisitionInformation[0].acquisitionParameters.orbitNumber'
-    utmZone:
-      - zone
-      - '$.null'
-    tileIdentifier:
-      - t6
-      - '$.null'
   search: !plugin
     type: QueryStringSearch
     api_endpoint: 'https://api.eumetsat.int/data/search-products/1.0.0/os'
@@ -6349,17 +5120,10 @@
       productType:
         - type
         - '$.properties.productInformation.productType'
-      platform:
-        - sat
-        - '$.properties.acquisitionInformation[0].platform.platformShortName'
+      platform: '$.properties.acquisitionInformation[0].platform.platformShortName'
       instrument: '$.properties.acquisitionInformation[0].instrument.instrumentShortName'
       # INSPIRE obligated OpenSearch Parameters for Collection Search (Table 4)
-      title:
-        - title
-        - '{$.properties.title#remove_extension}'
-      publicationDate:
-        - publication
-        - '$.null'
+      title: '{$.properties.title#remove_extension}'
       # OpenSearch Parameters for Product Search (Table 5)
       parentIdentifier:
         - pi
@@ -6390,9 +5154,7 @@
       storageStatus: '{$.null#replace_str("Not Available","ONLINE")}'
       assets: '{$.properties.links.sip-entries#assets_list_to_dict}'
       # Additional metadata provided by the providers but that don't appear in the reference spec
-      size:
-        - size
-        - '$.properties.productInformation.size'
+      size: '$.properties.productInformation.size'
       type: '$.null'
       # set duplicate metadata due to metadata discovery to null
       acquisitionInformation: '$.null'
@@ -6677,6 +5439,50 @@
       parentIdentifier: EO:EUM:DAT:0394
     MSG_AMVR02:
       parentIdentifier: EO:EUM:DAT:0405
+    MFG_GSA_57:
+      parentIdentifier: EO:EUM:DAT:0301
+    MFG_GSA_63:
+      parentIdentifier: EO:EUM:DAT:0302
+    MSG_MFG_GSA_0:
+      parentIdentifier: EO:EUM:DAT:0300
+    HIRS_FDR_1_MULTI:
+      parentIdentifier: EO:EUM:DAT:0647
+    MSG_OCA_CDR:
+      parentIdentifier: EO:EUM:DAT:0617
+    S6_RADIO_OCCULTATION:
+      parentIdentifier: EO:EUM:DAT:0853
+    MTG_LI_AF:
+      parentIdentifier: EO:EUM:DAT:0686
+    MTG_LI_LFL:
+      parentIdentifier: EO:EUM:DAT:0691
+    MTG_LI_LGR:
+      parentIdentifier: EO:EUM:DAT:0782
+    MTG_LI_AFA:
+      parentIdentifier: EO:EUM:DAT:0687
+    MTG_LI_AFR:
+      parentIdentifier: EO:EUM:DAT:0688
+    MTG_LI_LEF:
+      parentIdentifier: EO:EUM:DAT:0690
+    MTG_FCI_FDHSI:
+      parentIdentifier: EO:EUM:DAT:0662
+    MTG_FCI_HRFI:
+      parentIdentifier: EO:EUM:DAT:0665
+    MTG_FCI_ASR_BUFR:
+      parentIdentifier: EO:EUM:DAT:0799
+    MTG_FCI_ASR_NETCDF:
+      parentIdentifier: EO:EUM:DAT:0677
+    MTG_FCI_AMV_BUFR:
+      parentIdentifier: EO:EUM:DAT:0998
+    MTG_FCI_AMV_NETCDF:
+      parentIdentifier: EO:EUM:DAT:0676
+    MTG_FCI_CLM:
+      parentIdentifier: EO:EUM:DAT:0678
+    MTG_FCI_GII:
+      parentIdentifier: EO:EUM:DAT:0683
+    MTG_FCI_OCA:
+      parentIdentifier: EO:EUM:DAT:0684
+    MTG_FCI_OLR:
+      parentIdentifier: EO:EUM:DAT:0685
     GENERIC_PRODUCT_TYPE:
       productType: '{productType}'
       parentIdentifier: '{parentIdentifier}'
@@ -6766,8 +5572,8 @@
         index: 1
     MO_MULTIOBS_GLO_BIO_BGC_3D_REP_015_010:
       productType: MULTIOBS_GLO_BIO_BGC_3D_REP_015_010
-    MO_MULTIOBS_GLO_BIO_CARBON_SURFACE_REP_015_008:
-      productType: MULTIOBS_GLO_BIO_CARBON_SURFACE_REP_015_008
+    MO_MULTIOBS_GLO_BIO_CARBON_SURFACE_MYNRT_015_008:
+      productType: MULTIOBS_GLO_BIO_CARBON_SURFACE_MYNRT_015_008
     MO_MULTIOBS_GLO_BGC_NUTRIENTS_CARBON_PROFILES_MYNRT_015_009:
       productType: MULTIOBS_GLO_BGC_NUTRIENTS_CARBON_PROFILES_MYNRT_015_009
     MO_MULTIOBS_GLO_PHY_MYNRT_015_003:
@@ -6800,8 +5606,8 @@
       productType: SST_GLO_SST_L4_REP_OBSERVATIONS_010_011
     MO_SST_GLO_SST_L4_REP_OBSERVATIONS_010_024:
       productType: SST_GLO_SST_L4_REP_OBSERVATIONS_010_024
-    MO_WAVE_GLO_WAV_L3_SPC_NRT_OBSERVATIONS_014_002:
-      productType: WAVE_GLO_WAV_L3_SPC_NRT_OBSERVATIONS_014_002
+    MO_WAVE_GLO_PHY_SPC_FWK_L3_NRT_014_002:
+      productType: WAVE_GLO_PHY_SPC-FWK_L3_NRT_014_002
       code_mapping:
         param: platformSerialIdentifier
         index: 0
@@ -6899,6 +5705,9 @@
         completionTimeFromAscendingNode: temporal:endDate
         platformSerialIdentifier: spaceborne:satellitePlatform
         cloudCover: spaceborne:cloudCover
+      sort_order_mapping:
+        ascending: asc
+        descending: desc
     metadata_mapping:
       uid: '$.id'
       # OpenSearch Parameters for Collection Search (Table 3)
@@ -6915,12 +5724,15 @@
         - '{{"query":{{"spaceborne:satelliteSensor":{{"eq":"{instrument}"}}}}}}'
         - '$.properties."spaceborne:satelliteSensor"'
       # INSPIRE obligated OpenSearch Parameters for Collection Search (Table 4)
-      title: '{$.properties."accessService:endpointURL"#replace_str(r"^.*\/(\w+)\.zip$",r"\1")}'
+      title: '$.properties.identifier'
       keyword: '$.properties."spaceborne:keywords"'
       # OpenSearch Parameters for Product Search (Table 5)
       orbitNumber:
-        - '{{"query":{{"spaceborne:absoluteOrbitID":{{"eq":"{orbitNumber}"}}}}}}'
+        - '{{"query":{{"spaceborne:absoluteOrbitID":{{"eq":{orbitNumber}}}}}}}'
         - '$.properties."spaceborne:absoluteOrbitID"'
+      relativeOrbitNumber:
+        - '{{"query":{{"spaceborne:orbitID":{{"eq":{relativeOrbitNumber}}}}}}}'
+        - '$.properties."spaceborne:orbitID"'
       orbitDirection:
         - '{{"query":{{"spaceborne:orbitDirection":{{"eq":"{orbitDirection}"}}}}}}'
         - '$.properties."spaceborne:orbitDirection"'
@@ -6928,7 +5740,7 @@
         - '{{"query":{{"spaceborne:swath":{{"eq":"{swathIdentifier}"}}}}}}'
         - '$.properties."spaceborne:swath"'
       cloudCover:
-        - '{{"query":{{"spaceborne:cloudCover":{{"lte":"{cloudCover}"}}}}}}'
+        - '{{"query":{{"spaceborne:cloudCover":{{"lte":{cloudCover}}}}}}}'
         - '$.properties."spaceborne:cloudCover"'
       sensorMode:
         - '{{"query":{{"spaceborne:sensorMode":{{"eq":"{sensorMode}"}}}}}}'
@@ -6945,15 +5757,18 @@
         - '$.properties."spaceborne:polarization"'
       # Custom parameters (not defined in the base document referenced above)
       id:
-        - '{{"query":{{"accessService:endpointURL":{{"contains":"{id}"}}}}}}'
-        - '{$.properties."accessService:endpointURL"#replace_str(r"^.*\/(\w+)\.zip$",r"\1")}'
+        - '{{"query":{{"identifier":{{"eq":"{id}"}}}}}}'
+        - '$.properties.identifier'
+      tileIdentifier:
+        - '{{"query":{{"spaceborne:tile":{{"contains":"{tileIdentifier}"}}}}}}'
+        - '{$.properties."spaceborne:tile"#replace_str(r"^T?(.*)$",r"\1")}'
       geometry:
         - '{{"intersects":{geometry#to_geojson}}}'
         - '($.geometry.`str()`.`sub(/^None$/, POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90)))`)|($.geometry[*])'
       providerProductType:
         - '{{"query":{{"spaceborne:productType":{{"eq":"{providerProductType}"}}}}}}'
         - '$.null'
-      downloadLink: '$.assets[?(@.roles[0] == "data")].href'
+      downloadLink: '$.assets[?(@.roles[0] == "data") & (@.type != "application/xml")].href'
       quicklook: '$.assets[?(@.roles[0] == "overview")].href.`sub(/^(.*)$/, \\1?scope=gdh)`'
       thumbnail: '$.assets[?(@.roles[0] == "overview")].href.`sub(/^(.*)$/, \\1?scope=gdh)`'
       # storageStatus set to ONLINE for consistency between providers
@@ -6985,12 +5800,150 @@
     ssl_verify: false
     ignore_assets: true
     archive_depth: 2
+    auth_error_code:
+      - 401
+      - 403
   auth: !plugin
     type: HTTPHeaderAuth
     matching_url: https://geodes-portal.cnes.fr
     headers:
       X-API-Key: "{apikey}"
 
+---
+!provider  # MARK: geodes_s3
+  name: geodes_s3
+  priority: 0
+  roles:
+    - host
+  description: French National Space Agency (CNES) Earth Observation portal with internal s3 Datalake
+  url: https://geodes.cnes.fr
+  search: !plugin
+    type: StacListAssets
+    api_endpoint: https://geodes-portal.cnes.fr/api/stac/search
+    s3_endpoint: https://s3.datalake.cnes.fr
+    need_auth: true
+    ssl_verify: false
+    discover_queryables:
+      fetch_url: null
+      product_type_fetch_url: null
+    discover_product_types:
+      fetch_url: https://geodes-portal.cnes.fr/api/stac/collections
+      fetch_method: POST
+      fetch_body:
+        limit: 10000
+    pagination:
+      total_items_nb_key_path: '$.context.matched'
+      # 1000 is ok and 2000 fails
+      max_items_per_page: 1000
+    sort:
+      sort_by_tpl: '{{"sortBy": [ {{"field": "{sort_param}", "direction": "{sort_order}" }} ] }}'
+      sort_by_default:
+        - !!python/tuple [startTimeFromAscendingNode, ASC]
+      sort_param_mapping:
+        id: spaceborne:s2TakeId
+        startTimeFromAscendingNode: temporal:startDate
+        completionTimeFromAscendingNode: temporal:endDate
+        platformSerialIdentifier: spaceborne:satellitePlatform
+        cloudCover: spaceborne:cloudCover
+      sort_order_mapping:
+        ascending: asc
+        descending: desc
+    metadata_mapping:
+      uid: '$.id'
+      # OpenSearch Parameters for Collection Search (Table 3)
+      productType:
+        - '{{"query":{{"dataType":{{"eq":"{productType}"}}}}}}'
+        - '$.properties."dataType"'
+      processingLevel:
+        - '{{"query":{{"spaceborne:productLevel":{{"eq":"{processingLevel}"}}}}}}'
+        - '$.properties."spaceborne:productLevel"'
+      platformSerialIdentifier:
+        - '{{"query":{{"spaceborne:satellitePlatform":{{"eq":"{platformSerialIdentifier}"}}}}}}'
+        - '$.properties."spaceborne:satellitePlatform"'
+      instrument:
+        - '{{"query":{{"spaceborne:satelliteSensor":{{"eq":"{instrument}"}}}}}}'
+        - '$.properties."spaceborne:satelliteSensor"'
+      # INSPIRE obligated OpenSearch Parameters for Collection Search (Table 4)
+      title: '$.properties.identifier'
+      keyword: '$.properties."spaceborne:keywords"'
+      # OpenSearch Parameters for Product Search (Table 5)
+      orbitNumber:
+        - '{{"query":{{"spaceborne:absoluteOrbitID":{{"eq":{orbitNumber}}}}}}}'
+        - '$.properties."spaceborne:absoluteOrbitID"'
+      relativeOrbitNumber:
+        - '{{"query":{{"spaceborne:orbitID":{{"eq":{relativeOrbitNumber}}}}}}}'
+        - '$.properties."spaceborne:orbitID"'
+      orbitDirection:
+        - '{{"query":{{"spaceborne:orbitDirection":{{"eq":"{orbitDirection}"}}}}}}'
+        - '$.properties."spaceborne:orbitDirection"'
+      swathIdentifier:
+        - '{{"query":{{"spaceborne:swath":{{"eq":"{swathIdentifier}"}}}}}}'
+        - '$.properties."spaceborne:swath"'
+      cloudCover:
+        - '{{"query":{{"spaceborne:cloudCover":{{"lte":{cloudCover}}}}}}}'
+        - '$.properties."spaceborne:cloudCover"'
+      sensorMode:
+        - '{{"query":{{"spaceborne:sensorMode":{{"eq":"{sensorMode}"}}}}}}'
+        - '$.properties."spaceborne:sensorMode"'
+      # OpenSearch Parameters for Acquistion Parameters Search (Table 6)
+      startTimeFromAscendingNode:
+        - '{{"query":{{"temporal:endDate":{{"gte":"{startTimeFromAscendingNode#to_iso_utc_datetime}"}}}}}}'
+        - '$.properties."temporal:startDate"'
+      completionTimeFromAscendingNode:
+        - '{{"query":{{"temporal:startDate":{{"lte":"{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}}}}}'
+        - '$.properties."temporal:endDate"'
+      polarizationChannels:
+        - '{{"query":{{"spaceborne:polarization":{{"eq":"{polarizationChannels}"}}}}}}'
+        - '$.properties."spaceborne:polarization"'
+      # Custom parameters (not defined in the base document referenced above)
+      id:
+        - '{{"query":{{"identifier":{{"eq":"{id}"}}}}}}'
+        - '$.properties.identifier'
+      tileIdentifier:
+        - '{{"query":{{"spaceborne:tile":{{"contains":"{tileIdentifier}"}}}}}}'
+        - '{$.properties."spaceborne:tile"#replace_str(r"^T?(.*)$",r"\1")}'
+      geometry:
+        - '{{"intersects":{geometry#to_geojson}}}'
+        - '($.geometry.`str()`.`sub(/^None$/, POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90)))`)|($.geometry[*])'
+      providerProductType:
+        - '{{"query":{{"spaceborne:productType":{{"eq":"{providerProductType}"}}}}}}'
+        - '$.null'
+      downloadLink: '$.properties["accessService:endpointURL"]'
+      quicklook: '$.assets[?(@.roles[0] == "overview")].href.`sub(/^(.*)$/, \\1?scope=gdh)`'
+      thumbnail: '$.assets[?(@.roles[0] == "overview")].href.`sub(/^(.*)$/, \\1?scope=gdh)`'
+      # storageStatus set to ONLINE for consistency between providers
+      storageStatus: '{$.null#replace_str("Not Available","ONLINE")}'
+  products:
+    S1_SAR_OCN:
+      providerProductType: OCN
+      productType: PEPS_S1_L2
+      metadata_mapping:
+        cloudCover: '$.null'
+    S1_SAR_GRD:
+      providerProductType: GRD
+      productType: PEPS_S1_L1
+      metadata_mapping:
+        cloudCover: '$.null'
+    S1_SAR_SLC:
+      providerProductType: SLC
+      productType: PEPS_S1_L1
+      metadata_mapping:
+        cloudCover: '$.null'
+    S2_MSI_L1C:
+      productType: PEPS_S2_L1C
+    S2_MSI_L2A_MAJA:
+      productType: MUSCATE_SENTINEL2_SENTINEL2_L2A
+    GENERIC_PRODUCT_TYPE:
+      productType: '{productType}'
+  download: !plugin
+    type: AwsDownload
+    s3_endpoint: https://s3.datalake.cnes.fr
+  auth: !plugin
+    type: AwsAuth
+    auth_error_code: 403
+    matching_conf:
+      s3_endpoint: https://s3.datalake.cnes.fr
+
 ---
 !provider # MARK: cop_ewds
   name: cop_ewds
@@ -6999,6 +5952,16 @@
   roles:
     - host
   url: https://ewds.climate.copernicus.eu
+  anchor_time_day_month_year: &time_day_month_year
+    completionTimeFromAscendingNode:
+      - |
+        {{
+          "year": {_date#interval_to_datetime_dict}["year"],
+          "month": {_date#interval_to_datetime_dict}["month"],
+          "day": {_date#interval_to_datetime_dict}["day"],
+          "time": {startTimeFromAscendingNode#get_ecmwf_time}
+        }}
+      - '{$.completionTimeFromAscendingNode#to_iso_date}'
   anchor_day_month_year: &day_month_year
     completionTimeFromAscendingNode:
       - |
@@ -7016,6 +5979,16 @@
           "month": {_date#interval_to_datetime_dict}["month"]
         }}
       - '{$.completionTimeFromAscendingNode#to_iso_date}'
+  anchor_time_hday_hmonth_hyear: &time_hday_hmonth_hyear
+    completionTimeFromAscendingNode:
+      - |
+        {{
+          "hyear": {_date#interval_to_datetime_dict}["year"],
+          "hmonth": {_date#interval_to_datetime_dict}["month"],
+          "hday": {_date#interval_to_datetime_dict}["day"],
+          "time": {startTimeFromAscendingNode#get_ecmwf_time}
+        }}
+      - '{$.completionTimeFromAscendingNode#to_iso_date}'
   anchor_hday_hmonth_hyear: &hday_hmonth_hyear
     completionTimeFromAscendingNode:
       - |
@@ -7065,224 +6038,151 @@
         need_search: true
         metadata_mapping:
           downloadLink: $.json.asset.value.href
-    products:
-      FIRE_HISTORICAL:
-        output_extension: .grib
   search: !plugin
-    type: BuildSearchResult
+    type: ECMWFSearch
     ssl_verify: true
     end_date_excluded: false
+    dates_required: True
     remove_from_query:
       - dataset
       - date
     discover_queryables:
       fetch_url: null
       product_type_fetch_url: null
-    constraints_file_url: https://ewds.climate.copernicus.eu/api/catalogue/v1/collections/{dataset}/constraints.json
+      constraints_url: https://ewds.climate.copernicus.eu/api/catalogue/v1/collections/{dataset}/constraints.json
+      form_url: https://ewds.climate.copernicus.eu/api/catalogue/v1/collections/{dataset}/form.json
     metadata_mapping:
-      productType: $.productType
-      title: $.id
       startTimeFromAscendingNode: '{$.startTimeFromAscendingNode#to_iso_utc_datetime}'
       completionTimeFromAscendingNode:
         - date={startTimeFromAscendingNode#to_iso_date}/{completionTimeFromAscendingNode#to_iso_date}
         - '{$.completionTimeFromAscendingNode#to_iso_utc_datetime}'
-      _date: '{startTimeFromAscendingNode#to_iso_date}/{completionTimeFromAscendingNode#to_iso_date}'
-      id: $.id
       # The geographic extent of the product
       geometry:
         - '{{"area": {geometry#to_nwse_bounds}}}'
         - $.geometry
-      defaultGeometry: POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))
-      storageStatus: '{$.null#replace_str("Not Available","OFFLINE")}'
-      downloadLink: $.null
       qs: $.qs
       orderLink: 'https://ewds.climate.copernicus.eu/api/retrieve/v1/processes/{dataset}/execution?{{"inputs": {qs#to_geojson}}}'
-      # Copernicus CDS specific parameters
-      api_product_type:
-        - product_type
-        - $.api_product_type
-      dataset:
-        - dataset
-        - $.dataset
-      dataset_type:
-        - dataset_type
-        - $.dataset_type
-      day:
-        - day
-        - $.day
-      download_format:
-        - download_format
-        - $.download_format
-      format:
-        - data_format
-        - $.format
-      grid:
-        - grid
-        - $.grid
-      hday:
-        - hday
-        - $.hday
-      hmonth:
-        - hmonth
-        - $.hmonth
-      hyear:
-        - hyear
-        - $.hyear
-      hydrological_model:
-        - hydrological_model
-        - $.hydrological_model
-      leadtime_hour:
-        - leadtime_hour
-        - $.leadtime_hour
-      model_levels:
-        - model_levels
-        - $.model_levels
-      month:
-        - month
-        - $.month
-      originating_centre:
-        - originating_centre
-        - $.originating_centre
-      soil_level:
-        - soil_level
-        - $.soil_level
-      system_version:
-        - system_version
-        - '{$.system_version#to_geojson}'
-      variable:
-        - variable
-        - $.variable
-      time:
-        - time
-        - $.time
-      year:
-        - year
-        - $.year
   products:
     EFAS_HISTORICAL:
       dataset: efas-historical
-      format: grib
+      data_format: grib
       download_format: zip
       model_levels: surface_level
       variable: snow_depth_water_equivalent
-      system_version: version_5_0
-      time: 00:00
+      system_version: version_4_0
       metadata_mapping:
-        <<: *hday_hmonth_hyear
+        <<: *time_hday_hmonth_hyear
     EFAS_FORECAST:
       dataset: efas-forecast
-      format: grib
+      data_format: grib
       download_format: zip
       system_version: operational
       originating_centre: ecmwf
-      api_product_type: control_forecast
-      variable: river_discharge_in_the_last_6_hours
+      product_type: control_forecast
+      variable:
+        - river_discharge_in_the_last_6_hours
+        - river_discharge_in_the_last_24_hours
       model_levels: surface_level
-      time: 00:00
-      leadtime_hour: '24'
+      leadtime_hour: 24
       metadata_mapping:
-        <<: *day_month_year
+        <<: *time_day_month_year
     EFAS_SEASONAL:
       dataset: efas-seasonal
       system_version: operational
-      format: grib
+      data_format: grib
       download_format: zip
       variable: river_discharge_in_the_last_24_hours
       model_levels: surface_level
-      leadtime_hour: '24'
+      leadtime_hour: 24
       metadata_mapping:
         <<: *month_year
     EFAS_REFORECAST:
       dataset: efas-reforecast
-      system_version: version_5_0
-      format: grib
+      system_version: version_4_0
+      data_format: grib
       download_format: zip
-      api_product_type: control_forecast
+      product_type: control_forecast
       variable: river_discharge_in_the_last_6_hours
       model_levels: surface_level
-      leadtime_hour: '6'
+      leadtime_hour: 0
       metadata_mapping:
         <<: *hday_hmonth_hyear
     EFAS_SEASONAL_REFORECAST:
       dataset: efas-seasonal-reforecast
       system_version: version_5_0
-      format: grib
+      data_format: grib
       download_format: zip
       variable: river_discharge_in_the_last_24_hours
       model_levels: surface_level
-      leadtime_hour: '24'
+      leadtime_hour: 24
       metadata_mapping:
         <<: *hmonth_hyear
     GLOFAS_HISTORICAL:
       dataset: cems-glofas-historical
       system_version: version_4_0
       variable: river_discharge_in_the_last_24_hours
-      format: grib2
+      data_format: grib2
       download_format: zip
       hydrological_model: lisflood
-      api_product_type: consolidated
+      product_type: consolidated
       metadata_mapping:
         <<: *hday_hmonth_hyear
     GLOFAS_FORECAST:
       dataset: cems-glofas-forecast
       system_version: operational
       variable: river_discharge_in_the_last_24_hours
-      format: grib2
+      data_format: grib2
       hydrological_model: htessel_lisflood
-      api_product_type: control_forecast
-      leadtime_hour: '24'
+      product_type: control_forecast
+      leadtime_hour: 24
       download_format: zip
       metadata_mapping:
         <<: *day_month_year
     GLOFAS_SEASONAL:
       dataset: cems-glofas-seasonal
       variable: river_discharge_in_the_last_24_hours
-      format: grib2
+      data_format: grib2
       download_format: zip
       system_version: operational
-      hydrological_model: lisflood
-      leadtime_hour: '24'
+      hydrological_model: htessel_lisflood
+      leadtime_hour: 24
       metadata_mapping:
         <<: *month_year
     GLOFAS_SEASONAL_REFORECAST:
       dataset: cems-glofas-seasonal-reforecast
-      format: grib2
+      data_format: grib2
       download_format: zip
       variable: river_discharge_in_the_last_24_hours
       system_version: version_4_0
       hydrological_model: lisflood
-      leadtime_hour: '24'
+      leadtime_hour: 24
       metadata_mapping:
         <<: *hmonth_hyear
     GLOFAS_REFORECAST:
       dataset: cems-glofas-reforecast
       variable: river_discharge_in_the_last_24_hours
-      format: grib2
+      data_format: grib2
       download_format: zip
-      system_version: version_4_0
+      system_version: version_3_1
       hydrological_model: lisflood
-      api_product_type: control_reforecast
-      leadtime_hour: '24'
+      product_type: control_reforecast
+      leadtime_hour: 24
       metadata_mapping:
         <<: *hday_hmonth_hyear
     FIRE_HISTORICAL:
       dataset: cems-fire-historical-v1
       grid: original_grid
       dataset_type: consolidated_dataset
-      api_product_type: reanalysis
+      product_type: reanalysis
       variable: build_up_index
       system_version: '4_1'
-      format: grib
+      data_format: grib
       metadata_mapping:
         <<: *day_month_year
     FIRE_SEASONAL:
       dataset: cems-fire-seasonal
-      day: '01'
-      leadtime_hour: '12'
+      leadtime_hour: 12
       variable: build_up_index
-      system_version: '5'
+      release_version: 5
       metadata_mapping:
-        system_version:
-          - release_version
-          - $.system_version
-        <<: *month_year
+        <<: *day_month_year