diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05bd33688..2406bf5e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,6 +112,18 @@ ecbuild_add_option( FEATURE GEOGRAPHY
     DESCRIPTION "Support for Geoiterator and nearest neighbour"
     DEFAULT ON )
 
+ecbuild_add_option( FEATURE ECKIT_GEO
+    DESCRIPTION "Support for Geoiterator and nearest neighbour (additional backend)"
+    CONDITION ENABLE_GEOGRAPHY
+    DEFAULT OFF )
+
+if( eccodes_HAVE_ECKIT_GEO AND NOT TARGET eckit_geo )
+    ecbuild_find_package(NAME eckit VERSION 1.27 REQUIRED)
+    if( NOT TARGET eckit_geo )
+        ecbuild_critical("eckit has not been built with ECKIT_GEO enabled")
+    endif()
+endif()
+
 ecbuild_add_option( FEATURE JPG
     DESCRIPTION "Support for JPG decoding/encoding"
     DEFAULT ON )
@@ -485,7 +497,7 @@ ecbuild_pkgconfig(
   IGNORE_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIRS} ${NETCDF_INCLUDE_DIRS}
   VARIABLES      HAVE_MEMFS HAVE_GEOGRAPHY HAVE_JPEG HAVE_LIBJASPER HAVE_LIBOPENJPEG
                  HAVE_ECCODES_THREADS HAVE_ECCODES_OMP_THREADS
-                 HAVE_NETCDF HAVE_FORTRAN HAVE_PNG HAVE_AEC
+                 HAVE_NETCDF HAVE_FORTRAN HAVE_PNG HAVE_AEC HAVE_ECKIT_GEO
 )
 if( HAVE_FORTRAN )
   ecbuild_pkgconfig(
@@ -497,7 +509,7 @@ if( HAVE_FORTRAN )
                         ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIRS} ${NETCDF_INCLUDE_DIRS}
     VARIABLES           HAVE_MEMFS HAVE_GEOGRAPHY HAVE_JPEG HAVE_LIBJASPER HAVE_LIBOPENJPEG
                         HAVE_ECCODES_THREADS HAVE_ECCODES_OMP_THREADS
-                        HAVE_NETCDF HAVE_PNG HAVE_AEC
+                        HAVE_NETCDF HAVE_PNG HAVE_AEC HAVE_ECKIT_GEO
   )
 endif()
 
diff --git a/README.md b/README.md
index 05d59c9f1..d174d0edd 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,8 @@ ecCodes
 
 [![codecov](https://codecov.io/gh/ecmwf/eccodes/branch/develop/graph/badge.svg)](https://codecov.io/gh/ecmwf/eccodes)
 
+[![Anaconda-Server Badge](https://anaconda.org/conda-forge/eccodes/badges/version.svg)](https://anaconda.org/conda-forge/eccodes)
+
 ecCodes is a package developed by ECMWF which provides an application programming interface
 and a set of tools for decoding and encoding messages in the following formats:
 
diff --git a/VERSION b/VERSION
index 4e53322f8..b6ea68a86 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.38.66
+2.40.66
diff --git a/definitions/boot.def b/definitions/boot.def
index 25b3f895d..5cbac2743 100644
--- a/definitions/boot.def
+++ b/definitions/boot.def
@@ -124,3 +124,5 @@ if(kindOfProduct == `WRAP`){
  constant WRAPstr="WRAP";
  alias ls.identifier=WRAPstr;
 }
+
+meta isMessageValid message_is_valid(kindOfProduct) : hidden;
diff --git a/definitions/bufr/boot.def b/definitions/bufr/boot.def
index 76ea8d4d9..03b915288 100644
--- a/definitions/bufr/boot.def
+++ b/definitions/bufr/boot.def
@@ -13,7 +13,7 @@ transient setToMissingIfOutOfRange=0 : hidden;
 
 # This gets updated twice a year by WMO.
 # See https://community.wmo.int/en/wis/latest-version
-constant masterTablesVersionNumberLatest = 42;
+constant masterTablesVersionNumberLatest = 43;
 
 #negative value=not used
 transient inputDelayedDescriptorReplicationFactor={-1} : hidden;
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1003.table b/definitions/bufr/tables/0/wmo/43/codetables/1003.table
new file mode 100644
index 000000000..a0c90ee0f
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1003.table
@@ -0,0 +1,8 @@
+0 0 ANTARCTICA
+1 1 REGION I
+2 2 REGION II
+3 3 REGION III
+4 4 REGION IV
+5 5 REGION V
+6 6 REGION VI
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/10063.table b/definitions/bufr/tables/0/wmo/43/codetables/10063.table
new file mode 100644
index 000000000..50978740b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/10063.table
@@ -0,0 +1,10 @@
+0 0 INCREASING, THEN DECREASING; ATMOSPHERIC PRESSURE THE SAME OR HIGHER THAN THREE HOURS AGO
+1 1 INCREASING, THEN STEADY; OR INCREASING, THEN INCREASING MORE SLOWLY
+2 2 INCREASING (STEADILY OR UNSTEADILY)
+3 3 DECREASING OR STEADY, THEN INCREASING; OR INCREASING, THEN INCREASING MORE RAPIDLY
+4 4 STEADY; ATMOSPHERIC PRESSURE THE SAME AS THREE HOURS AGO
+5 5 DECREASING, THEN INCREASING; ATMOSPHERIC PRESSURE THE SAME OR LOWER THAN THREE HOURS AGO
+6 6 DECREASING, THEN STEADY; OR DECREASING, THEN DECREASING MORE SLOWLY
+7 7 DECREASING (STEADILY OR UNSTEADILY)
+8 8 STEADY OR INCREASING, THEN DECREASING; OR DECREASING, THEN DECREASING MORE RAPIDLY
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/10064.table b/definitions/bufr/tables/0/wmo/43/codetables/10064.table
new file mode 100644
index 000000000..88ba38a95
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/10064.table
@@ -0,0 +1,4 @@
+0 0 SUBSONIC
+1 1 TRANSONIC
+2 2 SUPERSONIC
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1007.table b/definitions/bufr/tables/0/wmo/43/codetables/1007.table
new file mode 100644
index 000000000..3beb27875
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1007.table
@@ -0,0 +1,270 @@
+0 0 RESERVED
+1 1 ERS 1
+2 2 ERS 2
+3 3 METOP-1 (METOP-B)
+4 4 METOP-2 (METOP-A)
+5 5 METOP-3 (METOP-C)
+6 6 CO2M-A
+7 7 CO2M-B
+8 8 CO2M-C
+20 20 SPOT1
+21 21 SPOT2
+22 22 SPOT3
+23 23 SPOT4
+24 24 METOP-D
+25 25 METOP-E
+26 26 METOP-F
+27 27 METOP-G
+28 28 METOP-H
+29 29 METOP-I
+40 40 OERSTED
+41 41 CHAMP
+42 42 TERRASAR-X
+43 43 TANDEM-X
+44 44 PAZ
+45 45 ALTIUS
+46 46 SMOS
+47 47 CRYOSAT-2
+48 48 AEOLUS
+49 49 EARTHCARE
+50 50 METEOSAT 3
+51 51 METEOSAT 4
+52 52 METEOSAT 5
+53 53 METEOSAT 6
+54 54 METEOSAT 7
+55 55 METEOSAT 8
+56 56 METEOSAT 9
+57 57 METEOSAT 10
+58 58 METEOSAT 1
+59 59 METEOSAT 2
+60 60 ENVISAT
+61 61 SENTINEL 3A
+62 62 SENTINEL 1A
+63 63 SENTINEL 1B
+64 64 SENTINEL 5P
+65 65 SENTINEL 3B
+66 66 SENTINEL-6A
+67 67 SENTINEL-6B
+68 68 SENTINEL-1C
+69 69 SENTINEL-1D
+70 70 METEOSAT 11
+71 71 METEOSAT 12
+72 72 METEOSAT 13
+73 73 METEOSAT 14
+74 74 METEOSAT 15
+75 75 METEOSAT 16
+76 76 METEOSAT 17
+80 80 AWS1
+120 120 ADEOS
+121 121 ADEOS II
+122 122 GCOM-W1
+123 123 GCOM-C
+140 140 GOSAT
+141 141 GOSAT-2
+142 142 GOSAT-GW
+150 150 GMS 3
+151 151 GMS 4
+152 152 GMS 5
+153 153 GMS
+154 154 GMS 2
+171 171 MTSAT-1R
+172 172 MTSAT-2
+173 173 HIMAWARI-8
+174 174 HIMAWARI-9
+200 200 NOAA 8
+201 201 NOAA 9
+202 202 NOAA 10
+203 203 NOAA 11
+204 204 NOAA 12
+205 205 NOAA 14
+206 206 NOAA 15
+207 207 NOAA 16
+208 208 NOAA 17
+209 209 NOAA 18
+220 220 LANDSAT 5
+221 221 LANDSAT 4
+222 222 LANDSAT 7
+223 223 NOAA 19
+224 224 NPP
+225 225 NOAA 20
+226 226 NOAA 21
+227 227 TROPICS-02
+228 228 TROPICS-03
+229 229 TROPICS-04
+240 240 DMSP 7
+241 241 DMSP 8
+242 242 DMSP 9
+243 243 DMSP 10
+244 244 DMSP 11
+245 245 DMSP 12
+246 246 DMSP 13
+247 247 DMSP 14
+248 248 DMSP 15
+249 249 DMSP 16
+250 250 GOES 6
+251 251 GOES 7
+252 252 GOES 8
+253 253 GOES 9
+254 254 GOES 10
+255 255 GOES 11
+256 256 GOES 12
+257 257 GOES 13
+258 258 GOES 14
+259 259 GOES 15
+260 260 JASON 1
+261 261 JASON 2
+262 262 JASON 3
+263 263 TROPICS-05
+264 264 TROPICS-06
+265 265 GEOOPTICS CICERO OP1
+266 266 GEOOPTICS CICERO OP2
+267 267 PLANETIQ GNOMES-A
+268 268 PLANETIQ GNOMES-B
+269 269 SPIRE LEMUR 3U CUBESAT
+270 270 GOES 16
+271 271 GOES 17
+272 272 GOES 18
+273 273 GOES 19
+280 280 SWOT
+281 281 QUIKSCAT
+282 282 TRMM
+283 283 CORIOLIS
+284 284 TROPICS-07
+285 285 DMSP 17
+286 286 DMSP 18
+287 287 DMSP 19
+288 288 GPM-CORE
+289 289 ORBITING CARBON OBSERVATORY - 2 (OCO-2, NASA)
+310 310 GOMS 1
+311 311 GOMS 2
+320 320 METEOR 2-21
+321 321 METEOR 3-5
+322 322 METEOR 3M-1
+323 323 METEOR 3M-2
+324 324 METEOR-M N2
+325 325 METEOR-M N2 2
+341 341 RESURS 01-4
+410 410 KALPANA-1
+421 421 OCEANSAT-2
+422 422 SCATSAT-1
+423 423 OCEANSAT-3
+430 430 INSAT 1B
+431 431 INSAT 1C
+432 432 INSAT 1D
+440 440 MEGHA-TROPIQUES
+441 441 SARAL
+450 450 INSAT 2A
+451 451 INSAT 2B
+452 452 INSAT 2E
+470 470 INSAT 3A
+471 471 INSAT 3D
+472 472 INSAT 3E
+473 473 INSAT 3DR
+474 474 INSAT 3DS
+500 500 FY-1C
+501 501 FY-1D
+502 502 HAI YANG 2A (HY-2A, SOA/NSOAS CHINA)
+503 503 HAI YANG 2B (HY-2B, SOA/NSOAS CHINA)
+504 504 HAI YANG 2C (HY-2C, SOA/NSOAS CHINA)
+505 505 HAI YANG 2D (HY-2D, SOA/NSOAS CHINA)
+510 510 FY-2
+512 512 FY-2B
+513 513 FY-2C
+514 514 FY-2D
+515 515 FY-2E
+516 516 FY-2F
+517 517 FY-2G
+518 518 FY-2H
+520 520 FY-3A
+521 521 FY-3B
+522 522 FY-3C
+523 523 FY-3D
+524 524 FY-3E
+525 525 FY-3F
+526 526 FY-3G
+530 530 FY-4A
+531 531 FY-4B
+700 700 TIROS M (ITOS 1)
+701 701 NOAA 1
+702 702 NOAA 2
+703 703 NOAA 3
+704 704 NOAA 4
+705 705 NOAA 5
+706 706 NOAA 6
+707 707 NOAA 7
+708 708 TIROS-N
+709 709 TROPICS-01 (PATHFINDER)
+710 710 GOES (SMS 1)
+711 711 GOES (SMS 2)
+720 720 TOPEX
+721 721 GFO (GEOSAT FOLLOW ON)
+722 722 GRACE A
+723 723 GRACE B
+724 724 COSMIC-2 P1
+725 725 COSMIC-2 P2
+726 726 COSMIC-2 P3
+727 727 COSMIC-2 P4
+728 728 COSMIC-2 P5
+729 729 COSMIC-2 P6
+731 731 GOES 1
+732 732 GOES 2
+733 733 GOES 3
+734 734 GOES 4
+735 735 GOES 5
+740 740 COSMIC-1
+741 741 COSMIC-2
+742 742 COSMIC-3
+743 743 COSMIC-4
+744 744 COSMIC-5
+745 745 COSMIC-6
+746 746 DMSP 1
+747 747 DMSP 2
+748 748 DMSP 3
+749 749 DMSP 4
+750 750 COSMIC-2 E1
+751 751 COSMIC-2 E2
+752 752 COSMIC-2 E3
+753 753 COSMIC-2 E4
+754 754 COSMIC-2 E5
+755 755 COSMIC-2 E6
+761 761 NIMBUS 1
+762 762 NIMBUS 2
+763 763 NIMBUS 3
+764 764 NIMBUS 4
+765 765 NIMBUS 5
+766 766 NIMBUS 6
+767 767 NIMBUS 7
+768 768 LOFT ORBITAL YAM LONGBOW
+769 769 TOMORROW.IO 6U CUBESAT
+780 780 ERBS
+781 781 UARS
+782 782 EARTH PROBE
+783 783 TERRA
+784 784 AQUA
+785 785 AURA
+786 786 C/NOFS
+787 787 CALIPSO
+788 788 CLOUDSAT
+789 789 SMAP
+790 790 TEMPO
+800 800 SUNSAT
+801 801 INTERNATIONAL SPACE STATION (ISS)
+802 802 CFOSAT
+803 803 GRACE C (GRACE-FO)
+804 804 GRACE D (GRACE-FO)
+810 810 COMS
+811 811 GEO-KOMPSAT-2A
+812 812 SCISAT-1
+813 813 ODIN
+814 814 GEO-KOMPSAT-2B
+820 820 SAC-C
+821 821 SAC-D
+825 825 KOMPSAT-5
+850 850 COMBINATION OF TERRA AND AQUA
+851 851 COMBINATION OF NOAA 16 TO NOAA 19
+852 852 COMBINATION OF METOP-1 TO METOP-3
+853 853 COMBINATION OF METEOSAT AND DMSP
+854 854 NON-SPECIFIC MIXTURE OF GEOSTATIONARY AND LOW EARTH-ORBITING SATELLITES
+855 855 COMBINATION OF INSAT 3D AND INSAT 3DR
+856 856 COMBINATION OF SENTINEL-3 SATELLITES
+1023 1023 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1024.table b/definitions/bufr/tables/0/wmo/43/codetables/1024.table
new file mode 100644
index 000000000..cdc9e2470
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1024.table
@@ -0,0 +1,9 @@
+0 0 NO WIND SPEED DATA AVAILABLE
+1 1 AMSR-E DATA
+2 2 TMI DATA
+3 3 NWP: ECMWF
+4 4 NWP: UK MET OFFICE
+5 5 NWP: NCEP
+6 6 REFERENCE CLIMATOLOGY
+7 7 ERS_SCATTEROMETER
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1028.table b/definitions/bufr/tables/0/wmo/43/codetables/1028.table
new file mode 100644
index 000000000..18f82068b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1028.table
@@ -0,0 +1,7 @@
+0 0 NO AOD DATA AVAILABLE
+1 1 NESDIS
+2 2 NAVOCEANO
+3 3 NAAPS
+4 4 MERIS
+5 5 AATSR
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1029.table b/definitions/bufr/tables/0/wmo/43/codetables/1029.table
new file mode 100644
index 000000000..d63d07ef0
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1029.table
@@ -0,0 +1,8 @@
+0 0 NO SSI DATA AVAILABLE
+1 1 MSG_SEVIRI
+2 2 GOES EAST
+3 3 GOES WEST
+4 4 ECMWF
+5 5 NCEP
+6 6 UK MET OFFICE
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1033.table b/definitions/bufr/tables/0/wmo/43/codetables/1033.table
new file mode 100644
index 000000000..3598037d5
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1033.table
@@ -0,0 +1,241 @@
+0 0 WMO SECRETARIAT
+1 1 MELBOURNE
+2 2 MELBOURNE
+3 3 )
+4 4 MOSCOW
+5 5 MOSCOW
+6 6 )
+7 7 US NATIONAL WEATHER SERVICE - NATIONAL CENTRES FOR ENVIRONMENTAL PREDICTION (NCEP)
+8 8 US NATIONAL WEATHER SERVICE TELECOMMUNICATIONS GATEWAY (NWSTG)
+9 9 US NATIONAL WEATHER SERVICE - OTHER
+10 10 CAIRO (RSMC)
+11 11 )
+12 12 DAKAR (RSMC)
+13 13 )
+14 14 NAIROBI (RSMC)
+15 15 )
+16 16 CASABLANCA (RSMC)
+17 17 TUNIS (RSMC)
+18 18 TUNIS - CASABLANCA (RSMC)
+19 19 )
+20 20 LAS PALMAS
+21 21 ALGIERS (RSMC)
+22 22 ACMAD
+23 23 MOZAMBIQUE (NMC)
+24 24 PRETORIA (RSMC)
+25 25 LA REUNION (RSMC)
+26 26 KHABAROVSK (RSMC)
+27 27 )
+28 28 NEW DELHI (RSMC)
+29 29 )
+30 30 NOVOSIBIRSK (RSMC)
+31 31 )
+32 32 TASHKENT (RSMC)
+33 33 JEDDAH (RSMC)
+34 34 TOKYO (RSMC), JAPAN METEOROLOGICAL AGENCY
+35 35 )
+36 36 BANGKOK
+37 37 ULAANBAATAR
+38 38 BEIJING (RSMC)
+39 39 )
+40 40 SEOUL
+41 41 BUENOS AIRES (RSMC)
+42 42 )
+43 43 BRASILIA (RSMC)
+44 44 )
+45 45 SANTIAGO
+46 46 BRAZILIAN SPACE AGENCY INPE
+47 47 COLOMBIA (NMC)
+48 48 ECUADOR (NMC)
+49 49 PERU (NMC)
+50 50 VENEZUELA (BOLIVARIAN REPUBLIC OF) (NMC)
+51 51 MIAMI (RSMC)
+52 52 MIAMI (RSMC), NATIONAL HURRICANE CENTRE
+53 53 MSC MONITORING
+54 54 MONTREAL (RSMC)
+55 55 SAN FRANCISCO
+56 56 ARINC CENTRE
+57 57 US AIR FORCE - AIR FORCE GLOBAL WEATHER CENTRAL
+58 58 FLEET NUMERICAL METEOROLOGY AND OCEANOGRAPHY CENTER, MONTEREY, CA, UNITED STATES
+59 59 THE NOAA FORECAST SYSTEMS LABORATORY, BOULDER, CO, UNITED STATES
+60 60 UNITED STATES NATIONAL CENTER FOR ATMOSPHERIC RESEARCH (NCAR)
+61 61 SERVICE ARGOS - LANDOVER
+62 62 US NAVAL OCEANOGRAPHIC OFFICE
+63 63 INTERNATIONAL RESEARCH INSTITUTE FOR CLIMATE AND SOCIETY (IRI)
+64 64 HONOLULU (RSMC)
+65 65 DARWIN (RSMC)
+66 66 )
+67 67 MELBOURNE (RSMC)
+68 68 RESERVED
+69 69 WELLINGTON (RSMC)
+70 70 )
+71 71 NADI (RSMC)
+72 72 SINGAPORE
+73 73 MALAYSIA (NMC)
+74 74 UK METEOROLOGICAL OFFICE EXETER (RSMC)
+75 75 )
+76 76 MOSCOW (RSMC)
+77 77 RESERVED
+78 78 OFFENBACH (RSMC)
+79 79 )
+80 80 ROME (RSMC)
+81 81 )
+82 82 NORRKOPING
+83 83 )
+84 84 TOULOUSE (RSMC)
+85 85 TOULOUSE (RSMC)
+86 86 HELSINKI
+87 87 BELGRADE
+88 88 OSLO
+89 89 PRAGUE
+90 90 EPISKOPI
+91 91 ANKARA
+92 92 FRANKFURT/MAIN
+93 93 LONDON (WAFC)
+94 94 COPENHAGEN
+95 95 ROTA
+96 96 ATHENS
+97 97 EUROPEAN SPACE AGENCY (ESA)
+98 98 EUROPEAN CENTRE FOR MEDIUM-RANGE WEATHER FORECASTS (ECMWF) (RSMC)
+99 99 DE BILT
+100 100 BRAZZAVILLE
+101 101 ABIDJAN
+102 102 LIBYA (NMC)
+103 103 MADAGASCAR (NMC)
+104 104 MAURITIUS (NMC)
+105 105 NIGER (NMC)
+106 106 SEYCHELLES (NMC)
+107 107 UGANDA (NMC)
+108 108 UNITED REPUBLIC OF TANZANIA (NMC)
+109 109 ZIMBABWE (NMC)
+110 110 HONG-KONG, CHINA
+111 111 AFGHANISTAN (NMC)
+112 112 BAHRAIN (NMC)
+113 113 BANGLADESH (NMC)
+114 114 BHUTAN (NMC)
+115 115 CAMBODIA (NMC)
+116 116 DEMOCRATIC PEOPLE'S REPUBLIC OF KOREA (NMC)
+117 117 ISLAMIC REPUBLIC OF IRAN (NMC)
+118 118 IRAQ (NMC)
+119 119 KAZAKHSTAN (NMC)
+120 120 KUWAIT (NMC)
+121 121 KYRGYZSTAN (NMC)
+122 122 LAO PEOPLE'S DEMOCRATIC REPUBLIC (NMC)
+123 123 MACAO, CHINA
+124 124 MALDIVES (NMC)
+125 125 MYANMAR (NMC)
+126 126 NEPAL (NMC)
+127 127 OMAN (NMC)
+128 128 PAKISTAN (NMC)
+129 129 QATAR (NMC)
+130 130 YEMEN (NMC)
+131 131 SRI LANKA (NMC)
+132 132 TAJIKISTAN (NMC)
+133 133 TURKMENISTAN (NMC)
+134 134 UNITED ARAB EMIRATES (NMC)
+135 135 UZBEKISTAN (NMC)
+136 136 VIET NAM (NMC)
+140 140 BOLIVIA (PLURINATIONAL STATE OF) (NMC)
+141 141 GUYANA (NMC)
+142 142 PARAGUAY (NMC)
+143 143 SURINAME (NMC)
+144 144 URUGUAY (NMC)
+145 145 FRENCH GUIANA
+146 146 BRAZILIAN NAVY HYDROGRAPHIC CENTRE
+147 147 NATIONAL COMMISSION ON SPACE ACTIVITIES (CONAE) - ARGENTINA
+148 148 BRAZILIAN DEPARTMENT OF AIRSPACE CONTROL - DECEA
+149 149 RESERVED FOR OTHER CENTRES
+150 150 ANTIGUA AND BARBUDA (NMC)
+151 151 BAHAMAS (NMC)
+152 152 BARBADOS (NMC)
+153 153 BELIZE (NMC)
+154 154 BRITISH CARIBBEAN TERRITORIES CENTRE
+155 155 SAN JOSE
+156 156 CUBA (NMC)
+157 157 DOMINICA (NMC)
+158 158 DOMINICAN REPUBLIC (NMC)
+159 159 EL SALVADOR (NMC)
+160 160 US NOAA/NESDIS
+161 161 US NOAA OFFICE OF OCEANIC AND ATMOSPHERIC RESEARCH
+162 162 GUATEMALA (NMC)
+163 163 HAITI (NMC)
+164 164 HONDURAS (NMC)
+165 165 JAMAICA (NMC)
+166 166 MEXICO CITY
+167 167 CURACAO AND SINT MAARTEN (NMC)
+168 168 NICARAGUA (NMC)
+169 169 PANAMA (NMC)
+170 170 SAINT LUCIA (NMC)
+171 171 TRINIDAD AND TOBAGO (NMC)
+172 172 FRENCH DEPARTMENTS IN RA IV
+173 173 US NATIONAL AERONAUTICS AND SPACE ADMINISTRATION (NASA)
+174 174 INTEGRATED SCIENCE DATA MANAGEMENT/MARINE ENVIRONMENTAL DATA SERVICE (ISDM/MEDS) - CANADA
+175 175 UNIVERSITY CORPORATION FOR ATMOSPHERIC RESEARCH (UCAR) - UNITED STATES
+176 176 COOPERATIVE INSTITUTE FOR METEOROLOGICAL SATELLITE STUDIES (CIMSS) - UNITED STATES
+177 177 NOAA NATIONAL OCEAN SERVICE - UNITED STATES
+178 178 SPIRE GLOBAL, INC.
+179 179 GEOOPTICS, INC.
+180 180 PLANETIQ
+181 181 ATMOSPHERIC AND ENVIRONMENTAL RESEARCH (AER)
+182 182 TOMORROW.IO
+190 190 COOK ISLANDS (NMC)
+191 191 FRENCH POLYNESIA (NMC)
+192 192 TONGA (NMC)
+193 193 VANUATU (NMC)
+194 194 BRUNEI DARUSSALAM (NMC)
+195 195 INDONESIA (NMC)
+196 196 KIRIBATI (NMC)
+197 197 FEDERATED STATES OF MICRONESIA (NMC)
+198 198 NEW CALEDONIA (NMC)
+199 199 NIUE
+200 200 PAPUA NEW GUINEA (NMC)
+201 201 PHILIPPINES (NMC)
+202 202 SAMOA (NMC)
+203 203 SOLOMON ISLANDS (NMC)
+204 204 NATIONAL INSTITUTE OF WATER AND ATMOSPHERIC RESEARCH (NIWA - NEW ZEALAND)
+210 210 FRASCATI (ESA/ESRIN)
+211 211 LANNION
+212 212 LISBON
+213 213 REYKJAVIK
+214 214 MADRID
+215 215 ZUERICH
+216 216 SERVICE ARGOS - TOULOUSE
+217 217 BRATISLAVA
+218 218 BUDAPEST
+219 219 LJUBLJANA
+220 220 WARSAW
+221 221 ZAGREB
+222 222 ALBANIA (NMC)
+223 223 ARMENIA (NMC)
+224 224 AUSTRIA (NMC)
+225 225 AZERBAIJAN (NMC)
+226 226 BELARUS (NMC)
+227 227 BELGIUM (NMC)
+228 228 BOSNIA AND HERZEGOVINA (NMC)
+229 229 BULGARIA (NMC)
+230 230 CYPRUS (NMC)
+231 231 ESTONIA (NMC)
+232 232 GEORGIA (NMC)
+233 233 DUBLIN
+234 234 ISRAEL (NMC)
+235 235 JORDAN (NMC)
+236 236 LATVIA (NMC)
+237 237 LEBANON (NMC)
+238 238 LITHUANIA (NMC)
+239 239 LUXEMBOURG
+240 240 MALTA (NMC)
+241 241 MONACO
+242 242 ROMANIA (NMC)
+243 243 SYRIAN ARAB REPUBLIC (NMC)
+244 244 THE FORMER YUGOSLAV REPUBLIC OF MACEDONIA (NMC)
+245 245 UKRAINE (NMC)
+246 246 REPUBLIC OF MOLDOVA (NMC)
+247 247 OPERATIONAL PROGRAMME FOR THE EXCHANGE OF WEATHER RADAR INFORMATION (OPERA) - EUMETNET
+248 248 MONTENEGRO (NMC)
+249 249 BARCELONA DUST FORECAST CENTER
+250 250 CONSORTIUM FOR SMALL SCALE MODELLING  (COSMO)
+251 251 METEOROLOGICAL COOPERATION ON OPERATIONAL NWP (METCOOP)
+252 252 MAX PLANCK INSTITUTE FOR METEOROLOGY (MPI-M)
+253 253 ALFRED WEGENER INSTITUTE (AWI)
+254 254 EUMETSAT OPERATION CENTRE
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1034.table b/definitions/bufr/tables/0/wmo/43/codetables/1034.table
new file mode 100644
index 000000000..fce0d85fd
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1034.table
@@ -0,0 +1,104 @@
+0 0 NO SUB-CENTRE
+1 1 LUXEMBOURG (NMC)
+2 2 FUCINO
+3 3 GATINEAU
+4 4 MASPALOMAS (SPAIN)
+5 5 ESA ERS CENTRAL FACILITY
+6 6 PRINCE ALBERT
+7 7 WEST FREUGH
+8 8 LANGLEY RESEARCH CENTER
+9 9 MARSHALL SPACE FLIGHT CENTER
+10 10 TROMSO (NORWAY)
+11 11 MCMURDO (ANTARCTICA)
+12 12 SODANKYLA (FINLAND)
+13 13 TROMSO
+14 14 BARROW (UNITED STATES)
+15 15 ROTHERA (ANTARCTICA)
+16 16 SPACE WEATHER PREDICTION CENTER
+17 17 ESRL GLOBAL SYSTEMS DIVISION
+18 18 SIPAM-PORTO VELHO-RO
+19 19 SIPAM-BELEM-PA
+20 20 MASPALOMAS (SPAIN)
+21 21 AGENZIA SPAZIALE ITALIANA (ITALY)
+22 22 CENTRE NATIONAL DE LA RECHERCHE SCIENTIFIQUE (FRANCE)
+23 23 GEOFORSCHUNGS ZENTRUM (GERMANY)
+24 24 GEODETIC OBSERVATORY PECNY (CZECHIA)
+25 25 INSTITUT D'ESTUDIS ESPACIALS DE CATALUNYA (SPAIN)
+26 26 FEDERAL OFFICE OF TOPOGRAPHY (SWITZERLAND)
+27 27 NORDIC COMMISSION OF GEODESY (NORWAY)
+28 28 NORDIC COMMISSION OF GEODESY (SWEDEN)
+29 29 INSTITUTE GEOGRAPHIQUE NATIONAL (FRANCE) - SERVICE DE GEODESIE
+30 30 KANGERLUSSUAQ (GREENLAND)
+31 31 INSTITUTE OF ENGINEERING SATELLITE SURVEYING AND GEODESY (UNITED KINGDOM)
+32 32 JOINT OPERATIONAL METEOROLOGY AND OCEANOGRAPHY CENTRE (JOMOC)
+33 33 KONINKLIJK NEDERLANDS METEOROLOGISCH INSTITUT (NETHERLANDS)
+34 34 NORDIC GPS ATMOSPHERIC ANALYSIS CENTRE (SWEDEN)
+35 35 INSTITUTO GEOGRAFICO NACIONAL DE ESPANA (SPAIN)
+36 36 MET EIREANN (IRELAND)
+37 37 ROYAL OBSERVATORY OF BELGIUM (BELGIUM)
+40 40 EDMONTON (CANADA)
+50 50 BEDFORD (CANADA)
+60 60 GANDER (CANADA)
+64 64 BUNDESWEHR GEOINFORMATION OFFICE (BGIO)
+70 70 MONTEREY (UNITED STATES)
+76 76 ROSHYDROMET (RUSSIAN FEDERATION)
+78 78 DEUTSCHER WETTERDIENST (GERMANY)
+80 80 WALLOPS ISLAND (UNITED STATES)
+90 90 GILMOR CREEK (UNITED STATES)
+96 96 HELLENIC NATIONAL METEOROLOGICAL SERVICE (GREECE)
+100 100 ATHENS (GREECE)
+101 101 ALBANIA (NMC)
+102 102 NATIONAL RESEARCH COUNCIL/INSTITUTE OF ATMOSPHERIC SCIENCES AND CLIMATE (CNR-ISAC)
+110 110 NOWCAST MOBILE (LIGHTNING DATA)
+120 120 EWA BEACH, HAWAII
+125 125 FORD ISLAND, HAWAII
+130 130 MIAMI, FLORIDA
+140 140 LANNION (FRANCE)
+150 150 SVALBARD (NORWAY)
+170 170 SAINT-DENIS (LA REUNION)
+180 180 MOSCOW
+190 190 MUSCAT
+200 200 KHABAROVSK
+201 201 RHEINISCHES INSTITUT FUER UMWELTFORSCHUNG AN DER UNIVERSITAET ZU KOELN E.V. (GERMANY)
+202 202 INSTITUT FRANCAIS DE RECHERCHE POUR L'EXPLOITATION DE LA MER
+203 203 AARHUS UNIVERSITY (DENMARK)
+204 204 INSTITUTE OF ENVIRONMENTAL PROTECTION - NATIONAL RESEARCH INSTITUTE (POLAND)
+205 205 NIUE
+206 206 RAROTONGA (COOK ISLANDS)
+207 207 APIA (SAMOA)
+208 208 TONGA
+209 209 TUVALU
+210 210 NOVOSIBIRSK
+211 211 TOKELAU
+214 214 DARWIN
+215 215 METEOSWISS (SWITZERLAND)
+217 217 PERTH
+219 219 TOWNSVILLE
+220 220 NOAA SATELLITE OPERATIONS FACILITY (NSOF)
+221 221 SCHLESWIG-HOLSTEIN, TRAFFIC OPERATIONS COMPUTING CENTRE (TOCC) KIEL/NEUMUENSTER
+222 222 HAMBURG, TOCC HAMBURG
+223 223 NIEDERSACHSEN, TOCC HANNOVER
+224 224 AUSTRIA (NMC)
+225 225 NORDRHEIN-WESTFALEN, TOCC KAMEN LEVERKUSEN
+226 226 HESSEN, TOCC RUESSELSHEIM
+227 227 RHEINLAND-PFALZ, TOCC KOBLENZ
+228 228 BADEN-WUERTTEMBERG, TOCC LUDWIGSBURG
+229 229 BAYERN, TOCC FREIMANN
+230 230 SAARLAND, TOCC ROHRBACH
+231 231 BAYERN, AUTOBAHN DIRECTORATE NORDBAYERN
+232 232 BRANDENBURG, TOCC STOLPE
+233 233 MECKLENBURG-VORPOMMERN, TOCC MALCHOW
+234 234 SACHSEN, TOCC DRESDEN
+235 235 SACHSEN-ANHALT, TOCC HALLE
+236 236 THUERINGEN, TOCC ERFURT
+237 237 EASYWAY - METEOTRANS
+240 240 KIYOSE
+241 241 REANALYSIS PROJECT
+242 242 NATIONAL METEOROLOGICAL ADMINISTRATION (ROMANIA)
+243 243 KELBURN
+245 245 JINCHEON
+249 249 SINGAPORE
+250 250 VLADIVOSTOCK
+251 251 GUAM
+252 252 HONOLULU
+254 254 EUMETSAT
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1035.table b/definitions/bufr/tables/0/wmo/43/codetables/1035.table
new file mode 100644
index 000000000..55e8a3fc1
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1035.table
@@ -0,0 +1,309 @@
+0 0 WMO SECRETARIAT
+1 1 MELBOURNE
+2 2 MELBOURNE
+3 3 )
+4 4 MOSCOW
+5 5 MOSCOW
+6 6 )
+7 7 US NATIONAL WEATHER SERVICE, NATIONAL CENTRES FOR ENVIRONMENTAL PREDICTION (NCEP)
+8 8 US NATIONAL WEATHER SERVICE TELECOMMUNICATIONS GATEWAY (NWSTG)
+9 9 US NATIONAL WEATHER SERVICE - OTHER
+10 10 CAIRO (RSMC)
+11 11 )
+12 12 DAKAR (RSMC)
+13 13 )
+14 14 NAIROBI (RSMC)
+15 15 )
+16 16 CASABLANCA (RSMC)
+17 17 TUNIS (RSMC)
+18 18 TUNIS-CASABLANCA (RSMC)
+19 19 )
+20 20 LAS PALMAS
+21 21 ALGIERS (RSMC)
+22 22 ACMAD
+23 23 MOZAMBIQUE (NMC)
+24 24 PRETORIA (RSMC)
+25 25 LA REUNION (RSMC)
+26 26 KHABAROVSK (RSMC)
+27 27 )
+28 28 NEW DELHI (RSMC)
+29 29 )
+30 30 NOVOSIBIRSK (RSMC)
+31 31 )
+32 32 TASHKENT (RSMC)
+33 33 JEDDAH (RSMC)
+34 34 TOKYO (RSMC), JAPAN METEOROLOGICAL AGENCY
+35 35 )
+36 36 BANGKOK
+37 37 ULAANBAATAR
+38 38 BEIJING (RSMC)
+39 39 )
+40 40 SEOUL
+41 41 BUENOS AIRES (RSMC)
+42 42 )
+43 43 BRASILIA (RSMC)
+44 44 )
+45 45 SANTIAGO
+46 46 BRAZILIAN SPACE AGENCY INPE
+47 47 COLOMBIA (NMC)
+48 48 ECUADOR (NMC)
+49 49 PERU (NMC)
+50 50 VENEZUELA (BOLIVARIAN REPUBLIC OF) (NMC)
+51 51 MIAMI (RSMC)
+52 52 MIAMI RSMC, NATIONAL HURRICANE CENTRE
+53 53 MSC MONITORING
+54 54 MONTREAL (RSMC)
+55 55 SAN FRANCISCO
+56 56 ARINC CENTRE
+57 57 US AIR FORCE - AIR FORCE GLOBAL WEATHER CENTRAL
+58 58 FLEET NUMERICAL METEOROLOGY AND OCEANOGRAPHY CENTER, MONTEREY, CA, UNITED STATES
+59 59 THE NOAA FORECAST SYSTEMS LABORATORY, BOULDER, CO, UNITED STATES
+60 60 UNITED STATES NATIONAL CENTER FOR ATMOSPHERIC RESEARCH (NCAR)
+61 61 SERVICE ARGOS - LANDOVER
+62 62 US NAVAL OCEANOGRAPHIC OFFICE
+63 63 INTERNATIONAL RESEARCH INSTITUTE FOR CLIMATE AND SOCIETY (IRI)
+64 64 HONOLULU (RSMC)
+65 65 DARWIN (RSMC)
+66 66 )
+67 67 MELBOURNE (RSMC)
+68 68 RESERVED
+69 69 WELLINGTON (RSMC)
+70 70 )
+71 71 NADI (RSMC)
+72 72 SINGAPORE
+73 73 MALAYSIA (NMC)
+74 74 UK METEOROLOGICAL OFFICE EXETER (RSMC)
+75 75 )
+76 76 MOSCOW (RSMC)
+77 77 RESERVED
+78 78 OFFENBACH (RSMC)
+79 79 )
+80 80 ROME (RSMC)
+81 81 )
+82 82 NORRKOPING
+83 83 )
+84 84 TOULOUSE (RSMC)
+85 85 TOULOUSE (RSMC)
+86 86 HELSINKI
+87 87 BELGRADE
+88 88 OSLO
+89 89 PRAGUE
+90 90 EPISKOPI
+91 91 ANKARA
+92 92 FRANKFURT/MAIN
+93 93 LONDON (WAFC)
+94 94 COPENHAGEN
+95 95 ROTA
+96 96 ATHENS
+97 97 EUROPEAN SPACE AGENCY (ESA)
+98 98 EUROPEAN CENTRE FOR MEDIUM RANGE WEATHER FORECASTS (ECMWF) (RSMC)
+99 99 DE BILT
+100 100 BRAZZAVILLE
+101 101 ABIDJAN
+102 102 LIBYA (NMC)
+103 103 MADAGASCAR (NMC)
+104 104 MAURITIUS (NMC)
+105 105 NIGER (NMC)
+106 106 SEYCHELLES (NMC)
+107 107 UGANDA (NMC)
+108 108 UNITED REPUBLIC OF TANZANIA (NMC)
+109 109 ZIMBABWE (NMC)
+110 110 HONG KONG, CHINA
+111 111 AFGHANISTAN (NMC)
+112 112 BAHRAIN (NMC)
+113 113 BANGLADESH (NMC)
+114 114 BHUTAN (NMC)
+115 115 CAMBODIA (NMC)
+116 116 DEMOCRATIC PEOPLE'S REPUBLIC OF KOREA (NMC)
+117 117 ISLAMIC REPUBLIC OF IRAN (NMC)
+118 118 IRAQ (NMC)
+119 119 KAZAKHSTAN (NMC)
+120 120 KUWAIT (NMC)
+121 121 KYRGYZSTAN (NMC)
+122 122 LAO PEOPLE'S DEMOCRATIC REPUBLIC (NMC)
+123 123 MACAO, CHINA
+124 124 MALDIVES (NMC)
+125 125 MYANMAR (NMC)
+126 126 NEPAL (NMC)
+127 127 OMAN (NMC)
+128 128 PAKISTAN (NMC)
+129 129 QATAR (NMC)
+130 130 YEMEN (NMC)
+131 131 SRI LANKA (NMC)
+132 132 TAJIKISTAN (NMC)
+133 133 TURKMENISTAN (NMC)
+134 134 UNITED ARAB EMIRATES (NMC)
+135 135 UZBEKISTAN (NMC)
+136 136 VIET NAM (NMC)
+140 140 BOLIVIA (PLURINATIONAL STATE OF) (NMC)
+141 141 GUYANA (NMC)
+142 142 PARAGUAY (NMC)
+143 143 SURINAME (NMC)
+144 144 URUGUAY (NMC)
+145 145 FRENCH GUIANA
+146 146 BRAZILIAN NAVY HYDROGRAPHIC CENTRE
+147 147 NATIONAL COMMISSION ON SPACE ACTIVITIES (CONAE) - ARGENTINA
+148 148 BRAZILIAN DEPARTMENT OF AIRSPACE CONTROL - DECEA
+149 149 RESERVED FOR OTHER CENTRES
+150 150 ANTIGUA AND BARBUDA (NMC)
+151 151 BAHAMAS (NMC)
+152 152 BARBADOS (NMC)
+153 153 BELIZE (NMC)
+154 154 BRITISH CARIBBEAN TERRITORIES CENTRE
+155 155 SAN JOSE
+156 156 CUBA (NMC)
+157 157 DOMINICA (NMC)
+158 158 DOMINICAN REPUBLIC (NMC)
+159 159 EL SALVADOR (NMC)
+160 160 US NOAA/NESDIS
+161 161 US NOAA OFFICE OF OCEANIC AND ATMOSPHERIC RESEARCH
+162 162 GUATEMALA (NMC)
+163 163 HAITI (NMC)
+164 164 HONDURAS (NMC)
+165 165 JAMAICA (NMC)
+166 166 MEXICO
+167 167 CURACAO AND SINT MAARTEN (NMC)
+168 168 NICARAGUA (NMC)
+169 169 PANAMA (NMC)
+170 170 SAINT LUCIA (NMC)
+171 171 TRINIDAD AND TOBAGO (NMC)
+172 172 FRENCH DEPARTMENTS IN RA IV
+173 173 US NATIONAL AERONAUTICS AND SPACE ADMINISTRATION (NASA)
+174 174 INTEGRATED SCIENCE DATA MANAGEMENT/MARINE ENVIRONMENTAL DATA SERVICE (ISDM/MEDS - CANADA)
+175 175 UNIVERSITY CORPORATION FOR ATMOSPHERIC RESEARCH (UCAR) - UNITED STATES
+176 176 COOPERATIVE INSTITUTE FOR METEOROLOGICAL SATELLITE STUDIES (CIMSS) - UNITED STATES
+177 177 NOAA NATIONAL OCEAN SERVICE - UNITED STATES
+178 178 SPIRE GLOBAL, INC.
+179 179 GEOOPTICS, INC.
+180 180 PLANETIQ
+181 181 ATMOSPHERIC AND ENVIRONMENTAL RESEARCH (AER)
+182 182 TOMORROW.IO
+190 190 COOK ISLANDS (NMC)
+191 191 FRENCH POLYNESIA (NMC)
+192 192 TONGA (NMC)
+193 193 VANUATU (NMC)
+194 194 BRUNEI DARUSSALAM (NMC)
+195 195 INDONESIA (NMC)
+196 196 KIRIBATI (NMC)
+197 197 FEDERATED STATES OF MICRONESIA (NMC)
+198 198 NEW CALEDONIA (NMC)
+199 199 NIUE
+200 200 PAPUA NEW GUINEA (NMC)
+201 201 PHILIPPINES (NMC)
+202 202 SAMOA (NMC)
+203 203 SOLOMON ISLANDS (NMC)
+204 204 NATIONAL INSTITUTE OF WATER AND ATMOSPHERIC RESEARCH (NIWA - NEW ZEALAND)
+210 210 FRASCATI (ESA/ESRIN)
+211 211 LANNION
+212 212 LISBOA
+213 213 REYKJAVIK
+214 214 MADRID
+215 215 ZUERICH
+216 216 SERVICE ARGOS TOULOUSE
+217 217 BRATISLAVA
+218 218 BUDAPEST
+219 219 LJUBLJANA
+220 220 WARSAW
+221 221 ZAGREB
+222 222 ALBANIA (NMC)
+223 223 ARMENIA (NMC)
+224 224 AUSTRIA (NMC)
+225 225 AZERBAIJAN (NMC)
+226 226 BELARUS (NMC)
+227 227 BELGIUM (NMC)
+228 228 BOSNIA AND HERZEGOVINA (NMC)
+229 229 BULGARIA (NMC)
+230 230 CYPRUS (NMC)
+231 231 ESTONIA (NMC)
+232 232 GEORGIA (NMC)
+233 233 DUBLIN
+234 234 ISRAEL (NMC)
+235 235 JORDAN (NMC)
+236 236 LATVIA (NMC)
+237 237 LEBANON (NMC)
+238 238 LITHUANIA (NMC)
+239 239 LUXEMBOURG
+240 240 MALTA (NMC)
+241 241 MONACO
+242 242 ROMANIA (NMC)
+243 243 SYRIAN ARAB REPUBLIC (NMC)
+244 244 THE FORMER YUGOSLAV REPUBLIC OF MACEDONIA (NMC)
+245 245 UKRAINE (NMC)
+246 246 REPUBLIC OF MOLDOVA (NMC)
+247 247 OPERATIONAL PROGRAMME FOR THE EXCHANGE OF WEATHER RADAR INFORMATION (OPERA) - EUMETNET
+248 248 MONTENEGRO (NMC)
+249 249 BARCELONA DUST FORECAST CENTER
+250 250 CONSORTIUM FOR SMALL SCALE MODELLING (COSMO)
+251 251 METEOROLOGICAL COOPERATION ON OPERATIONAL NWP (METCOOP)
+252 252 MAX PLANCK INSTITUTE FOR METEOROLOGY (MPI-M)
+253 253 ALFRED WEGENER INSTITUTE (AWI)
+254 254 EUMETSAT OPERATION CENTRE
+255 255 NOT TO BE USED
+256 256 ANGOLA (NMC)
+257 257 BENIN (NMC)
+258 258 BOTSWANA (NMC)
+259 259 BURKINA FASO (NMC)
+260 260 BURUNDI (NMC)
+261 261 CAMEROON (NMC)
+262 262 CABO VERDE (NMC)
+263 263 CENTRAL AFRICAN REPUBLIC (NMC)
+264 264 CHAD (NMC)
+265 265 COMOROS (NMC)
+266 266 DEMOCRATIC REPUBLIC OF THE CONGO (NMC)
+267 267 DJIBOUTI (NMC)
+268 268 ERITREA (NMC)
+269 269 ETHIOPIA (NMC)
+270 270 GABON (NMC)
+271 271 GAMBIA (NMC)
+272 272 GHANA (NMC)
+273 273 GUINEA (NMC)
+274 274 GUINEA-BISSAU (NMC)
+275 275 LESOTHO (NMC)
+276 276 LIBERIA (NMC)
+277 277 MALAWI (NMC)
+278 278 MALI (NMC)
+279 279 MAURITANIA (NMC)
+280 280 NAMIBIA (NMC)
+281 281 NIGERIA (NMC)
+282 282 RWANDA (NMC)
+283 283 SAO TOME AND PRINCIPE (NMC)
+284 284 SIERRA LEONE (NMC)
+285 285 SOMALIA (NMC)
+286 286 SUDAN (NMC)
+287 287 ESWATINI (NMC)
+288 288 TOGO (NMC)
+289 289 ZAMBIA (NMC)
+290 290 EUMETNET E-PROFILE
+291 291 INSTITUTE OF ATMOSPHERIC PHYSICS (IAP) OF THE CHINESE ACADEMY OF SCIENCES (CAS)
+292 292 HELMHOLTZ CENTRE FOR ENVIRONMENTAL RESEARCH (UFZ)
+293 293 UNIVERSITY OF BREMEN
+294 294 NETHERLANDS INSTITUTE FOR SPACE RESEARCH (SRON)
+295 295 THE ROYAL BELGIAN INSTITUTE FOR SPACE AERONOMY (BIRA-IASB)
+296 296 THE FRENCH NATIONAL CENTRE FOR SCIENTIFIC RESEARCH (CNRS)
+297 297 THE NANJING INSTITUTE OF ENVIRONMENTAL SCIENCES (NIES)
+298 298 DYNAMIC METEOROLOGY LABORATORY (LMD)
+299 299 THE RUTHERFORD APPLETON LABORATORY (RAL)
+300 300 GREEK ATOMIC ENERGY COMMISSION (GREECE)
+301 301 UNITED STATED ENVIRONMENTAL PROTECTION AGENCY (USA)
+302 302 AUTRALIAN RADIATION PROTECTION AND NUCLEAR SAFETY (AUSTRALIA)
+303 303 AUTHORITY FOR NUCLEAR SAFETY AND RADIATION PROTECTION (THE NETHERLANDS)
+304 304 AUTORITE DE SURETE NUCLEAIRE (FRANCE)
+305 305 BUNDESAMT FüR STRAHLENSCHUTZ (GERMANY)
+306 306 NATIONAL COMMISSION FOR NUCLEAR ACTIVITIES CONTROL (ROMANIA)
+307 307 CONSEJO DE SEGURIDAD NUCLEAR (SPAIN)
+308 308 DANISH EMERGENCY MANAGEMENT AGENCY (DENMARK)
+309 309 NORWEGIAN RADIATION PROTECTION AGENCY (NORWAY)
+310 310 FEDERAL AGENCY FOR NUCLEAR CONTROL (BELGIUM)
+311 311 INSTITUTE OF RADIATION PROTECTION AND DOSIMETRY (BRAZIL)
+312 312 NATIONAL INSPECTORATE FOR NUCLEAR SAFETY AND RADIATION PROTECTION (ITALY)
+313 313 NUCLEAR REGULATORY AUTHORITY (TURKIYE)
+314 314 NUCLEAR REGULATION AUTHORITY (JAPAN)
+315 315 NUCLEAR REGULATORY AGENCY (BULGARIA)
+316 316 UKRAINIAN RADIATION PROTECTION INSTITUTE (UKRIANE)
+317 317 HEALTH CANADA RADIO PROTECTION BUREAU (CANADA)
+318 318 PORTUGUESE SOCIETY FOR RADIATION PROTECTION (PORTUGAL)
+319 319 SWEDISH RADIATION SAFETY AUTHORITY (SWEDEN)
+320 320 RADIATION AND NUCLEAR SAFETY AUTHORITY (FINLAND)
+321 321 STATE OFFICE FOR NUCLEAR SAFETY (CZECHIA)
+322 322 NUCLEAR REGULATION AUTHORITY (SLOVAKIA)
+65535 65535 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1036.table b/definitions/bufr/tables/0/wmo/43/codetables/1036.table
new file mode 100644
index 000000000..06eab3ccd
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1036.table
@@ -0,0 +1,42 @@
+36001 36001 AUSTRALIA, BUREAU OF METEOROLOGY (BOM)
+36002 36002 AUSTRALIA, JOINT AUSTRALIAN FACILITY FOR OCEAN OBSERVING SYSTEMS (JAFOOS)
+36003 36003 AUSTRALIA, THE COMMONWEALTH SCIENTIFIC AND INDUSTRIAL RESEARCH ORGANIZATION (CSIRO)
+124001 124001 CANADA, MARINE ENVIRONMENTAL DATA SERVICE (MEDS)
+124002 124002 CANADA, INSTITUTE OF OCEAN SCIENCES (IOS)
+124173 124173 CANADA, ENVIRONMENT CANADA
+124174 124174 CANADA, DEPARTMENT OF NATIONAL DEFENCE
+124175 124175 CANADA, NAV CANADA
+156001 156001 CHINA, THE STATE OCEANIC ADMINISTRATION
+156002 156002 CHINA, SECOND INSTITUTE OF OCEANOGRAPHY, STATE OCEANIC ADMINISTRATION
+156003 156003 CHINA, INSTITUTE OF OCEAN TECHNOLOGY
+250001 250001 FRANCE, INSTITUT DE RECHERCHE POUR LE DéVELOPPEMENT (IRD)
+250002 250002 FRANCE, INSTITUT FRANçAIS DE RECHERCHE POUR L'EXPLOITATION DE LA MER (IFREMER)
+276001 276001 GERMANY, BUNDESAMT FUER SEESCHIFFAHRT UND HYDROGRAPHIE (BSH)
+276002 276002 GERMANY, INSTITUT FUER MEERESKUNDE, KIEL
+356001 356001 INDIA, NATIONAL INSTITUTE OF OCEANOGRAPHY (NIO)
+356002 356002 INDIA, NATIONAL INSTITUTE FOR OCEAN TECHNOLOGY (NIOT)
+356003 356003 INDIA, NATIONAL CENTRE FOR OCEAN INFORMATION SERVICE
+392001 392001 JAPAN, JAPAN METEOROLOGICAL AGENCY (JMA)
+392002 392002 JAPAN, FRONTIER OBSERVATIONAL RESEARCH SYSTEM FOR GLOBAL CHANGE
+392003 392003 JAPAN, JAPAN MARINE SCIENCE AND TECHNOLOGY CENTRE (JAMSTEC)
+410001 410001 REPUBLIC OF KOREA, SEOUL NATIONAL UNIVERSITY
+410002 410002 REPUBLIC OF KOREA, KOREA OCEAN RESEARCH AND DEVELOPMENT INSTITUTE  (KORDI)
+410003 410003 REPUBLIC OF KOREA, METEOROLOGICAL RESEARCH INSTITUTE
+540001 540001 NEW CALEDONIA, INSTITUT DE RECHERCHE POUR LE DéVELOPPEMENT (IRD)
+554001 554001 NEW ZEALAND, NATIONAL INSTITUTE OF WATER AND ATMOSPHERIC RESEARCH (NIWA)
+643001 643001 RUSSIAN FEDERATION, STATE OCEANOGRAPHIC INSTITUTE OF ROSHYDROMET
+643002 643002 RUSSIAN FEDERATION, FEDERAL SERVICE FOR HYDROMETEOROLOGY AND ENVIRONMENTAL MONITORING
+724001 724001 SPAIN, INSTITUTO ESPAñOL DE OCEANOGRAFIA
+826001 826001 UNITED KINGDOM, HYDROGRAPHIC OFFICE
+826002 826002 UNITED KINGDOM, NATIONAL OCEANOGRAPHY CENTRE (NOC)
+826003 826003 UNITED KINGDOM, CENTRE FOR ENVIRONMENT, FISHERIES AND AQUACULTURE SCIENCE (CEFAS)
+826004 826004 UNITED KINGDOM, MARINE SCOTLAND (MS)
+826005 826005 UNITED KINGDOM, PLYMOUTH MARINE LABORATORY (PML)
+826006 826006 UNITED KINGDOM, BRITISH ANTARCTIC SURVEY (BAS)
+840001 840001 USA, NOAA ATLANTIC OCEANOGRAPHIC AND METEOROLOGICAL LABORATORY (AOML)
+840002 840002 USA, NOAA PACIFIC MARINE ENVIRONMENTAL LABORATORY (PMEL)
+840003 840003 USA, SCRIPPS INSTITUTION OF OCEANOGRAPHY (SIO)
+840004 840004 USA, WOODS HOLE OCEANOGRAPHIC INSTITUTION (WHOI)
+840005 840005 USA, UNIVERSITY OF WASHINGTON
+840006 840006 USA, NAVAL OCEANOGRAPHIC OFFICE
+1048575 1048575 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1038.table b/definitions/bufr/tables/0/wmo/43/codetables/1038.table
new file mode 100644
index 000000000..2eee38baf
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1038.table
@@ -0,0 +1,7 @@
+0 0 NO SEA ICE SET
+1 1 NSIDC SSM/I CAVALIERI ET AL (1992)
+2 2 AMSR-E
+3 3 ECMWF
+4 4 CMS (FRANCE) CLOUD MASK USED BY MEDSPIRATION
+5 5 EUMETSAT OSI-SAF
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1044.table b/definitions/bufr/tables/0/wmo/43/codetables/1044.table
new file mode 100644
index 000000000..c419e8307
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1044.table
@@ -0,0 +1,9 @@
+0 0 RESERVED
+1 1 FULL WEIGHTED MIXTURE OF INDIVIDUAL QUALITY TESTS
+2 2 WEIGHTED MIXTURE OF INDIVIDUAL TESTS, BUT EXCLUDING FORECAST COMPARISON
+3 3 RECURSIVE FILTER FUNCTION
+4 4 COMMON QUALITY INDEX (QI) WITHOUT FORECAST
+5 5 QI WITHOUT FORECAST
+6 6 QI WITH FORECAST
+7 7 ESTIMATED ERROR IN M/S CONVERTED TO A PERCENT CONFIDENCE
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1052.table b/definitions/bufr/tables/0/wmo/43/codetables/1052.table
new file mode 100644
index 000000000..b8e14ed0f
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1052.table
@@ -0,0 +1,4 @@
+0 0 PRIMARY
+1 1 SECONDARY
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1090.table b/definitions/bufr/tables/0/wmo/43/codetables/1090.table
new file mode 100644
index 000000000..55f7ca25d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1090.table
@@ -0,0 +1,5 @@
+0 0 LAGGED-AVERAGE FORECASTING (LAF)
+1 1 BREEDING
+2 2 SINGULAR VECTORS
+3 3 MULTIPLE ANALYSIS CYCLES
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1092.table b/definitions/bufr/tables/0/wmo/43/codetables/1092.table
new file mode 100644
index 000000000..ce982034d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1092.table
@@ -0,0 +1,6 @@
+0 0 UNPERTURBED HIGH-RESOLUTION CONTROL FORECAST
+1 1 UNPERTURBED LOW-RESOLUTION CONTROL FORECAST
+2 2 NEGATIVELY PERTURBED FORECAST
+3 3 POSITIVELY PERTURBED FORECAST
+4 4 PERTURBED FORECAST
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1101.table b/definitions/bufr/tables/0/wmo/43/codetables/1101.table
new file mode 100644
index 000000000..6bbaf54be
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1101.table
@@ -0,0 +1,202 @@
+100 100 ALGERIA
+101 101 ANGOLA
+102 102 BENIN
+103 103 BOTSWANA
+104 104 BURKINA FASO
+105 105 BURUNDI
+106 106 CAMEROON
+107 107 CABO VERDE
+108 108 CENTRAL AFRICAN REPUBLIC
+109 109 CHAD
+110 110 COMOROS
+111 111 CONGO
+112 112 CôTE D'IVOIRE
+113 113 DEMOCRATIC REPUBLIC OF THE CONGO
+114 114 DJIBOUTI
+115 115 EGYPT
+116 116 ERITREA
+117 117 ETHIOPIA
+118 118 FRANCE (RA I)
+119 119 GABON
+120 120 GAMBIA
+121 121 GHANA
+122 122 GUINEA
+123 123 GUINEA-BISSAU
+124 124 KENYA
+125 125 LESOTHO
+126 126 LIBERIA
+127 127 LIBYA
+128 128 MADAGASCAR
+129 129 MALAWI
+130 130 MALI
+131 131 MAURITANIA
+132 132 MAURITIUS
+133 133 MOROCCO
+134 134 MOZAMBIQUE
+135 135 NAMIBIA
+136 136 NIGER
+137 137 NIGERIA
+138 138 PORTUGAL (RA I)
+139 139 RWANDA
+140 140 SAO TOME AND PRINCIPE
+141 141 SENEGAL
+142 142 SEYCHELLES
+143 143 SIERRA LEONE
+144 144 SOMALIA
+145 145 SOUTH AFRICA
+146 146 SPAIN (RA I)
+147 147 SUDAN
+148 148 ESWATINI
+149 149 TOGO
+150 150 TUNISIA
+151 151 UGANDA
+152 152 UNITED KINGDOM OF GREAT BRITAIN AND NORTHERN IRELAND (RA I)
+153 153 UNITED REPUBLIC OF TANZANIA
+154 154 ZAMBIA
+155 155 ZIMBABWE
+200 200 AFGHANISTAN
+201 201 BAHRAIN
+202 202 BANGLADESH
+203 203 BHUTAN
+204 204 CAMBODIA
+205 205 CHINA
+206 206 DEMOCRATIC PEOPLE'S REPUBLIC OF KOREA
+207 207 HONG KONG, CHINA
+208 208 INDIA
+209 209 IRAN, ISLAMIC REPUBLIC OF
+210 210 IRAQ
+211 211 JAPAN
+212 212 KAZAKHSTAN
+213 213 KUWAIT
+214 214 KYRGYZSTAN
+215 215 LAO PEOPLE'S DEMOCRATIC REPUBLIC
+216 216 MACAO, CHINA
+217 217 MALDIVES
+218 218 MONGOLIA
+219 219 MYANMAR
+220 220 NEPAL
+221 221 OMAN
+222 222 PAKISTAN
+223 223 QATAR
+224 224 REPUBLIC OF KOREA
+225 225 YEMEN
+226 226 RUSSIAN FEDERATION (RA II)
+227 227 SAUDI ARABIA
+228 228 SRI LANKA
+229 229 TAJIKISTAN
+230 230 THAILAND
+231 231 TURKMENISTAN
+232 232 UNITED ARAB EMIRATES
+233 233 UZBEKISTAN
+234 234 VIET NAM
+300 300 ARGENTINA
+301 301 BOLIVIA (PLURINATIONAL STATE OF)
+302 302 BRAZIL
+303 303 CHILE
+304 304 COLOMBIA
+305 305 ECUADOR
+306 306 FRANCE (RA III)
+307 307 GUYANA
+308 308 PARAGUAY
+309 309 PERU
+310 310 SURINAME
+311 311 URUGUAY
+312 312 VENEZUELA (BOLIVARIAN REPUBLIC OF)
+400 400 ANTIGUA AND BARBUDA
+401 401 BAHAMAS
+402 402 BARBADOS
+403 403 BELIZE
+404 404 BRITISH CARIBBEAN TERRITORIES
+405 405 CANADA
+406 406 COLOMBIA
+407 407 COSTA RICA
+408 408 CUBA
+409 409 DOMINICA
+410 410 DOMINICAN REPUBLIC
+411 411 EL SALVADOR
+412 412 FRANCE (RA IV)
+413 413 GUATEMALA
+414 414 HAITI
+415 415 HONDURAS
+416 416 JAMAICA
+417 417 MEXICO
+418 418 CURAçAO AND SINT MAARTEN
+419 419 NICARAGUA
+420 420 PANAMA
+421 421 SAINT LUCIA
+422 422 TRINIDAD AND TOBAGO
+423 423 UNITED KINGDOM OF GREAT BRITAIN AND NORTHERN IRELAND (RA IV)
+424 424 UNITED STATES OF AMERICA (RA IV)
+425 425 VENEZUELA (BOLIVARIAN REPUBLIC OF)
+500 500 AUSTRALIA
+501 501 BRUNEI DARUSSALAM
+502 502 COOK ISLANDS
+503 503 FIJI
+504 504 FRENCH POLYNESIA
+505 505 INDONESIA
+506 506 KIRIBATI
+507 507 MALAYSIA
+508 508 MICRONESIA, FEDERATED STATES OF
+509 509 NEW CALEDONIA
+510 510 NEW ZEALAND
+511 511 NIUE
+512 512 PAPUA NEW GUINEA
+513 513 PHILIPPINES
+514 514 SAMOA
+515 515 SINGAPORE
+516 516 SOLOMON ISLANDS
+517 517 TONGA
+518 518 UNITED KINGDOM OF GREAT BRITAIN AND NORTHERN IRELAND (RA V)
+519 519 UNITED STATES OF AMERICA (RA V)
+520 520 VANUATU
+600 600 ALBANIA
+601 601 ARMENIA
+602 602 AUSTRIA
+603 603 AZERBAIJAN
+604 604 BELARUS
+605 605 BELGIUM
+606 606 BOSNIA AND HERZEGOVINA
+607 607 BULGARIA
+608 608 CROATIA
+609 609 CYPRUS
+610 610 CZECHIA
+611 611 DENMARK
+612 612 ESTONIA
+613 613 FINLAND
+614 614 FRANCE (RA VI)
+615 615 GEORGIA
+616 616 GERMANY
+617 617 GREECE
+618 618 HUNGARY
+619 619 ICELAND
+620 620 IRELAND
+621 621 ISRAEL
+622 622 ITALY
+623 623 JORDAN
+624 624 KAZAKHSTAN
+625 625 LATVIA
+626 626 LEBANON
+627 627 LITHUANIA
+628 628 LUXEMBOURG
+629 629 MALTA
+630 630 MONACO
+631 631 MONTENEGRO
+632 632 NETHERLANDS
+633 633 NORWAY
+634 634 POLAND
+635 635 PORTUGAL (RA VI)
+636 636 REPUBLIC OF MOLDOVA
+637 637 ROMANIA
+638 638 RUSSIAN FEDERATION (RA VI)
+639 639 SERBIA
+640 640 SLOVAKIA
+641 641 SLOVENIA
+642 642 SPAIN (RA VI)
+643 643 SWEDEN
+644 644 SWITZERLAND
+645 645 SYRIAN ARAB REPUBLIC
+646 646 THE FORMER YUGOSLAV REPUBLIC OF MACEDONIA
+647 647 TURKIYE
+648 648 UKRAINE
+649 649 UNITED KINGDOM OF GREAT BRITAIN AND NORTHERN IRELAND (RA VI)
+1023 1023 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/11030.table b/definitions/bufr/tables/0/wmo/43/codetables/11030.table
new file mode 100644
index 000000000..253b8fccc
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/11030.table
@@ -0,0 +1,25 @@
+0 0 NIL
+1 1 LIGHT
+2 2 MODERATE
+3 3 SEVERE
+4 4 NIL
+5 5 LIGHT
+6 6 MODERATE
+7 7 SEVERE
+8 8 NIL
+9 9 LIGHT
+10 10 MODERATE
+11 11 SEVERE
+12 12 EXTREME, IN CLEAR AIR
+13 13 EXTREME, IN CLOUD
+14 14 EXTREME, CLOUD/CLEAR AIR NOT SPECIFIED
+15 15 LIGHT, ISOLATED MODERATE
+16 16 LIGHT, OCCASIONAL MODERATE
+17 17 LIGHT, FREQUENTLY MODERATE
+18 18 MODERATE, ISOLATED SEVERE
+19 19 MODERATE, OCCASIONAL SEVERE
+20 20 MODERATE, FREQUENTLY SEVERE
+21 21 SEVERE, ISOLATED EXTREME
+22 22 SEVERE, OCCASIONAL EXTREME
+23 23 SEVERE, FREQUENTLY EXTREME
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/11031.table b/definitions/bufr/tables/0/wmo/43/codetables/11031.table
new file mode 100644
index 000000000..7bece1c85
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/11031.table
@@ -0,0 +1,16 @@
+0 0 NIL
+1 1 LIGHT
+2 2 MODERATE
+3 3 SEVERE
+4 4 NIL
+5 5 LIGHT
+6 6 MODERATE
+7 7 SEVERE
+8 8 NIL
+9 9 LIGHT
+10 10 MODERATE
+11 11 SEVERE
+12 12 EXTREME, IN CLEAR AIR
+13 13 EXTREME, IN CLOUD
+14 14 EXTREME, CLOUD/CLEAR AIR NOT SPECIFIED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/11037.table b/definitions/bufr/tables/0/wmo/43/codetables/11037.table
new file mode 100644
index 000000000..e25c9da63
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/11037.table
@@ -0,0 +1,30 @@
+0 0 AVE < 0.1
+1 1 AVE < 0.1
+2 2 0.1 =< AVE < 0.2
+3 3 AVE <0.1
+4 4 0.1 =< AVE < 0.2
+5 5 0.2 =< AVE < 0.3
+6 6 AVE < 0.1
+7 7 0.1 =< AVE < 0.2
+8 8 0.2 =< AVE < 0.3
+9 9 0.3 =< AVE < 0.4
+10 10 AVE < 0.1
+11 11 0.1 =< AVE < 0.2
+12 12 0.2 =< AVE < 0.3
+13 13 0.3 =< AVE < 0.4
+14 14 0.4 =< AVE < 0.5
+15 15 AVE < 0.1
+16 16 0.1 =< AVE < 0.2
+17 17 0.2 =< AVE < 0.3
+18 18 0.3 =< AVE < 0.4
+19 19 0.4 =< AVE < 0.5
+20 20 0.5 =< AVE < 0.8
+21 21 AVE < 0.1
+22 22 0.1 =< AVE < 0.2
+23 23 0.2 =< AVE < 0.3
+24 24 0.3 =< AVE < 0.4
+25 25 0.4 =< AVE < 0.5
+26 26 0.5 =< AVE < 0.8
+27 27 0.8 =< AVE
+28 28 NIL
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/11038.table b/definitions/bufr/tables/0/wmo/43/codetables/11038.table
new file mode 100644
index 000000000..68876b0b6
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/11038.table
@@ -0,0 +1,17 @@
+0 0 MIN < 1
+1 1 1 =< MIN < 2
+2 2 2 =< MIN < 3
+3 3 3 =< MIN < 4
+4 4 4 =< MIN < 5
+5 5 5 =< MIN < 6
+6 6 6 =< MIN < 7
+7 7 7 =< MIN < 8
+8 8 8 =< MIN < 9
+9 9 9 =< MIN < 10
+10 10 10 =< MIN < 11
+11 11 11 =< MIN < 12
+12 12 12 =< MIN < 13
+13 13 13 =< MIN < 14
+14 14 14 =< MIN < 15
+15 15 NO TIMING INFORMATION AVAILABLE
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/11039.table b/definitions/bufr/tables/0/wmo/43/codetables/11039.table
new file mode 100644
index 000000000..e5af0f23b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/11039.table
@@ -0,0 +1,17 @@
+0 0 MIN < 1
+1 1 1 =< MIN < 2
+2 2 2 =< MIN < 3
+3 3 3 =< MIN < 4
+4 4 4 =< MIN < 5
+5 5 5 =< MIN < 6
+6 6 6 =< MIN < 7
+7 7 7 =< MIN < 8
+8 8 8 =< MIN < 9
+9 9 9 =< MIN < 10
+10 10 10 =< MIN < 11
+11 11 11 =< MIN < 12
+12 12 12 =< MIN < 13
+13 13 13 =< MIN < 14
+14 14 14 =< MIN < 15
+60 60 NO TIMING INFORMATION AVAILABLE
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1150.table b/definitions/bufr/tables/0/wmo/43/codetables/1150.table
new file mode 100644
index 000000000..51d945080
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1150.table
@@ -0,0 +1,7 @@
+0 0 WGS84, AS USED BY ICAO SINCE 1998
+1 1 ETRS89, AS DEFINED BY EPSG:4258
+2 2 NAD83, AS DEFINED BY EPSG:4269
+3 3 DHDN, AS DEFINED BY EPSG:4314
+4 4 ELLIPSOIDAL DATUM USING THE INTERNATIONAL REFERENCE MERIDIAN AND THE INTERNATIONAL REFERENCE POLE AS THE PRIME MERIDIAN AND PRIME POLE, RESPECTIVELY, AND THE ORIGIN OF THE INTERNATIONAL TERRESTRIAL REFERENCE SYSTEM (ITRS). THE INTERNATIONAL REFERENCE MERIDIAN, INTERNATIONAL REFERENCE POLE AND ITRS ARE MAINTAINED BY THE INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
+5 5 EARTH-CENTERED, EARTH-FIXED (ECEF) COORDINATE SYSTEM OR EARTH-CENTRED ROTATIONAL (ECR) SYSTEM. THIS IS A RIGHT-HANDED CARTESIAN COORDINATE SYSTEM (X, Y, Z) ROTATING WITH THE EARTH. THE ORIGIN IS DEFINED BY THE CENTRE OF MASS OF THE EARTH. (FOOTNOTE (5) OF CLASS 27 DOES NOT APPLY IF ECEF COORDINATES ARE SPECIFIED.)
+65535 65535 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1151.table b/definitions/bufr/tables/0/wmo/43/codetables/1151.table
new file mode 100644
index 000000000..8907f2371
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1151.table
@@ -0,0 +1,3 @@
+0 0 EARTH GRAVITATIONAL MODEL 1996
+1 1 BALTIC HEIGHT SYSTEM 1977
+4095 4095 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/1155.table b/definitions/bufr/tables/0/wmo/43/codetables/1155.table
new file mode 100644
index 000000000..3df8457a0
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/1155.table
@@ -0,0 +1,8 @@
+0 0 STANDARD CORRECT ALGORITHM (SCA)
+1 1 STANDARD CORRECT ALGORITHM MID-BIN (SCA MID-BIN)
+2 2 MAXIMUM LIKELIHOOD ESTIMATION (MLE)
+3 3 OPTIMAL ESTIMATION PROFILE (OE-PRO)
+4 4 GROUP
+5 5 GROUP MID-BIN
+6 6 MAXIMUM LIKELIHOOD ESTIMATION – HIGH HORIZONTAL RESOLUTION (MLESUB)
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/13038.table b/definitions/bufr/tables/0/wmo/43/codetables/13038.table
new file mode 100644
index 000000000..19bc42216
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/13038.table
@@ -0,0 +1,4 @@
+0 0 NOT SUPERADIABATIC
+1 1 SUPERADIABATIC
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/13039.table b/definitions/bufr/tables/0/wmo/43/codetables/13039.table
new file mode 100644
index 000000000..c070b1da9
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/13039.table
@@ -0,0 +1,3 @@
+0 0 SEA ICE
+1 1 SNOW ON LAND
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/13040.table b/definitions/bufr/tables/0/wmo/43/codetables/13040.table
new file mode 100644
index 000000000..1d37ea957
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/13040.table
@@ -0,0 +1,14 @@
+0 0 LAND
+1 1 RESERVED
+2 2 NEAR COAST
+3 3 ICE
+4 4 POSSIBLE ICE
+5 5 OCEAN
+6 6 COAST
+7 7 INLAND WATER
+8 8 SNOW COVER
+9 9 SEA ICE
+10 10 STANDING WATER
+11 11 SNOW
+12 12 FROZEN SOIL
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/13041.table b/definitions/bufr/tables/0/wmo/43/codetables/13041.table
new file mode 100644
index 000000000..9e77b6466
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/13041.table
@@ -0,0 +1,10 @@
+1 1 A
+2 2 A - B
+3 3 B
+4 4 B - C
+5 5 C
+6 6 D
+7 7 E
+8 8 F
+9 9 G
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/13051.table b/definitions/bufr/tables/0/wmo/43/codetables/13051.table
new file mode 100644
index 000000000..4bdb73e71
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/13051.table
@@ -0,0 +1,8 @@
+0 0 SMALLER THAN ANY VALUE IN THE 30-YEAR PERIOD
+1 1 IN THE FIRST QUINTILE
+2 2 IN THE SECOND QUINTILE
+3 3 IN THE THIRD QUINTILE
+4 4 IN THE FOURTH QUINTILE
+5 5 IN THE FIFTH QUINTILE
+6 6 GREATER THAN ANY VALUE IN THE 30-YEAR PERIOD
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/13056.table b/definitions/bufr/tables/0/wmo/43/codetables/13056.table
new file mode 100644
index 000000000..448c26927
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/13056.table
@@ -0,0 +1,11 @@
+0 0 NO PRECIPITATION
+1 1 LIGHT INTERMITTENT
+2 2 MODERATE INTERMITTENT
+3 3 HEAVY INTERMITTENT
+4 4 VERY HEAVY INTERMITTENT
+5 5 LIGHT CONTINUOUS
+6 6 MODERATE CONTINUOUS
+7 7 HEAVY CONTINUOUS
+8 8 VERY HEAVY CONTINUOUS
+9 9 VARIABLE - ALTERNATIVELY LIGHT AND HEAVY
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/13057.table b/definitions/bufr/tables/0/wmo/43/codetables/13057.table
new file mode 100644
index 000000000..6dfa18dd0
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/13057.table
@@ -0,0 +1,11 @@
+0 0 NO PRECIPITATION
+1 1 WITHIN THE LAST HOUR
+2 2 1 TO 2 HOURS AGO
+3 3 2 TO 3 HOURS AGO
+4 4 3 TO 4 HOURS AGO
+5 5 4 TO 5 HOURS AGO
+6 6 5 TO 6 HOURS AGO
+7 7 6 TO 8 HOURS AGO
+8 8 8 TO 10 HOURS AGO
+9 9 MORE THAN 10 HOURS AGO
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/15025.table b/definitions/bufr/tables/0/wmo/43/codetables/15025.table
new file mode 100644
index 000000000..6bb6ed508
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/15025.table
@@ -0,0 +1,4 @@
+0 0 OZONE
+11 11 FINE PARTICULATE MATTER (DIAMETER < 2.5 MICRONS)
+12 12 FINE PARTICULATE MATTER (DIAMETER < 10 MICRONS)
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19001.table b/definitions/bufr/tables/0/wmo/43/codetables/19001.table
new file mode 100644
index 000000000..af893eb9a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19001.table
@@ -0,0 +1,7 @@
+0 0 DEPRESSION OR LOW (EXTRATROPLCAL)
+1 1 TROPICAL DEPRESSION
+2 2 TROPICAL STORM
+3 3 SEVERE TROPICAL STORM
+4 4 TYPHOON
+10 10 DUST/SANDSTORM
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19008.table b/definitions/bufr/tables/0/wmo/43/codetables/19008.table
new file mode 100644
index 000000000..3bcb5195a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19008.table
@@ -0,0 +1,5 @@
+0 0 RESERVED
+1 1 SHALLOW (TOP OF CIRCULATION BELOW 700-HPA LEVEL)
+2 2 MEDIUM (TOP BETWEEN 700-HPA AND 400-HPA LEVEL)
+3 3 DEEP (TOP ABOVE 400-HPA LEVEL)
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19010.table b/definitions/bufr/tables/0/wmo/43/codetables/19010.table
new file mode 100644
index 000000000..b091d96f0
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19010.table
@@ -0,0 +1,3 @@
+1 1 MINIMUM VALUE OF SEA LEVEL PRESSURE
+2 2 MAXIMUM VALUE OF 850 HPA RELATIVE VORTICITY
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19100.table b/definitions/bufr/tables/0/wmo/43/codetables/19100.table
new file mode 100644
index 000000000..1f03a6f1b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19100.table
@@ -0,0 +1,9 @@
+3 3 DURING THE PRECEDING 15 MINUTES
+4 4 DURING THE PRECEDING 30 MINUTES
+5 5 DURING THE PRECEDING 1 HOUR
+6 6 DURING THE PRECEDING 2 HOURS
+7 7 DURING THE PRECEDING 3 HOURS
+8 8 DURING THE PRECEDING 6 HOURS
+9 9 DURING A PERIOD OF MORE THAN 6 HOURS
+10 10 UNDETERMINED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19101.table b/definitions/bufr/tables/0/wmo/43/codetables/19101.table
new file mode 100644
index 000000000..0cd1ff4a6
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19101.table
@@ -0,0 +1,10 @@
+0 0 RESERVED
+1 1 EYE VISIBLE ON RADAR SCOPE, ACCURACY GOOD (WITHIN 10 KM)
+2 2 EYE VISIBLE ON RADAR SCOPE, ACCURACY FAIR (WITHIN 30 KM)
+3 3 EYE VISIBLE ON RADAR SCOPE, ACCURACY POOR (WITHIN 50 KM)
+4 4 POSITION OF THE CENTRE WITHIN THE AREA COVERED BY THE RADAR SCOPE, DETERMINATION BY MEANS OF THE SPIRAL-BAND OVERLAY, ACCURACY GOOD (WITHIN 10 KM)
+5 5 POSITION OF THE CENTRE WITHIN THE AREA COVERED BY THE RADAR SCOPE, DETERMINATION BY MEANS OF THE SPIRAL-BAND OVERLAY, ACCURACY FAIR (WITHIN 30 KM)
+6 6 POSITION OF THE CENTRE WITHIN THE AREA COVERED BY THE RADAR SCOPE, DETERMINATION BY MEANS OF THE SPIRAL-BAND OVERLAY, ACCURACY POOR (WITHIN 50 KM)
+7 7 POSITION OF THE CENTRE OUTSIDE THE AREA COVERED BY THE RADAR SCOPE, EXTRAPOLATION BY MEANS OF THE SPIRAL-BAND OVERLAY
+10 10 ACCURACY UNDETERMINED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19102.table b/definitions/bufr/tables/0/wmo/43/codetables/19102.table
new file mode 100644
index 000000000..21ab7756b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19102.table
@@ -0,0 +1,8 @@
+0 0 CIRCULAR
+1 1 ELLIPTICAL - THE MINOR AXIS IS AT LEAST 3/4 THE LENGTH OF THE MAJOR AXIS
+2 2 ELLIPTICAL - THE MINOR AXIS IS LESS THAN 3/4 THE LENGTH OF THE MAJOR AXIS
+3 3 APPARENT DOUBLE EYE
+4 4 OTHER SHAPE
+5 5 ILL DEFINED
+6 6 UNDETERMINED
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19103.table b/definitions/bufr/tables/0/wmo/43/codetables/19103.table
new file mode 100644
index 000000000..3abb184f8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19103.table
@@ -0,0 +1,12 @@
+0 0 LESS THAN 5 KM
+1 1 5 TO LESS THAN 10 KM
+2 2 10 TO LESS THAN 15 KM
+3 3 15 TO LESS THAN 20 KM
+4 4 20 TO LESS THAN 25 KM
+5 5 25 TO LESS THAN 30 KM
+6 6 30 TO LESS THAN 35 KM
+7 7 35 TO LESS THAN 40 KM
+8 8 40 TO LESS THAN 50 KM
+9 9 50 KM AND GREATER
+10 10 UNDETERMINED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19104.table b/definitions/bufr/tables/0/wmo/43/codetables/19104.table
new file mode 100644
index 000000000..67ae47479
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19104.table
@@ -0,0 +1,12 @@
+0 0 EYE HAS FIRST BECOME VISIBLE DURING THE PAST 30 MINUTES
+1 1 NO SIGNIFICANT CHANGE IN THE CHARACTERISTICS OR SIZE OF THE EYE
+2 2 EYE HAS BECOME SMALLER WITH NO OTHER SIGNIFICANT CHANGE IN CHARACTERISTICS
+3 3 EYE HAS BECOME LARGER WITH NO OTHER SIGNIFICANT CHANGE IN CHARACTERISTICS
+4 4 EYE HAS BECOME LESS DISTINCT WITH NO SIGNIFICANT CHANGE IN SIZE
+5 5 EYE HAS BECOME LESS DISTINCT AND DECREASED IN SIZE
+6 6 EYE HAS BECOME LESS DISTINCT AND INCREASED IN SIZE
+7 7 EYE HAS BECOME MORE DISTINCT WITH NO SIGNIFICANT CHANGE IN SIZE
+8 8 EYE HAS BECOME MORE DISTINCT AND DECREASED IN SIZE
+9 9 EYE HAS BECOME MORE DISTINCT AND INCREASED IN SIZE
+10 10 CHANGE IN CHARACTER AND SIZE OF EYE CANNOT BE DETERMINED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19105.table b/definitions/bufr/tables/0/wmo/43/codetables/19105.table
new file mode 100644
index 000000000..becfceea8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19105.table
@@ -0,0 +1,10 @@
+0 0 0 TO LESS THAN 100 KM
+1 1 100 TO LESS THAN 200 KM
+2 2 200 TO LESS THAN 300 KM
+3 3 300 TO LESS THAN 400 KM
+4 4 400 TO LESS THAN 500 KM
+5 5 500 TO LESS THAN 600 KM
+6 6 600 TO LESS THAN 800 KM
+7 7 800 KM OR MORE
+10 10 DOUBTFUL OR UNDETERMINED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19107.table b/definitions/bufr/tables/0/wmo/43/codetables/19107.table
new file mode 100644
index 000000000..ed6b79c54
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19107.table
@@ -0,0 +1,11 @@
+0 0 LESS THAN 1 HOUR
+1 1 1 TO LESS THAN 2 HOURS
+2 2 2 TO LESS THAN 3 HOURS
+3 3 3 TO LESS THAN 6 HOURS
+4 4 6 TO LESS THAN 9 HOURS
+5 5 9 TO LESS THAN 12 HOURS
+6 6 12 TO LESS THAN 15 HOURS
+7 7 15 TO LESS THAN 18 HOURS
+8 8 18 TO LESS THAN 21 HOURS
+9 9 21 TO LESS THAN 30 HOURS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19108.table b/definitions/bufr/tables/0/wmo/43/codetables/19108.table
new file mode 100644
index 000000000..9350bc265
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19108.table
@@ -0,0 +1,8 @@
+0 0 CYCLONE CENTRE WITHIN 10 KM OF THE TRANSMITTED POSITION
+1 1 CYCLONE CENTRE WITHIN 20 KM OF THE TRANSMITTED POSITION
+2 2 CYCLONE CENTRE WITHIN 50 KM OF THE TRANSMITTED POSITION
+3 3 CYCLONE CENTRE WITHIN 100 KM OF THE TRANSMITTED POSITION
+4 4 CYCLONE CENTRE WITHIN 200 KM OF THE TRANSMITTED POSITION
+5 5 CYCLONE CENTRE WITHIN 300 KM OF THE TRANSMITTED POSITION
+6 6 CYCLONE CENTRE UNDETERMINED
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19109.table b/definitions/bufr/tables/0/wmo/43/codetables/19109.table
new file mode 100644
index 000000000..3d236291d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19109.table
@@ -0,0 +1,12 @@
+0 0 LESS THAN 1 DEG OF LATITUDE
+1 1 1 DEG TO LESS THAN 2 DEG OF LATITUDE
+2 2 2 DEG TO LESS THAN 3 DEG OF LATITUDE
+3 3 3 DEG TO LESS THAN 4 DEG OF LATITUDE
+4 4 4 DEG TO LESS THAN 5 DEG OF LATITUDE
+5 5 5 DEG TO LESS THAN 6 DEG OF LATITUDE
+6 6 6 DEG TO LESS THAN 7 DEG OF LATITUDE
+7 7 7 DEG TO LESS THAN 8 DEG OF LATITUDE
+8 8 8 DEG TO LESS THAN 9 DEG OF LATITUDE
+9 9 9 DEG OF LATITUDE OR MORE
+10 10 UNDETERMINED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19110.table b/definitions/bufr/tables/0/wmo/43/codetables/19110.table
new file mode 100644
index 000000000..81f4f593c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19110.table
@@ -0,0 +1,8 @@
+0 0 MUCH WEAKENING
+1 1 WEAKENING
+2 2 NO CHANGE
+3 3 INTENSIFICATION
+4 4 STRONG INTENSIFICATION
+9 9 NOT OBSERVED PREVIOUSLY
+10 10 UNDETERMINED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19113.table b/definitions/bufr/tables/0/wmo/43/codetables/19113.table
new file mode 100644
index 000000000..ba46dca88
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19113.table
@@ -0,0 +1,8 @@
+1 1 CURVED BAND
+2 2 SHEAR
+3 3 EYE
+4 4 BANDING EYE
+5 5 CENTRAL DENSE OVERCAST (CDO)
+6 6 EMBEDDED CENTRE
+7 7 CENTRE COLD COVER (CCC)
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19117.table b/definitions/bufr/tables/0/wmo/43/codetables/19117.table
new file mode 100644
index 000000000..b623197a3
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19117.table
@@ -0,0 +1,4 @@
+1 1 A (CURVED BAND)
+2 2 B (CDO)
+3 3 C (SHEAR)
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/19119.table b/definitions/bufr/tables/0/wmo/43/codetables/19119.table
new file mode 100644
index 000000000..8329a8a58
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/19119.table
@@ -0,0 +1,4 @@
+1 1 DT-NUMBER
+2 2 PT-NUMBER
+3 3 MET-NUMBER
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20003.table b/definitions/bufr/tables/0/wmo/43/codetables/20003.table
new file mode 100644
index 000000000..1414361a2
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20003.table
@@ -0,0 +1,266 @@
+0 0 CLOUD DEVELOPMENT NOT OBSERVED OR NOT OBSERVABLE
+1 1 CLOUDS GENERALLY DISSOLVING OR BECOMING LESS DEVELOPED
+2 2 STATE OF SKY ON THE WHOLE UNCHANGED
+3 3 CLOUDS GENERALLY FORMING OR DEVELOPING
+4 4 VISIBILITY REDUCED BY SMOKE, E.G. VELDT OR FOREST FIRES, INDUSTRIAL SMOKE OR VOLCANIC ASHES
+5 5 HAZE
+6 6 WIDESPREAD DUST IN SUSPENSION IN THE AIR, NOT RAISED BY WIND AT OR NEAR THE STATION AT THE TIME OF OBSERVATION
+7 7 DUST OR SAND RAISED BY WIND AT OR NEAR THE STATION AT THE TIME OF OBSERVATION, BUT NO WELL-DEVELOPED DUST WHIRL(S) OR SAND WHIRL(S), AND NO DUSTSTORM OR SANDSTORM SEEN; OR, IN THE CASE OF SEA STATIONS AND COASTAL STATIONS, BLOWING SPRAY AT THE STATION
+8 8 WELL-DEVELOPED DUST WHIRL(S) OR SAND WHIRL(S) SEEN AT OR NEAR THE STATION DURING THE PRECEDING HOUR OR AT THE SAME TIME OF OBSERVATION, BUT NO DUSTSTORM OR SANDSTORM
+9 9 DUSTSTORM OR SANDSTORM WITHIN SIGHT AT THE TIME OF OBSERVATION, OR AT THE STATION DURING THE PRECEDING HOUR
+10 10 MIST
+11 11 PATCHES
+12 12 MORE OR LESS CONTINUOUS
+13 13 LIGHTNING VISIBLE, NO THUNDER HEARD
+14 14 PRECIPITATION WITHIN SIGHT, NOT REACHING THE GROUND OR THE SURFACE OF THE SEA
+15 15 PRECIPITATION WITHIN SIGHT, REACHING THE GROUND OR THE SURFACE OF THE SEA, BUT DISTANT, I.E. ESTIMATED TO BE MORE THAN 5 KM FROM THE STATION
+16 16 PRECIPITATION WITHIN SIGHT, REACHING THE GROUND OR THE SURFACE OF THE SEA, NEAR TO, BUT NOT AT THE STATION
+17 17 THUNDERSTORM, BUT NO PRECIPITATION AT THE TIME OF OBSERVATION
+18 18 SQUALLS
+19 19 FUNNEL CLOUD(S)
+20 20 DRIZZLE (NOT FREEZING) OR SNOW GRAINS
+21 21 RAIN (NOT FREEZING)
+22 22 SNOW
+23 23 RAIN AND SNOW OR ICE PELLETS
+24 24 FREEZING DRIZZLE OR FREEZING RAIN
+25 25 SHOWER(S) OF RAIN
+26 26 SHOWER(S) OF SNOW, OR OF RAIN AND SNOW
+27 27 SHOWER(S) OF HAIL, OR OF RAIN AND HAIL
+28 28 FOG OR ICE FOG
+29 29 THUNDERSTORM (WITH OR WITHOUT PRECIPITATION)
+30 30 SLIGHT OR MODERATE DUSTSTORM OR SANDSTORM
+31 31 SLIGHT OR MODERATE DUSTSTORM OR SANDSTORM
+32 32 SLIGHT OR MODERATE DUSTSTORM OR SANDSTORM
+33 33 SEVERE DUSTSTORM OR SANDSTORM
+34 34 SEVERE DUSTSTORM OR SANDSTORM
+35 35 SEVERE DUSTSTORM OR SANDSTORM
+36 36 SLIGHT OR MODERATE DRIFTING SNOW
+37 37 HEAVY DRIFTING SNOW
+38 38 SLIGHT OR MODERATE BLOWING SNOW
+39 39 HEAVY BLOWING SNOW
+40 40 FOG OR ICE FOG AT A DISTANCE AT THE TIME OF OBSERVATION, BUT NOT AT THE STATION DURING THE PRECEDING HOUR, THE FOG OR ICE FOG EXTENDING TO A LEVEL ABOVE THAT OF THE OBSERVER
+41 41 FOG OR ICE FOG IN PATCHES
+42 42 FOG OR ICE FOG, SKY VISIBLE
+43 43 FOG OR ICE FOG, SKY INVISIBLE
+44 44 FOG OR ICE FOG, SKY VISIBLE
+45 45 FOG OR ICE FOG, SKY INVISIBLE
+46 46 FOG OR ICE FOG, SKY VISIBLE
+47 47 FOG OR ICE FOG, SKY INVISIBLE
+48 48 FOG, DEPOSITING RIME, SKY VISIBLE
+49 49 FOG, DEPOSITING RIME, SKY INVISIBLE
+50 50 DRIZZLE, NOT FREEZING, INTERMITTENT
+51 51 DRIZZLE, NOT FREEZING, CONTINUOUS
+52 52 DRIZZLE, NOT FREEZING, INTERMITTENT
+53 53 DRIZZLE, NOT FREEZING, CONTINUOUS
+54 54 DRIZZLE, NOT FREEZING, INTERMITTENT
+55 55 DRIZZLE, NOT FREEZING, CONTINUOUS
+56 56 DRIZZLE, FREEZING, SLIGHT
+57 57 DRIZZLE, FREEZING, MODERATE OR HEAVY (DENSE)
+58 58 DRIZZLE AND RAIN, SLIGHT
+59 59 DRIZZLE AND RAIN, MODERATE OR HEAVY
+60 60 RAIN, NOT FREEZING, INTERMITTENT
+61 61 RAIN, NOT FREEZING, CONTINUOUS
+62 62 RAIN, NOT FREEZING, INTERMITTENT
+63 63 RAIN, NOT FREEZING, CONTINUOUS
+64 64 RAIN, NOT FREEZING, INTERMITTENT
+65 65 RAIN, NOT FREEZING, CONTINUOUS
+66 66 RAIN, FREEZING, SLIGHT
+67 67 RAIN, FREEZING, MODERATE OR HEAVY
+68 68 RAIN OR DRIZZLE AND SNOW, SLIGHT
+69 69 RAIN OR DRIZZLE AND SNOW, MODERATE OR HEAVY
+70 70 INTERMITTENT FALL OF SNOWFLAKES
+71 71 CONTINUOUS FALL OF SNOWFLAKES
+72 72 INTERMITTENT FALL OF SNOWFLAKES
+73 73 CONTINUOUS FALL OF SNOWFLAKES
+74 74 INTERMITTENT FALL OF SNOWFLAKES
+75 75 CONTINUOUS FALL OF SNOWFLAKES
+76 76 DIAMOND DUST (WITH OR WITHOUT FOG)
+77 77 SNOW GRAINS (WITH OR WITHOUT FOG)
+78 78 ISOLATED STAR-LIKE SNOW CRYSTALS (WITH OR WITHOUT FOG)
+79 79 ICE PELLETS
+80 80 RAIN SHOWER(S), SLIGHT
+81 81 RAIN SHOWER(S), MODERATE OR HEAVY
+82 82 RAIN SHOWER(S), VIOLENT
+83 83 SHOWER(S) OF RAIN AND SNOW MIXED, SLIGHT
+84 84 SHOWER(S) OF RAIN AND SNOW MIXED, MODERATE OR HEAVY
+85 85 SNOW SHOWER(S), SLIGHT
+86 86 SNOW SHOWER(S), MODERATE OR HEAVY
+87 87 SHOWER(S) OF SNOW PELLETS OR SMALL HAIL, WITH OR WITHOUT RAIN OR RAIN AND SNOW MIXED
+88 88 SHOWER(S) OF SNOW PELLETS OR SMALL HAIL, WITH OR WITHOUT RAIN OR RAIN AND SNOW MIXED
+89 89 SHOWER(S) OF HAIL, WITH OR WITHOUT RAIN OR RAIN AND SNOW MIXED, NOT ASSOCIATED WITH THUNDER
+90 90 SHOWER(S) OF HAIL, WITH OR WITHOUT RAIN OR RAIN AND SNOW MIXED, NOT ASSOCIATED WITH THUNDER
+91 91 SLIGHT RAIN AT TIME OF OBSERVATION
+92 92 MODERATE OR HEAVY RAIN AT TIME OF OBSERVATION
+93 93 SLIGHT SNOW, OR RAIN AND SNOW MIXED OR HAIL AT TIME OF OBSERVATION
+94 94 MODERATE OR HEAVY SNOW, OR RAIN AND SNOW MIXED OR HAIL AT TIME OF OBSERVATION
+95 95 THUNDERSTORM, SLIGHT OR MODERATE, WITHOUT HAIL, BUT WITH RAIN AND/OR SNOW AT TIME OF OBSERVATION
+96 96 THUNDERSTORM, SLIGHT OR MODERATE, WITH HAIL AT TIME OF OBSERVATION
+97 97 THUNDERSTORM, HEAVY, WITHOUT HAIL, BUT WITH RAIN AND/OR SNOW AT TIME OF OBSERVATION
+98 98 THUNDERSTORM COMBINED WITH DUSTSTORM OR SANDSTORM AT TIME OF OBSERVATION
+99 99 THUNDERSTORM, HEAVY, WITH HAIL AT TIME OF OBSERVATION
+100 100 NO SIGNIFICANT WEATHER OBSERVED
+101 101 CLOUDS GENERALLY DISSOLVING OR BECOMING LESS DEVELOPED DURING THE PAST HOUR
+102 102 STATE OF SKY ON THE WHOLE UNCHANGED DURING THE PAST HOUR
+103 103 CLOUDS GENERALLY FORMING OR DEVELOPING DURING THE PAST HOUR
+104 104 HAZE OR SMOKE, OR DUST IN SUSPENSION IN THE AIR, VISIBILITY EQUAL TO, OR GREATER THAN, 1 KM
+105 105 HAZE OR SMOKE, OR DUST IN SUSPENSION IN THE AIR, VISIBILITY LESS THAN 1 KM
+110 110 MIST
+111 111 DIAMOND DUST
+112 112 DISTANT LIGHTNING
+118 118 SQUALLS
+119 119 RESERVED
+120 120 FOG
+121 121 PRECIPITATION
+122 122 DRIZZLE (NOT FREEZING) OR SNOW GRAINS
+123 123 RAIN (NOT FREEZING)
+124 124 SNOW
+125 125 FREEZING DRIZZLE OR FREEZING RAIN
+126 126 THUNDERSTORM (WITH OR WITHOUT PRECIPITATION)
+127 127 BLOWING OR DRIFTING SNOW OR SAND
+128 128 BLOWING OR DRIFTING SNOW OR SAND, VISIBILITY EQUAL TO, OR GREATER THAN, 1 KM
+129 129 BLOWING OR DRIFTING SNOW OR SAND, VISIBILITY LESS THAN 1 KM
+130 130 FOG
+131 131 FOG OR ICE FOG IN PATCHES
+132 132 FOG OR ICE FOG, HAS BECOME THINNER DURING THE PAST HOUR
+133 133 FOG OR ICE FOG, NO APPRECIABLE CHANGE DURING THE PAST HOUR
+134 134 FOG OR ICE FOG, HAS BEGUN OR BECOME THICKER DURING THE PAST HOUR
+135 135 FOG, DEPOSITING RIME
+140 140 PRECIPITATION
+141 141 PRECIPITATION, SLIGHT OR MODERATE
+142 142 PRECIPITATION, HEAVY
+143 143 LIQUID PRECIPITATION, SLIGHT OR MODERATE
+144 144 LIQUID PRECIPITATION, HEAVY
+145 145 SOLID PRECIPITATION, SLIGHT OR MODERATE
+146 146 SOLID PRECIPITATION, HEAVY
+147 147 FREEZING PRECIPITATION, SLIGHT OR MODERATE
+148 148 FREEZING PRECIPITATION, HEAVY
+149 149 RESERVED
+150 150 DRIZZLE
+151 151 DRIZZLE, NOT FREEZING, SLIGHT
+152 152 DRIZZLE, NOT FREEZING, MODERATE
+153 153 DRIZZLE, NOT FREEZING, HEAVY
+154 154 DRIZZLE, FREEZING, SLIGHT
+155 155 DRIZZLE, FREEZING, MODERATE
+156 156 DRIZZLE, FREEZING, HEAVY
+157 157 DRIZZLE AND RAIN, SLIGHT
+158 158 DRIZZLE AND RAIN, MODERATE OR HEAVY
+159 159 RESERVED
+160 160 RAIN
+161 161 RAIN, NOT FREEZING, SLIGHT
+162 162 RAIN, NOT FREEZING, MODERATE
+163 163 RAIN, NOT FREEZING, HEAVY
+164 164 RAIN, FREEZING, SLIGHT
+165 165 RAIN, FREEZING, MODERATE
+166 166 RAIN, FREEZING, HEAVY
+167 167 RAIN (OR DRIZZLE) AND SNOW, SLIGHT
+168 168 RAIN (OR DRIZZLE) AND SNOW, MODERATE OR HEAVY
+169 169 RESERVED
+170 170 SNOW
+171 171 SNOW, SLIGHT
+172 172 SNOW, MODERATE
+173 173 SNOW, HEAVY
+174 174 ICE PELLETS, SLIGHT
+175 175 ICE PELLETS, MODERATE
+176 176 ICE PELLETS, HEAVY
+177 177 SNOW GRAINS
+178 178 ICE CRYSTALS
+179 179 RESERVED
+180 180 SHOWER(S) OR INTERMITTENT PRECIPITATION
+181 181 RAIN SHOWER(S) OR INTERMITTENT RAIN, SLIGHT
+182 182 RAIN SHOWER(S) OR INTERMITTENT RAIN, MODERATE
+183 183 RAIN SHOWER(S) OR INTERMITTENT RAIN, HEAVY
+184 184 RAIN SHOWER(S) OR INTERMITTENT RAIN, VIOLENT
+185 185 SNOW SHOWER(S) OR INTERMITTENT SNOW, SLIGHT
+186 186 SNOW SHOWER(S) OR INTERMITTENT SNOW, MODERATE
+187 187 SNOW SHOWER(S) OR INTERMITTENT SNOW, HEAVY
+188 188 RESERVED
+189 189 HAIL
+190 190 THUNDERSTORM
+191 191 THUNDERSTORM, SLIGHT OR MODERATE, WITH NO PRECIPITATION
+192 192 THUNDERSTORM, SLIGHT OR MODERATE, WITH RAIN SHOWERS AND/OR SNOW SHOWERS
+193 193 THUNDERSTORM, SLIGHT OR MODERATE, WITH HAIL
+194 194 THUNDERSTORM, HEAVY, WITH NO PRECIPITATION
+195 195 THUNDERSTORM, HEAVY, WITH RAIN SHOWERS AND/OR SNOW SHOWERS
+196 196 THUNDERSTORM, HEAVY, WITH HAIL
+199 199 TORNADO
+204 204 VOLCANIC ASH SUSPENDED IN THE AIR ALOFT
+205 205 NOT USED
+206 206 THICK DUST HAZE, VISIBILITY LESS THAN 1 KM
+207 207 BLOWING SPRAY AT THE STATION
+208 208 DRIFTING DUST (SAND)
+209 209 WALL OF DUST OR SAND IN DISTANCE (LIKE HABOOB)
+210 210 SNOW HAZE
+211 211 WHITEOUT
+212 212 NOT USED
+213 213 LIGHTNING, CLOUD TO SURFACE
+217 217 DRY THUNDERSTORM
+218 218 NOT USED
+219 219 TORNADO CLOUD (DESTRUCTIVE) AT OR WITHIN SIGHT OF THE STATION DURING PRECEDING HOUR OR AT THE TIME OF OBSERVATION
+220 220 DEPOSITION OF VOLCANIC ASH
+221 221 DEPOSITION OF DUST OR SAND
+222 222 DEPOSITION OF DEW
+223 223 DEPOSITION OF WET SNOW
+224 224 DEPOSITION OF SOFT RIME
+225 225 DEPOSITION OF HARD RIME
+226 226 DEPOSITION OF HOAR FROST
+227 227 DEPOSITION OF GLAZE
+228 228 DEPOSITION OF ICE CRUST (ICE SLICK)
+229 229 NOT USED
+230 230 DUSTSTORM OR SANDSTORM WITH TEMPERATURE BELOW 0 DEG C
+239 239 BLOWING SNOW, IMPOSSIBLE TO DETERMINE WHETHER SNOW IS FALLING OR NOT
+240 240 NOT USED
+241 241 FOG ON SEA
+242 242 FOG IN VALLEYS
+243 243 ARCTIC OR ANTARCTIC SEA SMOKE
+244 244 STEAM FOG (SEA, LAKE OR RIVER)
+245 245 STEAM LOG (LAND)
+246 246 FOG OVER ICE OR SNOW COVER
+247 247 DENSE FOG, VISIBILITY 60-90 M
+248 248 DENSE FOG, VISIBILITY 30-60 M
+249 249 DENSE FOG, VISIBILITY LESS THAN 30 M
+250 250 DRIZZLE, RATE OF FALL - LESS THAN 0.10 MM H-1
+251 251 DRIZZLE, RATE OF FALL - 0.10-0.19 MM H-1
+252 252 DRIZZLE, RATE OF FALL - 0.20-0.39 MM H-1
+253 253 DRIZZLE, RATE OF FALL - 0.40-0.79 MM H-1
+254 254 DRIZZLE, RATE OF FALL - 0.80-1.59 MM H-1
+255 255 DRIZZLE, RATE OF FALL - 1.60-3.19 MM H-1
+256 256 DRIZZLE, RATE OF FALL - 3.20-6.39 MM H-1
+257 257 DRIZZLE, RATE OF FALL - 6.4 MM H-1 OR MORE
+258 258 NOT USED
+259 259 DRIZZLE AND SNOW
+260 260 RAIN, RATE OF FALL - LESS THAN 1.0 MM H-1
+261 261 RAIN, RATE OF FALL - 1.0-1.9 MM H-1
+262 262 RAIN, RATE OF FALL - 2.0-3.9 MM H-1
+263 263 RAIN, RATE OF FALL - 4.0-7.9 MM H-1
+264 264 RAIN, RATE OF FALL - 8.0-15.9 MM H-1
+265 265 RAIN, RATE OF FALL - 16.0-31.9 MM H-1
+266 266 RAIN, RATE OF FALL - 32.0-63.9 MM H-1
+267 267 RAIN, RATE OF FALL - 64.0 MM H-1 OR MORE
+270 270 SNOW, RATE OF FALL - LESS THAN 1.0 CM H-1
+271 271 SNOW, RATE OF FALL - 1.0-1.9 CM H-1
+272 272 SNOW, RATE OF FALL - 2.0-3.9 CM H-1
+273 273 SNOW, RATE OF FALL - 4.0-7.9 CM H-1
+274 274 SNOW, RATE OF FALL - 8.0-15.9 CM H-1
+275 275 SNOW, RATE OF FALL - 16.0-31.9 CM H-1
+276 276 SNOW, RATE OF FALL - 32.0-63.9 CM H-1
+277 277 SNOW, RATE OF FALL - 64.0 CM H-1 OR MORE
+278 278 SNOW OR ICE CRYSTAL PRECIPITATION FROM A CLEAR SKY
+279 279 WET SNOW, FREEZING ON CONTACT
+280 280 PRECIPITATION OF RAIN
+281 281 PRECIPITATION OF RAIN, FREEZING
+282 282 PRECIPITATION OF RAIN AND SNOW MIXED
+283 283 PRECIPITATION OF SNOW
+284 284 PRECIPITATION OF SNOW PELLETS OR SMALL HALL
+285 285 PRECIPITATION OF SNOW PELLETS OR SMALL HAIL, WITH RAIN
+286 286 PRECIPITATION OF SNOW PELLETS OR SMALL HAIL, WITH RAIN AND SNOW MIXED
+287 287 PRECIPITATION OF SNOW PELLETS OR SMALL HAIL, WITH SNOW
+288 288 PRECIPITATION OF HAIL
+289 289 PRECIPITATION OF HAIL, WITH RAIN
+290 290 PRECIPITATION OF HALL, WITH RAIN AND SNOW MIXED
+291 291 PRECIPITATION OF HAIL, WITH SNOW
+292 292 SHOWER(S) OR THUNDERSTORM OVER SEA
+293 293 SHOWER(S) OR THUNDERSTORM OVER MOUNTAINS
+508 508 NO SIGNIFICANT PHENOMENON TO REPORT, PRESENT AND PAST WEATHER OMITTED
+509 509 NO OBSERVATION, DATA NOT AVAILABLE, PRESENT AND PAST WEATHER OMITTED
+510 510 PRESENT AND PAST WEATHER MISSING, BUT EXPECTED
+511 511 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20004.table b/definitions/bufr/tables/0/wmo/43/codetables/20004.table
new file mode 100644
index 000000000..f3d3024d8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20004.table
@@ -0,0 +1,21 @@
+0 0 CLOUD COVERING 1/2 OR LESS OF THE SKY THROUGHOUT THE APPROPRIATE PERIOD
+1 1 CLOUD COVERING MORE THAN 1/2 OF THE SKY DURING PART OF THE APPROPRIATE PERIOD AND COVERING 1/2 OR LESS DURING PART OF THE PERIOD
+2 2 CLOUD COVERING MORE THAN 1/2 OF THE SKY THROUGHOUT THE APPROPRIATE PERIOD
+3 3 SANDSTORM, DUSTSTORM OR BLOWING SNOW
+4 4 FOG OR ICE FOG OR THICK HAZE
+5 5 DRIZZLE
+6 6 RAIN
+7 7 SNOW, OR RAIN AND SNOW MIXED
+8 8 SHOWER(S)
+9 9 THUNDERSTORM(S) WITH OR WITHOUT PRECIPITATION
+10 10 NO SIGNIFICANT WEATHER OBSERVED
+11 11 VISIBILITY REDUCED
+12 12 BLOWING PHENOMENA, VISIBILITY REDUCED
+13 13 FOG
+14 14 PRECIPITATION
+15 15 DRIZZLE
+16 16 RAIN
+17 17 SNOW OR ICE PELLETS
+18 18 SHOWERS OR INTERMITTENT PRECIPITATION
+19 19 THUNDERSTORM
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20005.table b/definitions/bufr/tables/0/wmo/43/codetables/20005.table
new file mode 100644
index 000000000..f3d3024d8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20005.table
@@ -0,0 +1,21 @@
+0 0 CLOUD COVERING 1/2 OR LESS OF THE SKY THROUGHOUT THE APPROPRIATE PERIOD
+1 1 CLOUD COVERING MORE THAN 1/2 OF THE SKY DURING PART OF THE APPROPRIATE PERIOD AND COVERING 1/2 OR LESS DURING PART OF THE PERIOD
+2 2 CLOUD COVERING MORE THAN 1/2 OF THE SKY THROUGHOUT THE APPROPRIATE PERIOD
+3 3 SANDSTORM, DUSTSTORM OR BLOWING SNOW
+4 4 FOG OR ICE FOG OR THICK HAZE
+5 5 DRIZZLE
+6 6 RAIN
+7 7 SNOW, OR RAIN AND SNOW MIXED
+8 8 SHOWER(S)
+9 9 THUNDERSTORM(S) WITH OR WITHOUT PRECIPITATION
+10 10 NO SIGNIFICANT WEATHER OBSERVED
+11 11 VISIBILITY REDUCED
+12 12 BLOWING PHENOMENA, VISIBILITY REDUCED
+13 13 FOG
+14 14 PRECIPITATION
+15 15 DRIZZLE
+16 16 RAIN
+17 17 SNOW OR ICE PELLETS
+18 18 SHOWERS OR INTERMITTENT PRECIPITATION
+19 19 THUNDERSTORM
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20006.table b/definitions/bufr/tables/0/wmo/43/codetables/20006.table
new file mode 100644
index 000000000..cc2612116
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20006.table
@@ -0,0 +1,5 @@
+0 0 LOW INSTRUMENT FLIGHT RULES - CEILING < 500 FEET AND/OR VISIBILITY < 1 MILE
+1 1 INSTRUMENT FLIGHT RULES - CEILING < 1000 FEET AND/OR VISIBILITY < 3 MILES
+2 2 MARGINAL VISUAL FLIGHT RULES - 1000 FEET =< CEILING < 3000 FEET AND/OR 3 MILES =< VISIBILITY < 5 MILES
+3 3 VISUAL FLIGHT RULES - CEILING >= 3000 FEET AND/OR VISIBILITY >= 5 MILES
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20008.table b/definitions/bufr/tables/0/wmo/43/codetables/20008.table
new file mode 100644
index 000000000..966bcc2fa
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20008.table
@@ -0,0 +1,19 @@
+0 0 SKY CLEAR
+1 1 FEW
+2 2 SCATTERED
+3 3 BROKEN
+4 4 OVERCAST
+5 5 RESERVED
+6 6 SCATTERED/BROKEN
+7 7 BROKEN/OVERCAST
+8 8 ISOLATED
+9 9 ISOLATED EMBEDDED
+10 10 OCCASIONAL
+11 11 OCCASIONAL EMBEDDED
+12 12 FREQUENT
+13 13 DENSE
+14 14 LAYERS
+15 15 OBSCURED (OBSC)
+16 16 EMBEDDED (EMBD)
+17 17 FREQUENT EMBEDDED
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20009.table b/definitions/bufr/tables/0/wmo/43/codetables/20009.table
new file mode 100644
index 000000000..c3f1d7435
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20009.table
@@ -0,0 +1,7 @@
+0 0 RESERVED
+1 1 NSC NIL SIGNIFICANT CLOUD
+2 2 CAVOK
+3 3 SKC SKY CLEAR
+4 4 NSW NIL SIGNIFICANT WEATHER
+5 5 NCD NO CLOUDS DETECTED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2001.table b/definitions/bufr/tables/0/wmo/43/codetables/2001.table
new file mode 100644
index 000000000..470fcccb7
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2001.table
@@ -0,0 +1,4 @@
+0 0 AUTOMATIC
+1 1 MANNED
+2 2 HYBRID: BOTH MANNED AND AUTOMATIC
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20011.table b/definitions/bufr/tables/0/wmo/43/codetables/20011.table
new file mode 100644
index 000000000..06c6e106c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20011.table
@@ -0,0 +1,16 @@
+0 0 0
+1 1 1 OKTA OR LESS, BUT NOT ZERO
+2 2 2 OKTAS
+3 3 3 OKTAS
+4 4 4 OKTAS
+5 5 5 OKTAS
+6 6 6 OKTAS
+7 7 7 OKTAS OR MORE, BUT NOT 8 OKTAS
+8 8 8 OKTAS
+9 9 SKY OBSCURED BY FOG AND/OR OTHER METEOROLOGICAL PHENOMENA
+10 10 SKY PARTIALLY OBSCURED BY FOG AND/OR OTHER METEOROLOGICAL PHENOMENA
+11 11 SCATTERED
+12 12 BROKEN
+13 13 FEW
+14 14 RESERVED
+15 15 CLOUD COVER IS INDISCERNIBLE FOR REASONS OTHER THAN FOG OR OTHER METEOROLOGICAL PHENOMENA, OR OBSERVATION IS NOT MADE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20012.table b/definitions/bufr/tables/0/wmo/43/codetables/20012.table
new file mode 100644
index 000000000..07984f399
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20012.table
@@ -0,0 +1,55 @@
+0 0 CIRRUS (CI)
+1 1 CIRROCUMULUS (CC)
+2 2 CIRROSTRATUS (CS)
+3 3 ALTOCUMULUS (AC)
+4 4 ALTOSTRATUS (AS)
+5 5 NIMBOSTRATUS (NS)
+6 6 STRATOCUMULUS (SC)
+7 7 STRATUS (ST)
+8 8 CUMULUS (CU)
+9 9 CUMULONIMBUS (CB)
+10 10 NO CH CLOUDS
+11 11 CIRRUS FIBRATUS, SOMETIMES UNCINUS, NOT PROGRESSIVELY INVADING THE SKY
+12 12 CIRRUS SPISSATUS, IN PATCHES OR ENTANGLED SHEAVES, WHICH USUALLY DO NOT INCREASE AND SOMETIMES SEEM TO BE THE REMAINS OF THE UPPER PART OF A CUMULONIMBUS; OR CIRRUS CASTELLANUS OR FLOCCUS
+13 13 CIRRUS SPISSATUS CUMULONIMBOGENITUS
+14 14 CIRRUS UNCINUS OR FIBRATUS, OR BOTH, PROGRESSIVELY INVADING THE SKY; THEY GENERALLY THICKEN AS A WHOLE
+15 15 CIRRUS (OFTEN IN BANDS) AND CIRROSTRATUS, OR CIRROSTRATUS ALONE, PROGRESSIVELY INVADING THE SKY; THEY GENERALLY THICKEN AS A WHOLE, BUT THE CONTINUOUS VEIL DOES NOT REACH 45 DEGREES ABOVE THE HORIZON
+16 16 CIRRUS (OFTEN IN BANDS) AND CIRROSTRATUS, OR CIRROSTRATUS ALONE, PROGRESSIVELY INVADING THE SKY; THEY GENERALLY THICKEN AS A WHOLE; THE CONTINUOUS VEIL EXTENDS MORE THAN 45 DEGREES ABOVE THE HORIZON, WITHOUT THE SKY BEING TOTALLY COVERED
+17 17 CIRROSTRATUS COVERING THE WHOLE SKY
+18 18 CIRROSTRATUS NOT PROGRESSIVELY INVADING THE SKY AND NOT ENTIRELY COVERING IT
+19 19 CIRROCUMULUS ALONE, OR CIRROCUMULUS PREDOMINANT AMONG THE CH CLOUDS
+20 20 NO CM CLOUDS
+21 21 ALTOSTRATUS TRANSLUCIDUS
+22 22 ALTOSTRATUS OPACUS OR NIMBOSTRATUS
+23 23 ALTOCUMULUS TRANSLUCIDUS AT A SINGLE LEVEL
+24 24 PATCHES (OFTEN LENTICULAR) OF ALTOCUMULUS TRANSLUCIDUS, CONTINUALLY CHANGING AND OCCURRING AT ONE OR MORE LEVELS
+25 25 ALTOCUMULUS TRANSLUCIDUS IN BANDS, OR ONE OR MORE LAYERS OF ALTOCUMULUS TRANSLUCIDUS OR OPACUS, PROGRESSIVELY INVADING THE SKY; THESE ALTOCUMULUS CLOUDS GENERALLY THICKEN AS A WHOLE
+26 26 ALTOCUMULUS CUMULOGENITUS (OR CUMULONIMBOGENITUS)
+27 27 ALTOCUMULUS TRANSLUCIDUS OR OPACUS IN TWO OR MORE LAYERS, OR ALTOCUMULUS OPACUS IN A SINGLE LAYER, NOT PROGRESSIVELY INVADING THE SKY, OR ALTOCUMULUS WITH ALTOSTRATUS OR NIMBOSTRATUS
+28 28 ALTOCUMULUS CASTELLANUS OR FLOCCUS
+29 29 ALTOCUMULUS OF A CHAOTIC SKY, GENERALLY AT SEVERAL LEVELS
+30 30 NO CL CLOUDS
+31 31 CUMULUS HUMILIS OR CUMULUS FRACTUS OTHER THAN OF BAD WEATHER, OR BOTH
+32 32 CUMULUS MEDIOCRIS OR CONGESTUS, TOWERING CUMULUS (TCU), WITH OR WITHOUT CUMULUS OF SPECIES FRACTUS OR HUMILIS OR STRATOCUMULUS, ALL HAVING THEIR BASES AT THE SAME LEVEL
+33 33 CUMULONIMBUS CALVUS, WITH OR WITHOUT CUMULUS, STRATOCUMULUS OR STRATUS
+34 34 STRATOCUMULUS CUMULOGENITUS
+35 35 STRATOCUMULUS OTHER THAN STRATOCUMULUS CUMULOGENITUS
+36 36 STRATUS NEBULOSUS OR STRATUS FRACTUS OTHER THAN OF BAD WEATHER, OR BOTH
+37 37 STRATUS FRACTUS OR CUMULUS FRACTUS OF BAD WEATHER, OR BOTH (PANNUS), USUALLY BELOW ALTOSTRATUS OR NIMBOSTRATUS
+38 38 CUMULUS AND STRATOCUMULUS OTHER THAN STRATOCUMULUS CUMULOGENITUS, WITH BASES AT DIFFERENT LEVELS
+39 39 CUMULONIMBUS CAPILLATUS (OFTEN WITH AN ANVIL), WITH OR WITHOUT CUMULONIMBUS CALVUS, CUMULUS, STRATOCUMULUS, STRATUS OR PANNUS
+40 40 CH
+41 41 CM
+42 42 CL
+43 43 CLEAR
+44 44 LIQUID WATER
+45 45 SUPERCOOLED LIQUID WATER
+46 46 MIXED PHASE
+47 47 OPTICALLY THICK ICE
+48 48 OPTICALLY THIN ICE
+49 49 MULTILAYERED ICE
+59 59 CLOUD NOT VISIBLE OWING TO DARKNESS, FOG, DUSTSTORM, SANDSTORM, OR OTHER ANALOGOUS PHENOMENA
+60 60 CH CLOUDS INVISIBLE OWING TO DARKNESS, FOG, BLOWING DUST OR SAND, OR OTHER SIMILAR PHENOMENA, OR BECAUSE OF A CONTINUOUS LAYER OF LOWER CLOUDS
+61 61 CM CLOUDS INVISIBLE OWING TO DARKNESS, FOG, BLOWING DUST OR SAND, OR OTHER SIMILAR PHENOMENA, OR BECAUSE OF CONTINUOUS LAYER OF LOWER CLOUDS
+62 62 CL CLOUDS INVISIBLE OWING TO DARKNESS, FOG, BLOWING DUST OR SAND, OR OTHER SIMILAR PHENOMENA
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20017.table b/definitions/bufr/tables/0/wmo/43/codetables/20017.table
new file mode 100644
index 000000000..5ec10bd41
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20017.table
@@ -0,0 +1,11 @@
+0 0 ISOLATED CLOUD FRAGMENTS OF CLOUDS
+1 1 CONTINUOUS CLOUD
+2 2 BROKEN CLOUD - SMALL BREAKS
+3 3 BROKEN CLOUD - LARGE BREAKS
+4 4 CONTINUOUS CLOUD
+5 5 BROKEN CLOUD - SMALL BREAKS
+6 6 BROKEN CLOUD - LARGE BREAKS
+7 7 CONTINUOUS OR ALMOST CONTINUOUS WAVES WITH TOWERING CLOUDS ABOVE THE TOP OF THE LAYER
+8 8 GROUPS OF WAVES WITH TOWERING CLOUDS ABOVE THE TOP OF THE LAYER
+9 9 TWO OR MORE LAYERS AT DIFFERENT LEVELS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20018.table b/definitions/bufr/tables/0/wmo/43/codetables/20018.table
new file mode 100644
index 000000000..c0ffc3693
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20018.table
@@ -0,0 +1,4 @@
+0 0 INCREASING (U)
+1 1 DECREASING (D)
+2 2 NO DISTINCT CHANGE (N)
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2002.table b/definitions/bufr/tables/0/wmo/43/codetables/2002.table
new file mode 100644
index 000000000..a701e1e40
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2002.table
@@ -0,0 +1,3 @@
+1 1 CERTIFIED INSTRUMENTS
+2 2 ORIGINALLY MEASURED IN KNOTS
+3 3 ORIGINALLY MEASURED IN KM H-1
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20021.table b/definitions/bufr/tables/0/wmo/43/codetables/20021.table
new file mode 100644
index 000000000..747a7591e
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20021.table
@@ -0,0 +1,23 @@
+1 1 PRECIPITATION - UNKNOWN TYPE
+2 2 LIQUID PRECIPITATION NOT FREEZING
+3 3 LIQUID FREEZING PRECIPITATION
+4 4 DRIZZLE
+5 5 RAIN
+6 6 SOLID PRECIPITATION
+7 7 SNOW
+8 8 SNOW GRAINS
+9 9 SNOW PELLETS
+10 10 ICE PELLETS
+11 11 ICE CRYSTALS
+12 12 DIAMOND DUST
+13 13 SMALL HAIL
+14 14 HAIL
+15 15 GLAZE
+16 16 RIME
+17 17 SOFT RIME
+18 18 HARD RIME
+19 19 CLEAR ICE
+20 20 WET SNOW
+21 21 HOAR FROST
+22 22 DEW
+23 23 WHITE DEW
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20022.table b/definitions/bufr/tables/0/wmo/43/codetables/20022.table
new file mode 100644
index 000000000..a551aac0e
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20022.table
@@ -0,0 +1,7 @@
+0 0 NO PRECIPITATION
+1 1 CONTINUOUS
+2 2 INTERMITTENT
+3 3 SHOWER
+4 4 NOT REACHING GROUND
+5 5 DEPOSITION
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20023.table b/definitions/bufr/tables/0/wmo/43/codetables/20023.table
new file mode 100644
index 000000000..97670dfbb
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20023.table
@@ -0,0 +1,14 @@
+1 1 DUST/SAND WHIRL
+2 2 SQUALLS
+3 3 SANDSTORM
+4 4 DUSTSTORM
+5 5 LIGHTNING - CLOUD TO SURFACE
+6 6 LIGHTNING - CLOUD TO CLOUD
+7 7 LIGHTNING - DISTANT
+8 8 THUNDERSTORM
+9 9 FUNNEL CLOUD NOT TOUCHING SURFACE
+10 10 FUNNEL CLOUD TOUCHING SURFACE
+11 11 SPRAY
+12 12 WATERSPOUT
+13 13 WIND SHEAR
+14 14 DUST DEVILS
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20024.table b/definitions/bufr/tables/0/wmo/43/codetables/20024.table
new file mode 100644
index 000000000..13aba873e
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20024.table
@@ -0,0 +1,8 @@
+0 0 NO PHENOMENA
+1 1 LIGHT
+2 2 MODERATE
+3 3 HEAVY
+4 4 VIOLENT
+5 5 SEVERE
+6 6 VERY SEVERE
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20025.table b/definitions/bufr/tables/0/wmo/43/codetables/20025.table
new file mode 100644
index 000000000..4d70e338f
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20025.table
@@ -0,0 +1,13 @@
+1 1 FOG
+2 2 ICE FOG
+3 3 STEAM FOG
+7 7 MIST
+8 8 HAZE
+9 9 SMOKE
+10 10 VOLCANIC ASH
+11 11 DUST
+12 12 SAND
+13 13 SNOW
+14 14 CLOUD
+15 15 PRECIPITATION
+16 16 IMPOSSIBLE TO DETERMINE WHETHER SNOW IS FALLING OR NOT
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20026.table b/definitions/bufr/tables/0/wmo/43/codetables/20026.table
new file mode 100644
index 000000000..285209472
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20026.table
@@ -0,0 +1,16 @@
+0 0 NO CHANGE
+1 1 SHALLOW
+2 2 PATCHES
+3 3 PARTIAL
+4 4 FREEZING
+5 5 LOW DRIFTING
+6 6 BLOWING
+7 7 INCREASING
+8 8 DECREASING
+9 9 IN SUSPENSION IN THE AIR
+10 10 WALL
+11 11 DENSE
+12 12 WHITEOUT
+13 13 DRIFTING AND BLOWING
+14 14 RESERVED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20027.table b/definitions/bufr/tables/0/wmo/43/codetables/20027.table
new file mode 100644
index 000000000..c337f16a7
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20027.table
@@ -0,0 +1,8 @@
+1 1 AT TIME OF OBSERVATION
+2 2 IN PAST HOUR
+3 3 IN TIME PERIOD FOR PAST WEATHER W1W2
+4 4 IN TIME PERIOD SPECIFIED
+5 5 RESERVED
+6 6 BELOW STATION LEVEL
+7 7 AT THE STATION
+8 8 IN THE VICINITY
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20028.table b/definitions/bufr/tables/0/wmo/43/codetables/20028.table
new file mode 100644
index 000000000..6b701a2b6
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20028.table
@@ -0,0 +1,4 @@
+0 0 NO CHANGE (NC)
+1 1 FORECAST TO WEAKEN (WKN)
+2 2 FORECAST TO INTENSIFY (INTSF)
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20029.table b/definitions/bufr/tables/0/wmo/43/codetables/20029.table
new file mode 100644
index 000000000..8b46da891
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20029.table
@@ -0,0 +1,4 @@
+0 0 NO RAIN
+1 1 RAIN
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2003.table b/definitions/bufr/tables/0/wmo/43/codetables/2003.table
new file mode 100644
index 000000000..f364d1811
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2003.table
@@ -0,0 +1,13 @@
+0 0 PRESSURE INSTRUMENT ASSOCIATED WITH WIND MEASURING EQUIPMENT
+1 1 OPTICAL THEODOLITE
+2 2 RADIO THEODOLITE
+3 3 RADAR
+4 4 VLF-OMEGA
+5 5 LORAN C
+6 6 WIND PROFILER
+7 7 SATELLITE NAVIGATION
+8 8 RADIO-ACOUSTIC SOUNDING SYSTEM (RASS)
+9 9 SODAR
+10 10 LIDAR
+14 14 PRESSURE INSTRUMENT ASSOCIATED WITH WIND MEASURING EQUIPMENT BUT PRESSURE ELEMENT FAILED DURING ASCENT
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20032.table b/definitions/bufr/tables/0/wmo/43/codetables/20032.table
new file mode 100644
index 000000000..fd37c1e76
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20032.table
@@ -0,0 +1,6 @@
+0 0 ICE NOT BUILDING UP
+1 1 ICE BUILDING UP SLOWLY
+2 2 ICE BUILDING UP RAPIDLY
+3 3 ICE MELTING OR BREAKING UP SLOWLY
+4 4 ICE MELTING OR BREAKING UP RAPIDLY
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20033.table b/definitions/bufr/tables/0/wmo/43/codetables/20033.table
new file mode 100644
index 000000000..817873323
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20033.table
@@ -0,0 +1,3 @@
+1 1 ICING FROM OCEAN SPRAY
+2 2 ICING FROM FOG
+3 3 ICING FROM RAIN
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20034.table b/definitions/bufr/tables/0/wmo/43/codetables/20034.table
new file mode 100644
index 000000000..668e91671
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20034.table
@@ -0,0 +1,12 @@
+0 0 NO SEA ICE IN SIGHT
+1 1 SHIP IN OPEN LEAD MORE THAN 1.0 NAUTICAL MILE WIDE, OR SHIP IN FAST ICE WITH BOUNDARY BEYOND LIMIT OF VISIBILITY
+2 2 SEA ICE PRESENT IN CONCENTRATIONS LESS THAN 3/10 (3/8), OPEN WATER OR VERY OPEN PACK ICE
+3 3 4/10 TO 6/10 (3/8 TO LESS THAN 6/8), OPEN PACK ICE
+4 4 7/10 TO 8/10 (6/8 TO LESS THAN 7/8), CLOSE PACK ICE
+5 5 9/10 OR MORE, BUT NOT 10/10 (7/8 TO LESS THAN 8/8), VERY CLOSE PACK ICE
+6 6 STRIPS AND PATCHES OF PACK ICE WITH OPEN WATER BETWEEN
+7 7 STRIPS AND PATCHES OF CLOSE OR VERY CLOSE PACK ICE WITH AREAS OF LESSER CONCENTRATION BETWEEN
+8 8 FAST ICE WITH OPEN WATER, VERY OPEN OR OPEN PACK ICE TO SEAWARD OF THE ICE BOUNDARY
+9 9 FAST ICE WITH CLOSE OR VERY CLOSE PACK ICE TO SEAWARD OF THE BOUNDARY
+14 14 UNABLE TO REPORT, BECAUSE OF DARKNESS, LACK OF VISIBILITY, OR BECAUSE SHIP IS MORE THAN 0.5 NAUTICAL MILE AWAY FROM ICE EDGE
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20035.table b/definitions/bufr/tables/0/wmo/43/codetables/20035.table
new file mode 100644
index 000000000..07a4a0284
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20035.table
@@ -0,0 +1,12 @@
+0 0 NO ICE OF LAND ORIGIN
+1 1 1-5 ICEBERGS, NO GROWLERS OR BERGY BITS
+2 2 6-10 ICEBERGS, NO GROWLERS OR BERGY BITS
+3 3 11-20 ICEBERGS, NO GROWLERS OR BERGY BITS
+4 4 UP TO AND INCLUDING 10 GROWLERS AND BERGY BITS - NO ICEBERGS
+5 5 MORE THAN 10 GROWLERS AND BERGY BITS - NO ICEBERGS
+6 6 1-5 ICEBERGS, WITH GROWLERS AND BERGY BITS
+7 7 6-10 ICEBERGS, WITH GROWLERS AND BERGY BITS
+8 8 11-20 ICEBERGS, WITH GROWLERS AND BERGY BITS
+9 9 MORE THAN 20 ICEBERGS, WITH GROWLERS AND BERGY BITS - A MAJOR HAZARD TO NAVIGATION
+14 14 UNABLE TO REPORT, BECAUSE OF DARKNESS, LACK OF VISIBILITY OR BECAUSE ONLY SEA ICE IS VISIBLE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20036.table b/definitions/bufr/tables/0/wmo/43/codetables/20036.table
new file mode 100644
index 000000000..b4cc874bd
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20036.table
@@ -0,0 +1,12 @@
+0 0 SHIP IN OPEN WATER WITH FLOATING ICE IN SIGHT
+1 1 SHIP IN EASILY PENETRABLE ICE; CONDITIONS IMPROVING
+2 2 SHIP IN EASILY PENETRABLE ICE; CONDITIONS NOT CHANGING
+3 3 SHIP IN EASILY PENETRABLE ICE; CONDITIONS WORSENING
+4 4 SHIP IN ICE DIFFICULT TO PENETRATE; CONDITIONS IMPROVING
+5 5 SHIP IN ICE DIFFICULT TO PENETRATE; CONDITIONS NOT CHANGING
+6 6 SHIP IN ICE DIFFICULT TO PENETRATE AND CONDITIONS WORSENING. ICE FORMING AND FLOES FREEZING TOGETHER
+7 7 SHIP IN ICE DIFFICULT TO PENETRATE AND CONDITIONS WORSENING. ICE UNDER SLIGHT PRESSURE
+8 8 SHIP IN ICE DIFFICULT TO PENETRATE AND CONDITIONS WORSENING. ICE UNDER MODERATE OR SEVERE PRESSURE
+9 9 SHIP IN ICE DIFFICULT TO PENETRATE AND CONDITIONS WORSENING. SHIP BESET
+30 30 UNABLE TO REPORT, BECAUSE OF DARKNESS OR LACK OF VISIBILITY
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20037.table b/definitions/bufr/tables/0/wmo/43/codetables/20037.table
new file mode 100644
index 000000000..474eeaae2
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20037.table
@@ -0,0 +1,12 @@
+0 0 NEW ICE ONLY (FRAZIL ICE, GREASE ICE, SLUSH, SHUGA)
+1 1 NILAS OR ICE RIND, LESS THAN 10 CM THICK
+2 2 YOUNG ICE (GREY ICE, GREY-WHITE ICE), 10-30 CM THICK
+3 3 PREDOMINANTLY NEW AND/OR YOUNG ICE WITH SOME FIRST-YEAR ICE
+4 4 PREDOMINANTLY THIN FIRST-YEAR ICE WITH SOME NEW AND/OR YOUNG ICE
+5 5 ALL THIN FIRST-YEAR ICE (30-70 CM THICK)
+6 6 PREDOMINANTLY MEDIUM FIRST-YEAR ICE (70-120 CM THICK) AND THICK FIRST-YEAR ICE (>120 CM THICK) WITH SOME THINNER (YOUNGER) FIRST-YEAR ICE
+7 7 ALL MEDIUM AND THICK FIRST-YEAR ICE
+8 8 PREDOMINANTLY MEDIUM AND THICK FIRST-YEAR ICE WITH SOME OLD ICE (USUALLY MORE THAN 2 METRES THICK)
+9 9 PREDOMINANTLY OLD ICE
+30 30 UNABLE TO REPORT, BECAUSE OF DARKNESS, LACK OF VISIBILITY OR BECAUSE ONLY ICE OF LAND ORIGIN IS VISIBLE OR BECAUSE SHIP IS MORE THAN 0.5 NAUTICAL MILE AWAY FROM ICE EDGE
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2004.table b/definitions/bufr/tables/0/wmo/43/codetables/2004.table
new file mode 100644
index 000000000..a55de6c58
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2004.table
@@ -0,0 +1,11 @@
+0 0 USA OPEN PAN EVAPORIMETER (WITHOUT COVER)
+1 1 USA OPEN PAN EVAPORIMETER (MESH COVERED)
+2 2 GGI-3000 EVAPORIMETER (SUNKEN)
+3 3 20 M2 TANK
+4 4 OTHERS
+5 5 RICE
+6 6 WHEAT
+7 7 MAIZE
+8 8 SORGHUM
+9 9 OTHER CROPS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20040.table b/definitions/bufr/tables/0/wmo/43/codetables/20040.table
new file mode 100644
index 000000000..889393bf8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20040.table
@@ -0,0 +1,9 @@
+0 0 DRIFT SNOW ENDED BEFORE THE HOUR OF OBSERVATION
+1 1 INTENSITY DIMINISHING
+2 2 NO CHANGE
+3 3 INTENSITY INCREASING
+4 4 CONTINUES, APART FROM INTERRUPTION LASTING LESS THAN 30 MINUTES
+5 5 GENERAL DRIFT SNOW HAS BECOME DRIFT SNOW NEAR THE GROUND
+6 6 DRIFT SNOW NEAR THE GROUND HAS BECOME GENERAL DRIFT SNOW
+7 7 DRIFT SNOW HAS STARTED AGAIN AFTER AN INTERRUPTION OF MORE THAN 30 MINUTES
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20041.table b/definitions/bufr/tables/0/wmo/43/codetables/20041.table
new file mode 100644
index 000000000..fc571208d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20041.table
@@ -0,0 +1,14 @@
+0 0 NO ICING
+1 1 LIGHT ICING
+2 2 LIGHT ICING IN CLOUD
+3 3 LIGHT ICING IN PRECIPITATION
+4 4 MODERATE ICING
+5 5 MODERATE ICING IN CLOUD
+6 6 MODERATE ICING IN PRECIPITATION
+7 7 SEVERE ICING
+8 8 SEVERE ICING IN CLOUD
+9 9 SEVERE ICING IN PRECIPITATION
+10 10 TRACE OF ICING
+11 11 TRACE OF ICING IN CLOUD
+12 12 TRACE OF ICING IN PRECIPITATION
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20042.table b/definitions/bufr/tables/0/wmo/43/codetables/20042.table
new file mode 100644
index 000000000..2493af725
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20042.table
@@ -0,0 +1,4 @@
+0 0 NO ICING
+1 1 ICING PRESENT
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20045.table b/definitions/bufr/tables/0/wmo/43/codetables/20045.table
new file mode 100644
index 000000000..91ae63f48
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20045.table
@@ -0,0 +1,4 @@
+0 0 NO SLD CONDITIONS PRESENT
+1 1 SLD CONDITIONS PRESENT
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20048.table b/definitions/bufr/tables/0/wmo/43/codetables/20048.table
new file mode 100644
index 000000000..4a5488266
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20048.table
@@ -0,0 +1,5 @@
+0 0 STABILITY
+1 1 DIMINUTION
+2 2 INTENSIFICATION
+3 3 UNKNOWN
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20050.table b/definitions/bufr/tables/0/wmo/43/codetables/20050.table
new file mode 100644
index 000000000..3f8654ed5
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20050.table
@@ -0,0 +1,10 @@
+0 0 RESERVED
+1 1 1ST LOW CLOUD
+2 2 2ND LOW CLOUD
+3 3 3RD LOW CLOUD
+4 4 1ST MEDIUM CLOUD
+5 5 2ND MEDIUM CLOUD
+6 6 3RD MEDIUM CLOUD
+7 7 1ST HIGH CLOUD
+8 8 2ND HIGH CLOUD
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20055.table b/definitions/bufr/tables/0/wmo/43/codetables/20055.table
new file mode 100644
index 000000000..ea06427f6
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20055.table
@@ -0,0 +1,12 @@
+0 0 CUMULUS, IF ANY, ARE QUITE SMALL; GENERALLY LESS THAN 2/8 COVERAGE, EXCEPT ON WINDWARD SLOPES OF ELEVATED TERRAIN; AVERAGE WIDTH OF CLOUD IS AT LEAST AS GREAT AS ITS VERTICAL THICKNESS
+1 1 CUMULUS OF INTERMEDIATE SIZE WITH CLOUD COVER LESS THAN 5/8; AVERAGE CLOUD WIDTH IS MORE THAN ITS VERTICAL THICKNESS; TOWERS ARE VERTICAL WITH LITTLE OR NO EVIDENCE OF PRECIPITATION, EXCEPT ALONG SLOPES OF ELEVATED TERRAIN; A GENERAL ABSENCE OF MIDDLE AND UPPER CLOUDS
+2 2 SWELLING CUMULUS WITH RAPIDLY GROWING TALL TURRETS WHICH DECREASE IN SIZE WITH HEIGHT AND WHOSE TOPS TEND TO SEPARATE FROM THE LONGER CLOUD BODY AND EVAPORATE WITHIN MINUTES OF THE SEPARATION
+3 3 SWELLING CUMULUS WITH TOWERS HAVING A PRONOUNCED TILT IN A DOWNWIND DIRECTION; VERTICAL CLOUD THICKNESS IS MORE THAN ONE AND A HALF TIMES THAT OF ITS AVERAGE WIDTH
+4 4 SWELLING CUMULUS WITH TOWERS HAVING A PRONOUNCED TILT IN AN UPWIND DIRECTION; VERTICAL CLOUD THICKNESS IS MORE THAN ONE AND A HALF TIMES THAT OF ITS AVERAGE WIDTH
+5 5 TALL CUMULUS CONGESTUS WITH VERTICAL THICKNESS MORE THAN TWICE THE AVERAGE WIDTH; NOT ORGANIZED IN CLUSTERS OR LINES; ONE OR MORE LAYERS OF CLOUDS EXTEND OUT FROM THE CLOUD TOWERS, ALTHOUGH NO CONTINUOUS CLOUD LAYERS EXIST
+6 6 ISOLATED CUMULONIMBUS OR LARGE CLUSTERS OF CUMULUS TURRETS SEPARATED BY WIDE AREAS IN WHICH CLOUDS ARE ABSENT; CLOUD BASES ARE GENERALLY DARK WITH SHOWERS OBSERVED IN MOST CELLS; SOME SCATTERED MIDDLE AND UPPER CLOUDS MAY BE PRESENT; INDIVIDUAL CUMULUS CELLS ARE ONE TO TWO TIMES HIGHER THAN THEY ARE WIDE
+7 7 NUMEROUS CUMULUS EXTENDING THROUGH THE MIDDLE TROPOSPHERE WITH BROKEN TO OVERCAST SHEETS OF MIDDLE CLOUDS AND/OR CIRROSTRATUS; CUMULUS TOWERS DO NOT DECREASE GENERALLY IN SIZE WITH HEIGHT; RAGGED DARK CLOUD BASES WITH SOME SHOWERS PRESENT
+8 8 CONTINUOUS DENSE MIDDLE CLOUDS AND/OR CIRROSTRATUS CLOUD SHEETS WITH SOME LARGE ISOLATED CUMULONIMBUS OR CUMULUS CONGESTUS CLOUDS PENETRATING THESE SHEETS; LIGHT RAIN OCCASIONALLY OBSERVED FROM THE ALTOSTRATUS; CUMULONIMBUS BASES RAGGED AND DARK WITH SHOWERS VISIBLE
+9 9 CONTINUOUS SHEETS OF MIDDLE CLOUDS AND/OR CIRROSTRATUS WITH CUMULONIMBUS AND CUMULUS CONGESTUS IN ORGANIZED LINES OR CLOUD BANDS; RAIN IS GENERALLY OBSERVED FROM ALTOSTRATUS SHEETS AND HEAVY SHOWERS FROM CUMULONIMBUS; WIND HAS A SQUALLY CHARACTER
+10 10 STATE OF SKY UNKNOWN OR NOT DESCRIBED BY ANY OF THE ABOVE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20056.table b/definitions/bufr/tables/0/wmo/43/codetables/20056.table
new file mode 100644
index 000000000..204b220b8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20056.table
@@ -0,0 +1,8 @@
+0 0 UNKNOWN
+1 1 WATER
+2 2 ICE
+3 3 MIXED
+4 4 CLEAR
+5 5 SUPERCOOLED LIQUID WATER
+6 6 RESERVED
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2006.table b/definitions/bufr/tables/0/wmo/43/codetables/2006.table
new file mode 100644
index 000000000..e32bac3d7
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2006.table
@@ -0,0 +1,11 @@
+0 0 RESERVED
+1 1 ELASTIC BACKSCATTER LIDAR
+2 2 RAMAN BACKSCATTER LIDAR
+3 3 RADAR WIND PROFILER
+4 4 LIDAR WIND PROFILER
+5 5 SODAR WIND PROFILER
+6 6 WIND PROFILER
+7 7 LIDAR
+8 8 GROUND-BASED MICROWAVE RADIOMETER
+9 9 DIFFERENTIAL ABSORPTION LIDAR
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20062.table b/definitions/bufr/tables/0/wmo/43/codetables/20062.table
new file mode 100644
index 000000000..24d96c46f
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20062.table
@@ -0,0 +1,21 @@
+0 0 SURFACE OF GROUND DRY (WITHOUT CRACKS AND NO APPRECIABLE AMOUNT OF DUST OR LOOSE SAND)
+1 1 SURFACE OF GROUND MOIST
+2 2 SURFACE OF GROUND WET (STANDING WATER IN SMALL OR LARGE POOLS ON SURFACE)
+3 3 FLOODED
+4 4 SURFACE OF GROUND FROZEN
+5 5 GLAZE ON GROUND
+6 6 LOOSE DRY DUST OR SAND NOT COVERING GROUND COMPLETELY
+7 7 THIN COVER OF LOOSE DRY DUST OR SAND COVERING GROUND COMPLETELY
+8 8 MODERATE OR THICK COVER OF LOOSE DRY DUST OR SAND COVERING GROUND COMPLETELY
+9 9 EXTREMELY DRY WITH CRACKS
+10 10 GROUND PREDOMINANTLY COVERED BY ICE
+11 11 COMPACT OR WET SNOW (WITH OR WITHOUT ICE) COVERING LESS THAN ONE HALF OF THE GROUND
+12 12 COMPACT OR WET SNOW (WITH OR WITHOUT ICE) COVERING AT LEAST ONE HALF OF THE GROUND BUT GROUND NOT COMPLETELY COVERED
+13 13 EVEN LAYER OF COMPACT OR WET SNOW COVERING GROUND COMPLETELY
+14 14 UNEVEN LAYER OF COMPACT OR WET SNOW COVERING GROUND COMPLETELY
+15 15 LOOSE DRY SNOW COVERING LESS THAN ONE HALF OF THE GROUND
+16 16 LOOSE DRY SNOW COVERING AT LEAST ONE HALF OF THE GROUND BUT GROUND NOT COMPLETELY COVERED
+17 17 EVEN LAYER OF LOOSE DRY SNOW COVERING GROUND COMPLETELY
+18 18 UNEVEN LAYER OF LOOSE DRY SNOW COVERING GROUND COMPLETELY
+19 19 SNOW COVERING GROUND COMPLETELY; DEEP DRIFTS
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20063.table b/definitions/bufr/tables/0/wmo/43/codetables/20063.table
new file mode 100644
index 000000000..d1622860b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20063.table
@@ -0,0 +1,72 @@
+0 0 RESERVED
+1 1 HIGHEST WIND SPEED GUSTS GREATER THAN 11.5 M/S
+2 2 HIGHEST MEAN WIND SPEED GREATER THAN 17.5 M/S
+7 7 VISIBILITY GREATER THAN 100 000 M
+10 10 MIRAGE - NO SPECIFICATION
+11 11 MIRAGE - IMAGE OF DISTANT OBJECT RAISED (LOOMING)
+12 12 MIRAGE - IMAGE OF DISTANT OBJECT RAISED CLEAR ABOVE THE HORIZON
+13 13 MIRAGE - INVERTED IMAGE OF DISTANT OBJECT
+14 14 MIRAGE - COMPLEX, MULTIPLE IMAGES OF DISTANT OBJECT (IMAGES NOT INVERTED)
+15 15 MIRAGE - COMPLEX, MULTIPLE IMAGES OF DISTANT OBJECT (SOME IMAGES BEING INVERTED)
+16 16 MIRAGE - SUN OR MOON SEEN APPRECIABLY DISTORTED
+17 17 MIRAGE - SUN VISIBLE, ALTHOUGH ASTRONOMICALLY BELOW THE HORIZON
+18 18 MIRAGE - MOON VISIBLE, ALTHOUGH ASTRONOMICALLY BELOW THE HORIZON
+19 19 RESERVED
+20 20 DAY DARKNESS, BAD, WORST IN DIRECTION SPECIFIED
+21 21 DAY DARKNESS, VERY BAD, WORST IN DIRECTION SPECIFIED
+22 22 DAY DARKNESS, BLACK, WORST IN DIRECTION SPECIFIED
+31 31 SLIGHT COLORATION OF CLOUDS AT SUNRISE ASSOCIATED WITH A TROPICAL DISTURBANCE
+32 32 DEEP-RED COLORATION OF CLOUDS AT SUNRISE ASSOCIATED WITH A TROPICAL DISTURBANCE
+33 33 SLIGHT COLORATION OF CLOUDS AT SUNSET ASSOCIATED WITH A TROPICAL DISTURBANCE
+34 34 DEEP-RED COLORATION OF CLOUDS AT SUNSET ASSOCIATED WITH A TROPICAL DISTURBANCE
+35 35 CONVERGENCE OF CH CLOUDS AT A POINT BELOW 45 DEG FORMING OR INCREASING AND ASSOCIATED WITH A TROPICAL DISTURBANCE
+36 36 CONVERGENCE OF CH CLOUDS AT A POINT ABOVE 45 DEG FORMING OR INCREASING AND ASSOCIATED WITH A TROPICAL DISTURBANCE
+37 37 CONVERGENCE OF CH CLOUDS AT A POINT BELOW 45 DEG DISSOLVING OR DIMINISHING AND ASSOCIATED WITH A TROPICAL DISTURBANCE
+38 38 CONVERGENCE OF CH CLOUDS AT A POINT ABOVE 45 DEG DISSOLVING OR DIMINISHING AND ASSOCIATED WITH A TROPICAL DISTURBANCE
+39 39 RESERVED
+40 40 HOAR FROST ON HORIZONTAL SURFACES
+41 41 HOAR FROST ON HORIZONTAL AND VERTICAL SURFACES
+42 42 PRECIPITATION CONTAINING SAND OR DESERT DUST
+43 43 PRECIPITATION CONTAINING VOLCANIC ASH
+50 50 CALM OR LIGHT WIND FOLLOWED BY A SQUALL
+51 51 CALM OR LIGHT WIND FOLLOWED BY A SUCCESSION OF SQUALLS
+52 52 GUSTY WEATHER FOLLOWED BY A SQUALL
+53 53 GUSTY WEATHER FOLLOWED BY A SUCCESSION OF SQUALLS
+54 54 SQUALL FOLLOWED BY GUSTY WEATHER
+55 55 GENERAL GUSTY WEATHER WITH SQUALL AT INTERVALS
+56 56 SQUALL APPROACHING STATION
+57 57 LINE SQUALL
+58 58 SQUALL WITH DRIFTING OR BLOWING DUST OR SAND
+59 59 LINE SQUALL WITH DRIFTING OR BLOWING DUST OR SAND
+60 60 TEMPERATURE STEADY
+61 61 TEMPERATURE FALLING, WITHOUT GOING BELOW 0 DEG C
+62 62 TEMPERATURE RISING, WITHOUT GOING ABOVE 0 DEG C
+63 63 TEMPERATURE FALLING TO A VALUE BELOW 0 DEG C
+64 64 TEMPERATURE RISING TO A VALUE ABOVE 0 DEG C
+65 65 IRREGULAR VARIATION, OSCILLATIONS OF TEMPERATURE PASSING THROUGH 0 DEG C
+66 66 IRREGULAR VARIATION, OSCILLATIONS OF TEMPERATURE NOT PASSING THROUGH 0 DEG C
+67 67 VARIATION OF TEMPERATURE NOT OBSERVED
+68 68 NOT ALLOCATED
+69 69 VARIATION OF TEMPERATURE UNKNOWN OWING TO LACK OF THERMOGRAPH
+70 70 VISIBILITY HAS NOT VARIED (SUN VISIBLE) TOWARDS DIRECTION SPECIFIED
+71 71 VISIBILITY HAS NOT VARIED (SUN INVISIBLE) TOWARDS DIRECTION SPECIFIED
+72 72 VISIBILITY HAS INCREASED (SUN VISIBLE) TOWARDS DIRECTION SPECIFIED
+73 73 VISIBILITY HAS INCREASED (SUN INVISIBLE) TOWARDS DIRECTION SPECIFIED
+74 74 VISIBILITY HAS DECREASED (SUN VISIBLE) TOWARDS DIRECTION SPECIFIED
+75 75 VISIBILITY HAS DECREASED (SUN INVISIBLE) TOWARDS DIRECTION SPECIFIED
+76 76 FOG COMING FROM DIRECTION SPECIFIED
+77 77 FOG HAS LIFTED, WITHOUT DISSIPATING
+78 78 FOG HAS DISPERSED WITHOUT REGARD TO DIRECTION
+79 79 MOVING PATCHES OR BANKS OF FOG
+80 80 BROCKEN SPECTRE
+81 81 RAINBOW
+82 82 SOLAR OR LUNAR HALO
+83 83 PARHELIA OR ANTHELIA
+84 84 SUN PILLAR
+85 85 CORONA
+86 86 TWILIGHT GLOW
+87 87 TWILIGHT GLOW ON THE MOUNTAINS (ALPENGLUEHEN)
+88 88 MIRAGE
+89 89 ZODIACAL LIGHT
+90 90 ST ELMO'S FIRE
+1023 1023 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2007.table b/definitions/bufr/tables/0/wmo/43/codetables/2007.table
new file mode 100644
index 000000000..05b4c6bd1
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2007.table
@@ -0,0 +1,11 @@
+0 0 RESERVED
+1 1 SHAFT ENCODER FLOAT SYSTEM
+2 2 ULTRASONIC
+3 3 RADAR
+4 4 PRESSURE (SINGLE TRANSDUCER)
+5 5 PRESSURE (MULTIPLE TRANSDUCER)
+6 6 PRESSURE (IN STILLING WELL)
+7 7 BUBBLER PRESSURE
+8 8 ACOUSTIC (WITH SOUNDING TUBE)
+9 9 ACOUSTIC (IN OPEN AIR)
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20071.table b/definitions/bufr/tables/0/wmo/43/codetables/20071.table
new file mode 100644
index 000000000..72367bf8b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20071.table
@@ -0,0 +1,11 @@
+0 0 NO ASSESSMENT
+1 1 LESS THAN 50 KM
+2 2 BETWEEN 50 AND 200 KM
+3 3 MORE THAN 200 KM
+4 4 LESS THAN 50 KM
+5 5 BETWEEN 50 AND 200 KM
+6 6 MORE THAN 200 KM
+7 7 LESS THAN 50 KM
+8 8 BETWEEN 50 AND 200 KM
+9 9 MORE THAN 200 KM
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20079.table b/definitions/bufr/tables/0/wmo/43/codetables/20079.table
new file mode 100644
index 000000000..587408276
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20079.table
@@ -0,0 +1,4 @@
+0 0 NO SNOW OR ICE
+1 1 SNOW PRESENT
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2008.table b/definitions/bufr/tables/0/wmo/43/codetables/2008.table
new file mode 100644
index 000000000..e669727ec
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2008.table
@@ -0,0 +1,7 @@
+0 0 FIXED PLATFORM
+1 1 MOBILE OFFSHORE DRILL SHIP
+2 2 JACK-UP RIG
+3 3 SEMI-SUBMERSIBLE PLATFORM
+4 4 FLOATING PRODUCTION STORAGE AND OFFLOADING (FPSO) UNIT
+5 5 LIGHT VESSEL
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20085.table b/definitions/bufr/tables/0/wmo/43/codetables/20085.table
new file mode 100644
index 000000000..f929e878d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20085.table
@@ -0,0 +1,3 @@
+0 0 CLEARED (CLRD//)
+1 1 ALL RUNWAYS CLOSED (SNOCLO)
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20086.table b/definitions/bufr/tables/0/wmo/43/codetables/20086.table
new file mode 100644
index 000000000..b5433303a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20086.table
@@ -0,0 +1,11 @@
+0 0 CLEAR AND DRY
+1 1 DAMP
+2 2 WET WITH WATER PATCHES
+3 3 RIME AND FROST COVERED (DEPTH NORMALLY LESS THAN 1 MM)
+4 4 DRY SNOW
+5 5 WET SNOW
+6 6 SLUSH
+7 7 ICE
+8 8 COMPACTED OR ROLLED SNOW
+9 9 FROZEN RUTS OR RIDGES
+15 15 MISSING OR NOT REPORTED (E.G. DUE TO RUNWAY CLEARANCE IN PROGRESS)
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20087.table b/definitions/bufr/tables/0/wmo/43/codetables/20087.table
new file mode 100644
index 000000000..ee7971ab6
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20087.table
@@ -0,0 +1,6 @@
+0 0 RESERVED
+1 1 LESS THAN 10% OF RUNWAY COVERED
+2 2 11% TO 25% OF RUNWAY COVERED
+5 5 26% TO 50% OF RUNWAY COVERED
+9 9 51% TO 100% OF RUNWAY COVERED
+15 15 MISSING OR NOT REPORTED (E.G. DUE TO RUNWAY CLEARANCE IN PROGRESS)
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20089.table b/definitions/bufr/tables/0/wmo/43/codetables/20089.table
new file mode 100644
index 000000000..f616c622c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20089.table
@@ -0,0 +1,11 @@
+0 0 0.00
+1 1 0.01
+89 89 0.89
+90 90 0.90
+91 91 BRAKING ACTION POOR
+92 92 BRAKING ACTION MEDIUM TO POOR
+93 93 BRAKING ACTION MEDIUM
+94 94 BRAKING ACTION MEDIUM TO GOOD
+95 95 BRAKING ACTION GOOD
+99 99 UNRELIABLE
+127 127 MISSING, NOT REPORTED AND/OR RUNWAY NOT OPERATIONAL
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2009.table b/definitions/bufr/tables/0/wmo/43/codetables/2009.table
new file mode 100644
index 000000000..8d694b308
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2009.table
@@ -0,0 +1,4 @@
+0 0 LAND CORRECTED REFLECTANCES
+1 1 OCEAN BEST SOLUTION
+2 2 OCEAN AVERAGE SOLUTION
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20090.table b/definitions/bufr/tables/0/wmo/43/codetables/20090.table
new file mode 100644
index 000000000..d13502ec4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20090.table
@@ -0,0 +1,7 @@
+0 0 RESERVED
+1 1 NACREOUS CLOUDS
+2 2 NOCTILUCENT CLOUDS
+3 3 CLOUDS FROM WATERFALLS
+4 4 CLOUDS FROM FIRES
+5 5 CLOUDS FROM VOLCANIC ERUPTIONS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20101.table b/definitions/bufr/tables/0/wmo/43/codetables/20101.table
new file mode 100644
index 000000000..abe89f5fe
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20101.table
@@ -0,0 +1,11 @@
+0 0 RESERVED
+1 1 SCHISTOCERCA GREGARIA
+2 2 LOCUSTA MIGRATORIA
+3 3 NOMADACRIS SEPTEMFASCIATA
+4 4 OEDALEUS SENEGALENSIS
+5 5 ANRACRIDIUM SPP
+6 6 OTHER LOCUSTS
+7 7 OTHER GRASSHOPPERS
+8 8 OTHER CRICKETS
+9 9 SPODOPTERA EXEMPTA
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20102.table b/definitions/bufr/tables/0/wmo/43/codetables/20102.table
new file mode 100644
index 000000000..6a53039e9
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20102.table
@@ -0,0 +1,11 @@
+0 0 GREEN
+1 1 GREEN OR BLACK
+2 2 BLACK
+3 3 YELLOW AND BLACK
+4 4 STRAW/GREY
+5 5 PINK
+6 6 DARK RED/BROWN
+7 7 MIXED RED AND YELLOW
+8 8 YELLOW
+9 9 OTHER
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20103.table b/definitions/bufr/tables/0/wmo/43/codetables/20103.table
new file mode 100644
index 000000000..9c4f68920
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20103.table
@@ -0,0 +1,11 @@
+0 0 HOPPERS (NYMPHS, LARVAE), STAGE 1
+1 1 HOPPERS (NYMPHS, LARVAE), STAGE 2 OR MIXED 1, 2 INSTARS (STAGES)
+2 2 HOPPERS (NYMPHS, LARVAE), STAGE 3 OR MIXED 2, 3 INSTARS
+3 3 HOPPERS (NYMPHS, LARVAE), STAGE 4 OR MIXED 3, 4 INSTARS
+4 4 HOPPERS (NYMPHS, LARVAE), STAGE 5 OR MIXED 4, 5 INSTARS
+5 5 HOPPERS (NYMPHS, LARVAE), STAGE MIXED, ALL OR MANY INSTARS
+6 6 FLEDGLINGS (WINGS TOO SOFT FOR SUSTAINED FLIGHT)
+7 7 IMMATURE ADULTS
+8 8 MIXED MATURITY ADULTS
+9 9 MATURE ADULTS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20104.table b/definitions/bufr/tables/0/wmo/43/codetables/20104.table
new file mode 100644
index 000000000..15ca8acd4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20104.table
@@ -0,0 +1,11 @@
+0 0 HOPPERS ONLY, MAINLY IN BANDS OR CLUSTERS
+1 1 WINGED ADULTS IN THE VICINITY MORE THAN 10 KILOMETRES FROM POINT OF OBSERVATION
+2 2 LOCUSTS IN FLIGHT, A FEW SEEN AT THE STATION
+3 3 LOCUSTS AT THE STATION, MOST OF THEM ON THE GROUND
+4 4 LOCUSTS, SOME ON GROUND AND OTHERS IN FLIGHT AT A HEIGHT LESS THAN 10 METRES
+5 5 LOCUSTS, SOME ON GROUND AND OTHERS IN FLIGHT AT A HEIGHT GREATER THAN 10 METRES
+6 6 LOCUSTS, MOST IN FLIGHT AT A HEIGHT LESS THAN 10 METRES
+7 7 LOCUSTS, MOST IN FLIGHT AT A HEIGHT GREATER THAN 10 METRES
+8 8 LOCUSTS, ALL OVER INFLICTING SEVERE DAMAGE TO VEGETATION, NO EXTERMINATION OPERATION
+9 9 LOCUSTS, ALL OVER INFLICTING SEVERE DAMAGE TO VEGETATION, EXTERMINATION OPERATION IN PROGRESS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20105.table b/definitions/bufr/tables/0/wmo/43/codetables/20105.table
new file mode 100644
index 000000000..b7406c09c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20105.table
@@ -0,0 +1,12 @@
+0 0 SMALL SWARM LESS THAN 1 KM2 OR ADULTS IN GROUND, TENS OR HUNDREDS OF INDIVIDUALS VISIBLE SIMULTANEOUSLY, DURATION OF PASSAGE LESS THAN 1 HOUR AGO
+1 1 SMALL SWARM LESS THAN 1 KM2 OR ADULTS IN GROUND, TENS OR HUNDREDS OF INDIVIDUALS VISIBLE SIMULTANEOUSLY, DURATION OF PASSAGE 1 TO 6 HOURS AGO
+2 2 SMALL SWARM LESS THAN 1 KM2 OR ADULTS IN GROUND, TENS OR HUNDREDS OF INDIVIDUALS VISIBLE SIMULTANEOUSLY, DURATION OF PASSAGE OVER 6 HOURS AGO
+3 3 MEDIUM SWARM OR SCATTERED ADULTS, SEVERAL VISIBLE SIMULTANEOUSLY, DURATION OF PASSAGE LESS THAN 1 HOUR AGO
+4 4 MEDIUM SWARM OR SCATTERED ADULTS, SEVERAL VISIBLE SIMULTANEOUSLY, DURATION OF PASSAGE 1 TO 6 HOURS AGO
+5 5 MEDIUM SWARM OR SCATTERED ADULTS, SEVERAL VISIBLE SIMULTANEOUSLY, DURATION OF PASSAGE OVER 6 HOURS AGO
+6 6 LARGE SWARM OR ISOLATED ADULTS, SEEN SINGLY, DURATION OF PASSAGE LESS THAN 1 HOUR AGO
+7 7 LARGE SWARM OR ISOLATED ADULTS, SEEN SINGLY, DURATION OF PASSAGE 1 TO 6 HOURS AGO
+8 8 LARGE SWARM OR ISOLATED ADULTS, SEEN SINGLY, DURATION OF PASSAGE OVER 6 HOURS AGO
+9 9 MORE THAN ONE SWARM OF LOCUSTS
+10 10 SIZE OF SWARM AND/OR DURATION OF PASSAGE NOT DETERMINED OWING TO DARKNESS OR SIMILAR PHENOMENA
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20106.table b/definitions/bufr/tables/0/wmo/43/codetables/20106.table
new file mode 100644
index 000000000..2a8c4a098
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20106.table
@@ -0,0 +1,7 @@
+0 0 RESERVED
+1 1 THIN DENSITY SWARM (SWARM VISIBLE ONLY WHEN NEAR ENOUGH FOR INDIVIDUAL LOCUSTS TO BE DISCERNED)
+2 2 MEDIUM DENSITY SWARM
+3 3 DENSE SWARM (OBSCURING NEARBY FEATURES, E.G. TREES)
+4 4 ISOLATED HOPPERS SEEN SINGLY
+5 5 SCATTERED HOPPERS, SEVERAL VISIBLE SIMULTANEOUSLY
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20107.table b/definitions/bufr/tables/0/wmo/43/codetables/20107.table
new file mode 100644
index 000000000..0bea30ad5
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20107.table
@@ -0,0 +1,11 @@
+0 0 RESERVED
+1 1 GENERALLY IN THE DIRECTION NE
+2 2 GENERALLY IN THE DIRECTION E
+3 3 GENERALLY IN THE DIRECTION SE
+4 4 GENERALLY IN THE DIRECTION S
+5 5 GENERALLY IN THE DIRECTION SW
+6 6 GENERALLY IN THE DIRECTION W
+7 7 GENERALLY IN THE DIRECTION NW
+8 8 GENERALLY IN THE DIRECTION N
+9 9 SPECIFIC DIRECTION INDETERMINABLE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20108.table b/definitions/bufr/tables/0/wmo/43/codetables/20108.table
new file mode 100644
index 000000000..4404614cb
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20108.table
@@ -0,0 +1,9 @@
+0 0 BARE GROUND
+1 1 DRY, PRESENCE OF FEW AND ISOLATED SHRUBS
+2 2 SPARSE VEGETATION (SPROUTING)
+3 3 DENSE VEGETATION (SPROUTING)
+4 4 SPARSE VEGETATION (GROWING)
+5 5 DENSE VEGETATION (GROWING)
+6 6 SPARSE VEGETATION IN FLOWER
+7 7 DENSE VEGETATION IN FLOWER
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2011.table b/definitions/bufr/tables/0/wmo/43/codetables/2011.table
new file mode 100644
index 000000000..078686d08
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2011.table
@@ -0,0 +1,173 @@
+0 0 RESERVED
+1 1 IMET-1-BB (UNITED STATES)
+2 2 NO RADIOSONDE - PASSIVE TARGET (E.G. REFLECTOR)
+3 3 NO RADIOSONDE - ACTIVE TARGET (E.G. TRANSPONDER)
+4 4 NO RADIOSONDE - PASSIVE TEMPERATURE-HUMIDITY PROFILER
+5 5 NO RADIOSONDE - ACTIVE TEMPERATURE-HUMIDITY PROFILER
+6 6 NO RADIOSONDE - RADIO-ACOUSTIC SOUNDER
+7 7 IMET-1-AB (UNITED STATES)
+8 8 NO RADIOSONDE -... (RESERVED)
+9 9 NO RADIOSONDE - SYSTEM UNKNOWN OR NOT SPECIFIED
+10 10 VIZ TYPE A PRESSURE-COMMUTATED (UNITED STATES)
+11 11 VIZ TYPE B TIME-COMMUTATED (UNITED STATES)
+12 12 RS SDC (SPACE DATA CORPORATION - UNITED STATES)
+13 13 ASTOR (NO LONGER MADE - AUSTRALIA)
+14 14 VIZ MARK I MICROSONDE (UNITED STATES)
+15 15 EEC COMPANY TYPE 23 (UNITED STATES)
+16 16 ELIN (AUSTRIA)
+17 17 GRAW G. (GERMANY)
+18 18 GRAW DFM-06 (GERMANY)
+19 19 GRAW M60 (GERMANY)
+20 20 INDIAN METEOROLOGICAL SERVICE MK3 (INDIA)
+21 21 VIZ/JIN YANG MARK I MICROSONDE (REPUBLIC OF KOREA)
+22 22 MEISEI RS2-80 (JAPAN)
+23 23 MESURAL FMO 1950A (FRANCE)
+24 24 MESURAL FMO 1945A (FRANCE)
+25 25 MESURAL MH73A (FRANCE)
+26 26 METEOLABOR BASORA (SWITZERLAND)
+27 27 AVK-MRZ (RUSSIAN FEDERATION)
+28 28 METEORIT MARZ2-1 (RUSSIAN FEDERATION)
+29 29 METEORIT MARZ2-2 (RUSSIAN FEDERATION)
+30 30 OKI RS2-80 (JAPAN)
+31 31 VIZ/VALCOM TYPE A PRESSURE-COMMUTATED (CANADA)
+32 32 SHANGHAI RADIO (CHINA)
+33 33 UK MET OFFICE MK3 (UK)
+34 34 VINOHRADY (CZECHIA)
+35 35 VAISALA RS18 (FINLAND)
+36 36 VAISALA RS21 (FINLAND)
+37 37 VAISALA RS80 (FINLAND)
+38 38 VIZ LOCATE LORAN-C (UNITED STATES)
+39 39 SPRENGER E076 (GERMANY)
+40 40 SPRENGER E084 (GERMANY)
+41 41 SPRENGER E085 (GERMANY)
+42 42 SPRENGER E086 (GERMANY)
+43 43 AIR IS - 4A - 1680 (UNITED STATES)
+44 44 AIR IS - 4A - 1680 X (UNITED STATES)
+45 45 RS MSS (UNITED STATES)
+46 46 AIR IS - 4A - 403 (UNITED STATES)
+47 47 MEISEI RS2-91 (JAPAN)
+48 48 VALCOM (CANADA)
+49 49 VIZ MARK II (UNITED STATES)
+50 50 GRAW DFM-90 (GERMANY)
+51 51 VIZ-B2 (UNITED STATES)
+52 52 VAISALA RS80-57H
+53 53 AVK-RF95 (RUSSIAN FEDERATION)
+54 54 GRAW DFM-97 (GERMANY)
+55 55 MEISEI RS-01G (JAPAN)
+56 56 M2K2 (FRANCE)
+57 57 MODEM M2K2-DC (FRANCE)
+58 58 AVK-BAR (RUSSIAN FEDERATION)
+59 59 MODEM M2K2-R 1680 MHZ RDF RADIOSONDE WITH PRESSURE SENSOR CHIP (FRANCE)
+60 60 VAISALA RS80/MICROCORA (FINLAND)
+61 61 VAISALA RS80/LORAN/DIGICORA I, II OR MARWIN (FINLAND)
+62 62 VAISALA RS80/PCCORA (FINLAND)
+63 63 VAISALA RS80/STAR (FINLAND)
+64 64 ORBITAL SCIENCES CORPORATION, SPACE DATA DIVISION, TRANSPONDER RADIOSONDE, TYPE 909-11-XX, WHERE XX CORRESPONDS TO THE MODEL OF THE INSTRUMENT (UNITED STATES)
+65 65 VIZ TRANSPONDER RADIOSONDE, MODEL NUMBER 1499-520 (UNITED STATES)
+66 66 VAISALA RS80 /AUTOSONDE (FINLAND)
+67 67 VAISALA RS80/DIGICORA III (FINLAND)
+68 68 AVK-RZM-2 (RUSSIAN FEDERATION)
+69 69 MARL-A OR VEKTOR-M-RZM-2 (RUSSIAN FEDERATION)
+70 70 VAISALA RS92/STAR (FINLAND)
+71 71 VAISALA RS90/LORAN/DIGICORA I, II OR MARWIN (FINLAND)
+72 72 VAISALA RS90/PC-CORA (FINLAND)
+73 73 VAISALA RS90/AUTOSONDE (FINLAND)
+74 74 VAISALA RS90/STAR (FINLAND)
+75 75 AVK-MRZ-ARMA (RUSSIAN FEDERATION)
+76 76 AVK-RF95-ARMA (RUSSIAN FEDERATION)
+77 77 GEOLINK GPSONDE GL98 (FRANCE)
+78 78 VAISALA RS90/DIGICORA III (FINLAND)
+79 79 VAISALA RS92/DIGICORA I,II OR MARWIN (FINLAND)
+80 80 VAISALA RS92/DIGICORA III (FINLAND)
+81 81 VAISALA RS92/AUTOSONDE (FINLAND)
+82 82 SIPPICAN MK2 GPS/STAR (UNITED STATES) WITH ROD THERMISTOR, CARBON ELEMENT AND DERIVED PRESSURE
+83 83 SIPPICAN MK2 GPS/W9000 (UNITED STATES) WITH ROD THERMISTOR, CARBON ELEMENT AND DERIVED PRESSURE
+84 84 SIPPICAN MARK II WITH CHIP THERMISTOR, CARBON ELEMENT AND DERIVED PRESSURE FROM GPS HEIGHT
+85 85 SIPPICAN MARK IIA WITH CHIP THERMISTOR, CARBON ELEMENT AND DERIVED PRESSURE FROM GPS HEIGHT
+86 86 SIPPICAN MARK II WITH CHIP THERMISTOR, PRESSURE AND CARBON ELEMENT
+87 87 SIPPICAN MARK IIA WITH CHIP THERMISTOR, PRESSURE AND CARBON ELEMENT
+88 88 MARL-A OR VEKTOR-M-MRZ (RUSSIAN FEDERATION)
+89 89 MARL-A OR VEKTOR-M-BAR (RUSSIAN FEDERATION)
+90 90 RADIOSONDE NOT SPECIFIED OR UNKNOWN
+91 91 PRESSURE ONLY RADIOSONDE
+92 92 PRESSURE ONLY RADIOSONDE PLUS TRANSPONDER
+93 93 PRESSURE ONLY RADIOSONDE PLUS RADAR REFLECTOR
+94 94 NO PRESSURE RADIOSONDE PLUS TRANSPONDER
+95 95 NO PRESSURE RADIOSONDE PLUS RADAR REFLECTOR
+96 96 DESCENDING RADIOSONDE
+97 97 IMET-2/IMET-1500 RDF RADIOSONDE WITH PRESSURE SENSOR CHIP (SOUTH AFRICA)
+98 98 IMET-2/IMET-1500 GPS RADIOSONDE WITH DERIVED PRESSURE FROM GPS HEIGHT (SOUTH AFRICA)
+99 99 IMET-2/IMET-3200 GPS RADIOSONDE WITH DERIVED PRESSURE FROM GPS HEIGHT (SOUTH AFRICA)
+100 100 RESERVED FOR BUFR ONLY
+101 101 NOT VACANT
+107 107 NOT VACANT
+110 110 SIPPICAN LMS5 W/CHIP THERMISTOR, DUCT MOUNTED CAPACITANCE RELATIVE HUMIDITY SENSOR AND DERIVED PRESSURE FROM GPS HEIGHT
+111 111 SIPPICAN LMS6 W/CHIP THERMISTOR, EXTERNAL BOOM MOUNTED CAPACITANCE RELATIVE HUMIDITY SENSOR, AND DERIVED PRESSURE FROM GPS HEIGHT
+112 112 JIN YANG RSG-20A WITH DERIVED PRESSURE FROM GPS HEIGHT/GL-5000P (REPUBLIC OF KOREA)
+113 113 VAISALA RS92/MARWIN MW32 (FINLAND)
+114 114 VAISALA RS92/DIGICORA MW41 (FINLAND)
+115 115 PAZA-12M/RADIOTHEODOLITE-UL (UKRAINE)
+116 116 PAZA-22/AVK-1 (UKRAINE)
+117 117 GRAW DFM-09 (GERMANY)
+118 118 NOT VACANT
+119 119 POLUS-MRZ-N1 (RUSSIAN FEDERATION)
+120 120 NOT VACANT
+121 121 JIN YANG 1524LA LORAN-C/GL5000 (REPUBLIC OF KOREA)
+122 122 MEISEI RS-11G GPS RADIOSONDE W/THERMISTOR, CAPACITANCE RELATIVE HUMIDITY SENSOR, AND DERIVED PRESSURE FROM GPS HEIGHT (JAPAN)
+123 123 VAISALA RS41/DIGICORA MW41 (FINLAND)
+124 124 VAISALA RS41/AUTOSONDE (FINLAND)
+125 125 VAISALA RS41/MARWIN MW32 (FINLAND)
+126 126 METEOLABOR SRS-C34/ARGUS 37 (SWITZERLAND)
+127 127 NOT VACANT
+128 128 AVK - AK2-02 (RUSSIAN FEDERATION)
+129 129 MARL-A OR VEKTOR-M - AK2-02 (RUSSIAN FEDERATION)
+130 130 MEISEI RS-06G (JAPAN)
+131 131 TAIYUAN GTS1-1/GFE(L) (CHINA )
+132 132 SHANGHAI GTS1/GFE(L) (CHINA)
+133 133 NANJING GTS1-2/GFE(L) (CHINA)
+134 134 IMET-4 GPS RADIOSONDE (USA)
+135 135 MEISEI IMS-100 GPS RADIOSONDE W/THERMISTOR SENSOR, CAPACITANCE RELATIVE HUMIDITY SENSOR, AND DERIVED PRESSURE FROM GPS HEIGHT (JAPAN)
+136 136 MEISEI IMDS-17 GPS DROPSONDE W/THERMISTOR SENSOR, CAPACITANCE RELATIVE HUMIDITY SENSOR, AND CAPACITANCE PRESSURE SENSOR (JAPAN)
+137 137 NOT VACANT
+138 138 WEATHEX WXR-301D WITH DERIVED PRESSURE FROM GPS (REPUBLIC OF KOREA)
+141 141 VAISALA RS41 WITH PRESSURE DERIVED FROM GPS HEIGHT/DIGICORA MW41 (FINLAND)
+142 142 VAISALA RS41 WITH PRESSURE DERIVED FROM GPS HEIGHT/AUTOSONDE (FINLAND)
+143 143 NANJING DAQIAO XGP-3G (CHINA)*
+144 144 TIANJIN HUAYUNTIANYI GTS(U)1 (CHINA)*
+145 145 BEIJING CHANGFENG CF-06 (CHINA)*
+146 146 SHANGHAI CHANGWANG GTS3 (CHINA)*
+147 147 NOT VACANT
+148 148 PAZA-22M/MARL-A
+149 149 NOT VACANT
+150 150 METEOLABOR SRS-C50/ARGUS (SWITZERLAND)
+151 151 NOT VACANT
+152 152 VAISALA RS92-NGP/INTERMET IMS-2000 (UNITED STATES)
+153 153 AVK - I-2012 (RUSSIAN FEDERATION)
+154 154 GRAW DFM-17 (GERMANY)
+160 160 MARL-A OR VEKTOR-M - I-2012 (RUSSIAN FEDERATION)
+161 161 NOT VACANT
+162 162 MARL-A OR VEKTOR-M - MRZ-3MK (RUSSIAN FEDERATION)
+163 163 MODEM M20 RADIOSONDE W/THERMISTOR SENSOR, CAPACITANCE RELATIVE HUMIDITY SENSOR, AND DERIVED PRESSURE FROM GPS HEIGHT (FRANCE)
+164 164 MODEM PILOTSONDE GPS RADIOSONDE (FRANCE)
+165 165 METEOSIS MTS-01 (TURKIYE)
+166 166 VACANT
+173 173 МARL-A (RUSSIAN FEDERATION) - ASPAN-15 (KAZAKHSTAN)
+177 177 MODEM GPSONDE M10 (FRANCE)
+182 182 LOCKHEED MARTIN LMS-6 W/CHIP THERMISTOR; EXTERNAL BOOM MOUNTED POLYMER CAPACITIVE RELATIVE HUMIDITY SENSOR; CAPACITIVE PRESSURE SENSOR AND GPS WIND
+183 183 VAISALA RS92-D/INTERMET IMS 1500 W/SILICON CAPACITIVE PRESSURE SENSOR, CAPACITIVE WIRE TEMPERATURE SENSOR, TWIN THIN-FILM HEATED POLYMER CAPACITIVE RELATIVE HUMIDITY SENSOR AND RDF WIND
+184 184 IMET-54/IMET-3200/3400 GPS RADIOSONDE WITH DERIVED PRESSURE FROM GPS HEIGHT (SOUTH AFRICA)
+190 190 NCAR RESEARCH DROPSONDE NRD94 WITH GPS AND VAISALA RS92-BASED SENSOR MODULE (UNITED STATES)
+191 191 NCAR RESEARCH DROPSONDE NRD41 WITH GPS AND VAISALA RS41-BASED SENSOR MODULE (UNITED STATES)
+192 192 VAISALA/NCAR DROPSONDE RD94 WITH GPS AND VAISALA RS92-BASED SENSOR MODULE (FINLAND/UNITED STATES)
+193 193 VAISALA/NCAR DROPSONDE RD41 WITH GPS AND VAISALA RS41-BASED SENSOR MODULE (FINLAND/UNITED STATES)
+200 200 NANJING GTS11 (CHINA)
+201 201 SHANGHAI GTS12 (CHINA)
+202 202 TAIYUAN GTS13 (CHINA)
+203 203 SHANGHAI GTS14 (CHINA)
+204 204 BEIJING GTH1 (CHINA)
+205 205 NANJING GTH2 (CHINA)
+206 206 TIANJIN GTH3 (CHINA)
+207 207 AEROSPACE NEWSKY TECHNOLOGY GTH4 (CHINA)
+208 208 TAIYUAN GTH5 (CHINA)
+209 209 SHANGHAI GTH6 (CHINA)
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20119.table b/definitions/bufr/tables/0/wmo/43/codetables/20119.table
new file mode 100644
index 000000000..4a4b40f87
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20119.table
@@ -0,0 +1,4 @@
+0 0 NOT DEFINED
+1 1 POSITIVE
+2 2 NEGATIVE
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20124.table b/definitions/bufr/tables/0/wmo/43/codetables/20124.table
new file mode 100644
index 000000000..f78eacb17
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20124.table
@@ -0,0 +1,4 @@
+0 0 NOT DEFINED
+1 1 LIGHTNING STROKE
+2 2 LIGHTNING FLASH, BY MANUAL OBSERVATION, OR IF EQUIPMENT INSENSITIVE TO STROKE RESOLUTION
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2013.table b/definitions/bufr/tables/0/wmo/43/codetables/2013.table
new file mode 100644
index 000000000..91ce6501d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2013.table
@@ -0,0 +1,11 @@
+0 0 NO CORRECTION
+1 1 CIMO SOLAR CORRECTED AND CIMO INFRARED CORRECTED
+2 2 CIMO SOLAR CORRECTED AND INFRARED CORRECTED
+3 3 CIMO SOLAR CORRECTED ONLY
+4 4 SOLAR AND INFRARED CORRECTED AUTOMATICALLY BY RADIOSONDE SYSTEM
+5 5 SOLAR CORRECTED AUTOMATICALLY BY RADIOSONDE SYSTEM
+6 6 SOLAR AND INFRARED CORRECTED AS SPECIFIED BY COUNTRY
+7 7 SOLAR CORRECTED AS SPECIFIED BY COUNTRY
+8 8 SOLAR AND INFRARED CORRECTED AS SPECIFIED BY GRUAN
+9 9 SOLAR CORRECTED AS SPECIFIED BY GRUAN
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20136.table b/definitions/bufr/tables/0/wmo/43/codetables/20136.table
new file mode 100644
index 000000000..42c012b50
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20136.table
@@ -0,0 +1,44 @@
+0 0 ISOLATED CUMULUS HUMILIS AND/OR CUMULUS MEDIOCRIS OF VERTICAL DEVELOPMENT
+1 1 NUMEROUS CUMULUS HUMILIS AND/OR CUMULUS MEDIOCRIS OF VERTICAL DEVELOPMENT
+2 2 ISOLATED CUMULUS CONGESTUS OF VERTICAL DEVELOPMENT
+3 3 NUMEROUS CUMULUS CONGESTUS OF VERTICAL DEVELOPMENT
+4 4 ISOLATED CUMULONIMBUS OF VERTICAL DEVELOPMENT
+5 5 NUMEROUS CUMULONIMBUS OF VERTICAL DEVELOPMENT
+6 6 ISOLATED CUMULUS AND CUMULONIMBUS OF VERTICAL DEVELOPMENT
+7 7 NUMEROUS CUMULUS AND CUMULONIMBUS OF VERTICAL DEVELOPMENT
+10 10 RESERVED
+11 11 ISOLATED OROGRAPHIC CLOUDS, PILEUS, INCUS, FORMING
+12 12 ISOLATED OROGRAPHIC CLOUDS, PILEUS, INCUS, NOT CHANGING
+13 13 ISOLATED OROGRAPHIC CLOUDS, PILEUS, INCUS, DISSOLVING
+14 14 IRREGULAR BANKS OF OROGRAPHIC CLOUD, FOEHN BANK, ETC., FORMING
+15 15 IRREGULAR BANKS OF OROGRAPHIC CLOUD, FOEHN BANK, ETC., NOT CHANGING
+16 16 IRREGULAR BANKS OF OROGRAPHIC CLOUD, FOEHN BANK, ETC., DISSOLVING
+17 17 COMPACT LAYER OF OROGRAPHIC CLOUD, FOEHN BANK, ETC., FORMING
+18 18 COMPACT LAYER OF OROGRAPHIC CLOUD, FOEHN BANK, ETC., NOT CHANGING
+19 19 COMPACT LAYER OF OROGRAPHIC CLOUD, FOEHN BANK, ETC., DISSOLVING
+20 20 ALL MOUNTAINS OPEN, ONLY SMALL AMOUNTS OF CLOUD PRESENT
+21 21 MOUNTAINS PARTLY COVERED WITH DETACHED CLOUDS (NOT MORE THAN HALF THE PEAKS CAN BE SEEN)
+22 22 ALL MOUNTAIN SLOPES COVERED, PEAKS AND PASSES FREE
+23 23 MOUNTAINS OPEN ON OBSERVER’S SIDE (ONLY SMALL AMOUNTS OF CLOUD PRESENT), BUT A CONTINUOUS WALL OF CLOUD ON THE OTHER SIDE
+24 24 CLOUDS LOW ABOVE THE MOUNTAINS, BUT ALL SLOPES AND MOUNTAINS OPEN (ONLY SMALL AMOUNTS OF CLOUD ON THE SLOPES)
+25 25 CLOUDS LOW ABOVE THE MOUNTAINS, PEAKS PARTLY COVERED BY PRECIPITATION TRAILS OR CLOUDS
+26 26 ALL PEAKS COVERED BUT PASSES OPEN, SLOPES EITHER OPEN OR COVERED
+27 27 MOUNTAINS GENERALLY COVERED BUT SOME PEAKS FREE, SLOPES WHOLLY OR PARTIALLY COVERED
+28 28 ALL PEAKS, PASSES AND SLOPES COVERED
+29 29 MOUNTAINS CANNOT BE SEEN OWING TO DARKNESS, FOG, SNOWSTORM, PRECIPITATION, ETC.
+35 35 NON-PERSISTENT CONDENSATION TRAILS
+36 36 PERSISTENT CONDENSATION TRAILS COVERING LESS THAN 1/8 OF THE SKY
+37 37 PERSISTENT CONDENSATION TRAILS COVERING 1/8 OF THE SKY
+38 38 PERSISTENT CONDENSATION TRAILS COVERING 2/8 OF THE SKY
+39 39 PERSISTENT CONDENSATION TRAILS COVERING 3/8 OR MORE OF THE SKY
+40 40 NO CLOUD OR MIST OBSERVED FROM A HIGHER LEVEL
+41 41 MIST, CLEAR ABOVE OBSERVED FROM A HIGHER LEVEL
+42 42 FOG PATCHES OBSERVED FROM A HIGHER LEVEL
+43 43 LAYER OF SLIGHT FOG OBSERVED FROM A HIGHER LEVEL
+44 44 LAYER OF THICK FOG OBSERVED FROM A HIGHER LEVEL
+45 45 SOME ISOLATED CLOUDS OBSERVED FROM A HIGHER LEVEL
+46 46 ISOLATED CLOUDS AND FOG BELOW OBSERVED FROM A HIGHER LEVEL
+47 47 MANY ISOLATED CLOUDS OBSERVED FROM A HIGHER LEVEL
+48 48 SEA OF CLOUDS OBSERVED FROM A HIGHER LEVEL
+49 49 BAD VISIBILITY OBSCURING THE DOWNWARD VIEW OBSERVED FROM A HIGHER LEVEL
+511 511 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20137.table b/definitions/bufr/tables/0/wmo/43/codetables/20137.table
new file mode 100644
index 000000000..adda88054
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20137.table
@@ -0,0 +1,11 @@
+0 0 NO CHANGE
+1 1 CUMULIFICATION
+2 2 SLOW ELEVATION
+3 3 RAPID ELEVATION
+4 4 ELEVATION AND STRATIFICATION
+5 5 SLOW LOWERING
+6 6 RAPID LOWERING
+7 7 STRATIFICATION
+8 8 STRATIFICATION AND LOWERING
+9 9 RAPID CHANGE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20138.table b/definitions/bufr/tables/0/wmo/43/codetables/20138.table
new file mode 100644
index 000000000..ed9b315fc
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20138.table
@@ -0,0 +1,9 @@
+0 0  DRY
+1 1  MOIST
+2 2  WET
+3 3  RIME
+4 4  SNOW
+5 5  ICE
+6 6  GLAZE
+7 7  NOT DRY
+15 15  MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20139.table b/definitions/bufr/tables/0/wmo/43/codetables/20139.table
new file mode 100644
index 000000000..2e5658c3d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20139.table
@@ -0,0 +1,7 @@
+0 0 CLEAR
+1 1 SINGLE LAYER WATER
+2 2 SINGLE LAYER ICE
+3 3 2-LAYERS (WATER/ICE)
+4 4 SINGLE LAYER ASH
+5 5 2-LAYERS ASH
+15 15 MISSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2014.table b/definitions/bufr/tables/0/wmo/43/codetables/2014.table
new file mode 100644
index 000000000..bc5c5fcb8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2014.table
@@ -0,0 +1,51 @@
+0 0 NO WIND FINDING
+1 1 AUTOMATIC WITH AUXILIARY OPTICAL DIRECTION FINDING
+2 2 AUTOMATIC WITH AUXILIARY RADIO DIRECTION FINDING
+3 3 AUTOMATIC WITH AUXILIARY RANGING
+4 4 NOT USED
+5 5 AUTOMATIC WITH MULTIPLE VLF-OMEGA SIGNALS
+6 6 AUTOMATIC CROSS CHAIN LORAN-C
+7 7 AUTOMATIC WITH AUXILIARY WIND PROFILER
+8 8 AUTOMATIC SATELLITE NAVIGATION
+19 19 TRACKING TECHNIQUE NOT SPECIFIED
+20 20 VESSEL STOPPED
+21 21 VESSEL DIVERTED FROM ORIGINAL DESTINATION
+22 22 VESSEL'S ARRIVAL DELAYED
+23 23 CONTAINER DAMAGED
+24 24 POWER FAILURE TO CONTAINER
+29 29 OTHER PROBLEMS
+30 30 MAJOR POWER PROBLEMS
+31 31 UPS INOPERATIVE
+32 32 RECEIVER HARDWARE PROBLEMS
+33 33 RECEIVER SOFTWARE PROBLEMS
+34 34 PROCESSOR HARDWARE PROBLEMS
+35 35 PROCESSOR SOFTWARE PROBLEMS
+36 36 NAVAID SYSTEM DAMAGED
+37 37 SHORTAGE OF LIFTING GAS
+38 38 RESERVED
+39 39 OTHER PROBLEMS
+40 40 MECHANICAL DEFECT
+41 41 MATERIAL DEFECT (HAND LAUNCHER)
+42 42 POWER FAILURE
+43 43 CONTROL FAILURE
+44 44 PNEUMATIC/HYDRAULIC FAILURE
+45 45 OTHER PROBLEMS
+46 46 COMPRESSOR PROBLEMS
+47 47 BALLOON PROBLEMS
+48 48 BALLOON RELEASE PROBLEMS
+49 49 LAUNCHER DAMAGED
+50 50 R/S RECEIVER ANTENNA DEFECT
+51 51 NAVAID ANTENNA DEFECT
+52 52 R/S RECEIVER CABLING (ANTENNA) DEFECT
+53 53 NAVAID ANTENNA CABLING DEFECT
+59 59 OTHER PROBLEMS
+60 60 ASAP COMMUNICATIONS DEFECT
+61 61 COMMUNICATIONS FACILITY REJECTED DATA
+62 62 NO POWER AT TRANSMITTING ANTENNA
+63 63 ANTENNA CABLE BROKEN
+64 64 ANTENNA CABLE DEFECT
+65 65 MESSAGE TRANSMITTED POWER BELOW NORMAL
+69 69 OTHER PROBLEMS
+70 70 ALL SYSTEMS IN NORMAL OPERATION
+99 99 STATUS OF SYSTEM AND ITS COMPONENTS NOT SPECIFIED
+127 127 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/20143.table b/definitions/bufr/tables/0/wmo/43/codetables/20143.table
new file mode 100644
index 000000000..849964a75
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/20143.table
@@ -0,0 +1,4 @@
+0 0 NO LIQUID CLOUD
+1 1 LIQUID CLOUD PRESENT
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2015.table b/definitions/bufr/tables/0/wmo/43/codetables/2015.table
new file mode 100644
index 000000000..7b0ccaf86
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2015.table
@@ -0,0 +1,7 @@
+0 0 RESERVED
+1 1 PRESSURE ONLY RADIOSONDE
+2 2 PRESSURE ONLY RADIOSONDE PLUS TRANSPONDER
+3 3 PRESSURE ONLY RADIOSONDE PLUS RADAR REFLECTOR
+4 4 NO-PRESSURE RADIOSONDE PLUS TRANSPONDER
+5 5 NO-PRESSURE RADIOSONDE PLUS RADAR REFLECTOR
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2016.table b/definitions/bufr/tables/0/wmo/43/codetables/2016.table
new file mode 100644
index 000000000..4a3022611
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2016.table
@@ -0,0 +1,4 @@
+1 1 TRAIN REGULATOR
+2 2 LIGHT UNIT
+3 3 PARACHUTE
+4 4 ROOFTOP RELEASE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2017.table b/definitions/bufr/tables/0/wmo/43/codetables/2017.table
new file mode 100644
index 000000000..7fac2e10f
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2017.table
@@ -0,0 +1,6 @@
+0 0 NO CORRECTIONS
+1 1 TIME LAG CORRECTION PROVIDED BY THE MANUFACTURER
+2 2 SOLAR RADIATION CORRECTION PROVIDED BY THE MANUFACTURER
+3 3 SOLAR RADIATION AND TIME LAG CORRECTION PROVIDED BY THE MANUFACTURER
+7 7 GRUAN SOLAR RADIATION AND TIME LAG CORRECTION
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2019.table b/definitions/bufr/tables/0/wmo/43/codetables/2019.table
new file mode 100644
index 000000000..3472aeb93
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2019.table
@@ -0,0 +1,419 @@
+7 7 SSH
+8 8 SSM/T
+9 9 SSM/T2
+10 10 AATSR
+11 11 ATSR
+12 12 ATSR-2
+13 13 MWR
+14 14 PMR
+15 15 SCR
+30 30 ARGOS
+40 40 LASER REFLECTORS
+41 41 DORIS
+42 42 DORIS-NG
+47 47 POSEIDON-1 (SSALT1)
+48 48 POSEIDON-2 (SSALT2)
+49 49 POSEIDON-3 (SSALT3)
+50 50 ATSR/M
+51 51 HRG
+52 52 HRV
+53 53 HRVIR
+54 54 SCARAB/MV2
+55 55 POLDER
+56 56 IIR
+57 57 POSEIDON-4
+60 60 VEGETATION
+61 61 WINDII
+62 62 ALTIKA
+63 63 SWIM
+80 80 RADARSAT DTT
+81 81 RADARSAT TTC
+85 85 SAR (CSA)
+90 90 MOPITT
+91 91 OSIRIS
+92 92 ACE-FTS
+97 97 PANCHROMATIC IMAGER
+98 98 GPS RECEIVER
+102 102 CHAMP GPS SOUNDER
+103 103 IGOR
+104 104 TRI-G
+116 116 CHAMP GRAVITY PACKAGE (ACCELEROMETER+GPS)
+117 117 CHAMP MAGNETOMETRY PACKAGE (1 SCALAR+2 VECTOR MAGNETOMETER)
+120 120 ENVISAT COMMS
+121 121 ERS COMMS
+130 130 ALADIN
+131 131 ATLID
+140 140 AMI/SAR/IMAGE
+141 141 AMI/SAR/WAVE
+142 142 AMI/SCATTEROMETER
+143 143 ASAR
+144 144 ASAR
+145 145 ASAR
+146 146 CPR
+147 147 RA-2/MWR
+148 148 RA/MWR
+150 150 SCATTEROMETER
+151 151 SAR-C
+152 152 SW
+161 161 MIPAS
+162 162 MWR-2
+163 163 SOPRANO
+170 170 GOME
+172 172 GOMOS
+173 173 ALTIUS
+174 174 MERIS
+175 175 SCIAMACHY
+176 176 MIRAS
+177 177 SIRAL
+178 178 SRAL
+179 179 OLCI
+180 180 SLSTR
+181 181 METEOSAT COMMS
+182 182 MSG COMMS
+190 190 ASCAT
+200 200 GERB
+202 202 GRAS
+203 203 MHS
+205 205 MVIRI
+207 207 SEVIRI
+208 208 VIRI
+209 209 MWR
+210 210 FCI
+211 211 LI
+212 212 IRS
+213 213 S4
+220 220 GOME-2
+221 221 IASI
+230 230 3MI
+231 231 IASI-NG
+232 232 METIMAGE
+233 233 MWS
+234 234 RO
+235 235 S5/UVNS
+236 236 ICI
+237 237 MWI
+238 238 SCA
+240 240 DCP
+245 245 CCD
+246 246 HSB
+248 248 OBA
+250 250 WFI
+255 255 IRMSS
+260 260 BSS & FSS TRANSPONDERS
+261 261 DRT-S&R
+262 262 INSAT COMMS
+268 268 HR-PAN
+269 269 MSMR
+270 270 VHRR
+271 271 WIFS
+275 275 AWIFS
+276 276 LISS-I
+277 277 LISS-II
+278 278 LISS-III
+279 279 LISS-IV
+284 284 PAN
+285 285 MOS
+286 286 OCM
+287 287 ROSA
+288 288 SCAT
+289 289 IMG
+290 290 MTSAT COMMS
+291 291 HIMAWARI COMMS
+294 294 JAMI
+295 295 IMAGER/MTSAT-2
+296 296 VISSR
+297 297 AHI
+300 300 GLAS
+301 301 LRA
+302 302 MBLA
+303 303 CALIOP
+309 309 CPR (CLOUDSAT)
+312 312 NSCAT
+313 313 SEAWINDS
+314 314 RAPIDSCAT
+330 330 ACRIM
+334 334 BUV
+336 336 ALI
+347 347 ASTER
+348 348 CERES-2
+351 351 GPSDR
+353 353 HIRDLS
+354 354 HRDI
+356 356 LIS
+358 358 PEM
+359 359 SEAWIFS
+360 360 SUSIM (UARS)
+363 363 SBUV/1
+365 365 TMI
+366 366 JMR
+367 367 AMR
+368 368 MW RADIOMETER
+369 369 LIMS
+370 370 LRIR
+371 371 EPIC
+372 372 NISTAR
+373 373 PLASMA-MAG
+374 374 XPS
+375 375 VIRS
+376 376 POLDER II
+377 377 TIM
+379 379 WFC
+382 382 CLAES
+383 383 HALOE
+384 384 ISAMS
+385 385 MISR
+386 386 MLS
+387 387 MLS (EOS-AURA)
+389 389 MODIS
+393 393 HAIRS
+394 394 OMI
+395 395 ATMOSPHERIC CORRECTOR
+396 396 HYPERION
+397 397 HRIR
+398 398 MRIR
+399 399 SAGE I
+400 400 SAGE II
+401 401 SAGE III
+402 402 SAMS
+403 403 SAM-II
+404 404 IRIS
+405 405 GIFTS
+420 420 AIRS
+421 421 SIRS-A
+422 422 SIRS-B
+426 426 SOLSTICE
+430 430 TES
+431 431 TOMS
+432 432 OCO
+433 433 TMS
+434 434 SMAP
+435 435 TEMPO
+450 450 ADEOS COMMS
+451 451 DCS (JAXA)
+453 453 GMS COMMS
+454 454 JERS-1 COMMS
+460 460 RIS
+461 461 PR
+462 462 SAR
+470 470 PALSAR
+477 477 AMSR3
+478 478 AMSR2
+479 479 AMSR-E
+480 480 PRISM (ALOS)
+481 481 AMSR
+482 482 AVNIR
+483 483 AVNIR-2
+484 484 GLI
+485 485 MESSR
+486 486 MSR
+487 487 OCTS
+488 488 OPS
+489 489 VISSR (GMS-5)
+490 490 VTIR
+510 510 ILAS-I
+511 511 ILAS-II
+512 512 IMG
+514 514 SEM
+515 515 SOFIS
+516 516 TANSO-FTS
+517 517 TANSO-CAI
+518 518 DPR
+519 519 GMI
+520 520 SMMR
+521 521 TANSO-FTS2
+526 526 CION-A
+527 527 CION-B
+528 528 CION-C
+529 529 CION-D
+530 530 SGNOS-A
+531 531 SGNOS-B
+532 532 SGNOS-C
+533 533 SGNOS-D
+534 534 PYXIS-A
+535 535 PYXIS-B
+536 536 MWS
+537 537 KAPR
+540 540 DCS (NOAA)
+541 541 GOES COMMS
+542 542 LANDSAT COMMS
+543 543 NOAA COMMS
+544 544 S&R (GOES)
+545 545 S&R (NOAA)
+546 546 WEFAX
+547 547 SEM (GOES)
+550 550 SSM
+551 551 SSJ/4
+552 552 SSIES-2
+553 553 SSB/X-2
+570 570 AMSU-A
+574 574 AMSU-B
+580 580 ATOVS (HIRS/3 + AMSU + AVHRR/3)
+590 590 AVHRR/2
+591 591 AVHRR/3
+592 592 AVHRR/4
+600 600 ERBE
+601 601 ETM+
+604 604 HIRS/1
+605 605 HIRS/2
+606 606 HIRS/3
+607 607 HIRS/4
+615 615 IMAGER
+616 616 VIIRS
+617 617 ABI
+618 618 GLM
+620 620 CRIS/NP
+621 621 ATMS
+622 622 MSS
+623 623 MSU
+624 624 SBUV/2
+625 625 SBUV/3
+626 626 SOUNDER
+627 627 SSU
+628 628 TM
+629 629 TOVS (HIRS/2 + MSU + SSU)
+630 630 VAS
+631 631 SSZ
+645 645 SEM
+650 650 MVIRSR (10 CHANNEL)
+651 651 MVIRSR (3 CHANNEL)
+652 652 MVIRSR (5 CHANNEL)
+670 670 RLSBO
+680 680 MSU-EU
+681 681 MSU-UM
+682 682 RM-08
+683 683 SU-UMS
+684 684 SU-VR
+685 685 TRASSER
+686 686 SCAT
+687 687 ALT
+688 688 MWI
+689 689 GEMS
+700 700 KONDOR-2
+701 701 BRK
+710 710 ALISSA
+712 712 BALKAN-2 LIDAR
+715 715 MK-4
+716 716 MK-4M
+730 730 GREBEN
+731 731 SAR-10
+732 732 SAR-3
+733 733 SAR-70
+740 740 SLR-3
+745 745 TRAVERS SAR
+750 750 174-K
+751 751 BTVK
+752 752 CHAIKA
+753 753 DELTA-2
+755 755 IKAR-D
+756 756 IKAR-N
+757 757 IKAR-P
+760 760 ISP
+761 761 KFA-1000
+762 762 KFA-200
+763 763 KFA-3000
+770 770 KLIMAT
+771 771 KLIMAT-2
+775 775 MIRAS
+776 776 MIVZA
+777 777 MIVZA-M
+780 780 MR-2000
+781 781 MR-2000M
+785 785 MR-900
+786 786 MR-900B
+790 790 MSU-E
+791 791 MSU-E1
+792 792 MSU-E2
+793 793 MSU-M
+794 794 MSU-S
+795 795 MSU-SK
+796 796 MSU-V
+810 810 MTZA
+815 815 MZOAS
+820 820 R-225
+821 821 R-400
+822 822 R-600
+830 830 RMS
+835 835 TV CAMERA
+836 836 SILVA
+840 840 SROSMO
+850 850 BUFS-2
+851 851 BUFS-4
+855 855 ISTOK-1
+856 856 SFM-2
+857 857 DOPI
+858 858 KGI-4
+859 859 OZON-M
+860 860 RMK-2
+861 861 MTVZA-GY
+862 862 IKFS-2
+900 900 MAXIE
+901 901 OLS
+905 905 SSM/I
+906 906 SSM/T-1
+907 907 SSM/T-2
+908 908 SSMIS
+909 909 VTPR
+910 910 SXI
+930 930 EHIC
+931 931 X-RAY ASTRONOMY PAYLOAD
+932 932 IVISSR (FY-2)
+933 933 IRAS
+934 934 MWAS
+935 935 IMWAS
+936 936 MWHS
+937 937 MVIRS
+938 938 MWRI
+940 940 MTVZA-OK
+941 941 SAPHIR
+942 942 MADRAS
+943 943 SCAT (ON CFOSAT)
+944 944 ALT
+945 945 TSIS
+946 946 CMIS
+947 947 OMPS-NADIR
+948 948 GPSOS
+949 949 SESS
+950 950 VIRR
+951 951 TOM
+952 952 OP
+953 953 MWHS-2
+954 954 MWTS-2
+955 955 HIRAS
+956 956 SBUS
+957 957 TOU
+958 958 GNOS
+959 959 SMR
+960 960 OMPS-LIMB
+961 961 AGRI-1
+962 962 GIIRS-1
+963 963 LMI
+964 964 SEP
+965 965 GNOS-2
+966 966 MWTS-3
+967 967 GIIRS-2
+968 968 GIIRS-3
+969 969 GIIRS-4
+970 970 GIIRS-5
+971 971 GIIRS-6
+972 972 AGRI-2
+973 973 AGRI-3
+974 974 AGRI-4
+975 975 AGRI-5
+976 976 AGRI-6
+977 977 GHI
+980 980 AMI
+981 981 MI
+982 982 KSEM
+983 983 HIRAS-2
+984 984 HIRAS-3
+985 985 MWRI-1
+986 986 MWRI-2
+987 987 MWRI-RM
+988 988 WINDRAD
+989 989 
+990 990 SMMR
+991 991 THIR
+992 992 NEMS
+993 993 SCAMS
+994 994 ESMR
+2047 2047 
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2020.table b/definitions/bufr/tables/0/wmo/43/codetables/2020.table
new file mode 100644
index 000000000..fd3c93626
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2020.table
@@ -0,0 +1,37 @@
+0 0 NIMBUS
+1 1 VTPR
+2 2 TIROS 1 (TIROS, NOAA-6 TO NOAA-13)
+3 3 TIROS 2 (NOAA-14 ONWARDS)
+10 10 EOS
+20 20 GPM-CORE
+31 31 DMSP
+61 61 EUMETSAT POLAR SYSTEM (EPS)
+62 62 EUMETSAT POLAR SYSTEM (EPS-SG)
+91 91 ERS
+92 92 SENTINEL-3
+121 121 ADEOS
+122 122 GCOM
+241 241 GOES
+251 251 TROPICS
+261 261 JASON
+271 271 GMS
+272 272 MTSAT
+273 273 HIMAWARI
+281 281 COMS
+301 301 INSAT
+331 331 METEOSAT OPERATIONAL PROGRAMME (MOP)
+332 332 METEOSAT TRANSITIONAL PROGRAMME (MTP)
+333 333 METEOSAT SECOND GENERATION PROGRAMME (MSG)
+334 334 METEOSAT THIRD GENERATION PROGRAMME (MTG)
+351 351 GOMS
+352 352 METEOR-M N2
+380 380 FY-1
+381 381 FY-2
+382 382 FY-3
+383 383 FY-4
+401 401 GPS
+402 402 GLONASS
+403 403 GALILEO
+404 404 BDS (BEIDOU NAVIGATION SATELLITE SYSTEM)
+405 405 QUASI-ZENITH SATELLITE SYSTEM (QZSS)
+511 511 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2021.table b/definitions/bufr/tables/0/wmo/43/codetables/2021.table
new file mode 100644
index 000000000..b95fdc989
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2021.table
@@ -0,0 +1,8 @@
+1 1 HIGH-RESOLUTION INFRARED SOUNDER (HIRS)
+2 2 MICROWAVE SOUNDING UNIT (MSU)
+3 3 STRATOSPHERIC SOUNDING UNIT (SSU)
+4 4 AMI (ADVANCED MICROWAVE INSTRUMENT) WIND MODE
+5 5 AMI (ADVANCED MICROWAVE INSTRUMENT) WAVE MODE
+6 6 AMI (ADVANCED MICROWAVE INSTRUMENT) IMAGE MODE
+7 7 RADAR ALTIMETER
+8 8 ATSR (ALONG-TRACK SCANNING RADIOMETER)
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2022.table b/definitions/bufr/tables/0/wmo/43/codetables/2022.table
new file mode 100644
index 000000000..5068e7fd7
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2022.table
@@ -0,0 +1,5 @@
+1 1 PROCESSING TECHNIQUE NOT DEFINED
+2 2 AUTOMATED STATISTICAL REGRESSION
+3 3 CLEAR PATH
+4 4 PARTLY CLOUDY PATH
+5 5 CLOUDY PATH
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2023.table b/definitions/bufr/tables/0/wmo/43/codetables/2023.table
new file mode 100644
index 000000000..be7eb84e4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2023.table
@@ -0,0 +1,11 @@
+0 0 RESERVED
+1 1 WIND DERIVED FROM CLOUD MOTION OBSERVED IN THE INFRARED CHANNEL
+2 2 WIND DERIVED FROM CLOUD MOTION OBSERVED IN THE VISIBLE CHANNEL
+3 3 WIND DERIVED FROM CLOUD MOTION OBSERVED IN THE WATER VAPOUR CHANNEL
+4 4 WIND DERIVED FROM MOTION OBSERVED IN A COMBINATION OF SPECTRAL CHANNELS
+5 5 WIND DERIVED FROM MOTION OBSERVED IN THE WATER VAPOUR CHANNEL IN CLEAR AIR
+6 6 WIND DERIVED FROM MOTION OBSERVED IN THE OZONE CHANNEL
+7 7 WIND DERIVED FROM MOTION OBSERVED IN WATER VAPOUR CHANNEL (CLOUD OR CLEAR AIR NOT SPECIFIED)
+13 13 ROOT-MEAN-SQUARE
+14 14 RESERVED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2024.table b/definitions/bufr/tables/0/wmo/43/codetables/2024.table
new file mode 100644
index 000000000..00ec80ef6
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2024.table
@@ -0,0 +1,4 @@
+0 0 RESERVED
+1 1 TABLE WITH FULL RANGE OF HUMIDITY VARIATION IN LAYER
+2 2 REGRESSION TECHNIQUE ON 2 HUMIDITY VALUES IN LAYER
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2025.table b/definitions/bufr/tables/0/wmo/43/codetables/2025.table
new file mode 100644
index 000000000..045416aac
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2025.table
@@ -0,0 +1,16 @@
+1 1 RESERVED
+2 2 HIRS
+3 3 MSU
+6 6 HIRS
+7 7 MSU
+10 10 HIRS (1, 2, 3, 8, 9, 16, 17)
+11 11 HIRS (1, 2, 3, 9, 17)
+12 12 MSU
+15 15 HIRS
+16 16 HIRS*
+17 17 MSU
+18 18 SKINTK (OCEAN ONLY)
+21 21 HIRS
+22 22 SSU
+23 23 MSU (3, 4)
+24 24 RESERVED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2030.table b/definitions/bufr/tables/0/wmo/43/codetables/2030.table
new file mode 100644
index 000000000..2777bbcd3
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2030.table
@@ -0,0 +1,8 @@
+0 0 RESERVED
+1 1 ADCP (ACOUSTIC DOPPLER CURRENT PROFILER)
+2 2 GEK (GEOMAGNETIC ELECTROKINETOGRAPH)
+3 3 SHIP'S SET AND DRIFT DETERMINED BY FIXES 3-6 HOURS APART
+4 4 SHIP'S SET AND DRIFT DETERMINED BY FIXES MORE THAN 6 HOURS BUT LESS THAN 12 HOURS APART
+5 5 DRIFT OF BUOY
+6 6 ADCP (ACOUSTIC DOPPLER CURRENT PROFILER)
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2031.table b/definitions/bufr/tables/0/wmo/43/codetables/2031.table
new file mode 100644
index 000000000..c096d370c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2031.table
@@ -0,0 +1,21 @@
+0 0 RESERVED
+1 1 INSTANTANEOUS
+2 2 AVERAGED OVER 3 MIN OR LESS
+3 3 AVERAGED OVER MORE THAN 3 MIN, BUT 6 MIN AT THE MOST
+4 4 AVERAGED OVER MORE THAN 6 MIN, BUT 12 MIN AT THE MOST
+5 5 INSTANTANEOUS
+6 6 AVERAGED OVER 3 MIN OR LESS
+7 7 AVERAGED OVER MORE THAN 3 MIN, BUT 6 MIN AT THE MOST
+8 8 AVERAGED OVER MORE THAN 6 MIN, BUT 12 MIN AT THE MOST
+9 9 VECTOR OR DOPPLER CURRENT PROFILING METHOD NOT USED
+10 10 RESERVED
+11 11 1 HOUR OR LESS
+12 12 MORE THAN 1 HOUR BUT 2 HOURS AT THE MOST
+13 13 MORE THAN 2 HOURS BUT 4 HOURS AT THE MOST
+14 14 MORE THAN 4 HOURS BUT 8 HOURS AT THE MOST
+15 15 MORE THAN 8 HOURS BUT 12 HOURS AT THE MOST
+16 16 MORE THAN 12 HOURS BUT 18 HOURS AT THE MOST
+17 17 MORE THAN 18 HOURS BUT 24 HOURS AT THE MOST
+18 18 RESERVED
+19 19 DRIFT METHOD NOT USED
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2032.table b/definitions/bufr/tables/0/wmo/43/codetables/2032.table
new file mode 100644
index 000000000..7e9310db0
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2032.table
@@ -0,0 +1,4 @@
+0 0 VALUES AT SELECTED DEPTHS (DATA POINTS FIXED BY THE INSTRUMENT OR SELECTED BY ANY OTHER METHOD)
+1 1 VALUES AT SELECTED DEPTHS (DATA POINTS TAKEN FROM TRACES AT SIGNIFICANT DEPTHS)
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2033.table b/definitions/bufr/tables/0/wmo/43/codetables/2033.table
new file mode 100644
index 000000000..d590a8454
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2033.table
@@ -0,0 +1,5 @@
+0 0 NO SALINITY MEASURED
+1 1 IN SITU SENSOR, ACCURACY BETTER THAN 0.02 0/00
+2 2 IN SITU SENSOR, ACCURACY LESS THAN 0.02 0/00
+3 3 SAMPLE ANALYSIS
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2034.table b/definitions/bufr/tables/0/wmo/43/codetables/2034.table
new file mode 100644
index 000000000..06cdd52d2
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2034.table
@@ -0,0 +1,7 @@
+0 0 UNSPECIFIED DROGUE
+1 1 HOLEY SOCK
+2 2 TRISTAR
+3 3 WINDOW SHADE
+4 4 PARACHUTE
+5 5 NON-LAGRANGIAN SEA ANCHOR
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2036.table b/definitions/bufr/tables/0/wmo/43/codetables/2036.table
new file mode 100644
index 000000000..7782d302a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2036.table
@@ -0,0 +1,4 @@
+0 0 DRIFTING BUOY
+1 1 FIXED BUOY
+2 2 SUBSURFACE FLOAT (MOVING)
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2037.table b/definitions/bufr/tables/0/wmo/43/codetables/2037.table
new file mode 100644
index 000000000..729c40e63
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2037.table
@@ -0,0 +1,8 @@
+0 0 RESERVED
+1 1 MANUAL READING FROM VERTICAL TIDE STAFF
+2 2 MANUAL READING FROM SINGLE AUTOMATIC RECORDER AT STATION
+3 3 MANUAL READING FROM MULTIPLE AUTOMATIC RECORDERS AT STATION
+4 4 AUTOMATIC READING FROM SINGLE AUTOMATIC RECORDER AT STATION WITHOUT LEVEL REFERENCE CHECK
+5 5 AUTOMATIC READING FROM SINGLE AUTOMATIC RECORDER AT STATION WITH LEVEL REFERENCE CHECK, OR FROM MULTIPLE AUTOMATIC RECORDERS
+6 6 RESERVED
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2038.table b/definitions/bufr/tables/0/wmo/43/codetables/2038.table
new file mode 100644
index 000000000..458f14169
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2038.table
@@ -0,0 +1,16 @@
+0 0 SHIP INTAKE
+1 1 BUCKET
+2 2 HULL CONTACT SENSOR
+3 3 REVERSING THERMOMETER
+4 4 STD/CTD SENSOR
+5 5 MECHANICAL BT
+6 6 EXPENDABLE BT
+7 7 DIGITAL BT
+8 8 THERMISTOR CHAIN
+9 9 INFRARED SCANNER
+10 10 MICROWAVE SCANNER
+11 11 INFRARED RADIOMETER
+12 12 IN-LINE THERMOSALINOGRAPH
+13 13 TOWED BODY
+14 14 OTHER
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2039.table b/definitions/bufr/tables/0/wmo/43/codetables/2039.table
new file mode 100644
index 000000000..0a94982b5
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2039.table
@@ -0,0 +1,5 @@
+0 0 MEASURED WET-BULB TEMPERATURE
+1 1 ICED BULB MEASURED WET-BULB TEMPERATURE
+2 2 COMPUTED WET-BULB TEMPERATURE
+3 3 ICED BULB COMPUTED WET-BULB TEMPERATURE
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2040.table b/definitions/bufr/tables/0/wmo/43/codetables/2040.table
new file mode 100644
index 000000000..78b291706
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2040.table
@@ -0,0 +1,8 @@
+0 0 SHIP'S MOTION REMOVED BY AVERAGING
+1 1 SHIP'S MOTION REMOVED BY MOTION COMPENSATION
+2 2 SHIP'S MOTION NOT REMOVED
+3 3 SHIP'S MOTION REMOVED BY AVERAGING
+4 4 SHIP'S MOTION REMOVED BY MOTION COMPENSATION
+5 5 SHIP'S MOTION NOT REMOVED
+6 6 DOPPLER CURRENT PROFILING METHOD NOT USED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2041.table b/definitions/bufr/tables/0/wmo/43/codetables/2041.table
new file mode 100644
index 000000000..ef5bf86b3
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2041.table
@@ -0,0 +1,6 @@
+0 0 INFORMATION BASED ON MANUAL ANALYSIS
+1 1 INFORMATION BASED ON COMPUTER ANALYSIS
+2 2 INFORMATION BASED ON DATA ASSIMILATION
+3 3 INFORMATION BASED ON COMPUTER ANALYSIS OR DATA ASSIMILATION MANUALLY MODIFIED
+10 10 INFORMATION BASED ON THE NUMERICAL WEATHER PREDICTION
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2042.table b/definitions/bufr/tables/0/wmo/43/codetables/2042.table
new file mode 100644
index 000000000..eb2445b83
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2042.table
@@ -0,0 +1,4 @@
+0 0 VALUE ORIGINALLY REPORTED IN M/S
+1 1 VALUE ORIGINALLY REPORTED IN KNOTS
+2 2 NO SEA CURRENT DATA AVAILABLE
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2044.table b/definitions/bufr/tables/0/wmo/43/codetables/2044.table
new file mode 100644
index 000000000..0e10ed8e1
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2044.table
@@ -0,0 +1,6 @@
+0 0 RESERVED FOR FUTURE USE
+1 1 LONGUET-HIGGINS (1964)
+2 2 LONGUET-HIGGINS (F3 METHOD)
+3 3 MAXIMUM LIKELIHOOD METHOD
+4 4 MAXIMUM ENTROPY METHOD
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2045.table b/definitions/bufr/tables/0/wmo/43/codetables/2045.table
new file mode 100644
index 000000000..374e4f27e
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2045.table
@@ -0,0 +1,5 @@
+0 0 SEA STATION
+1 1 AUTOMATIC DATA BUOY
+2 2 AIRCRAFT
+3 3 SATELLITE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2046.table b/definitions/bufr/tables/0/wmo/43/codetables/2046.table
new file mode 100644
index 000000000..57fb9d6be
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2046.table
@@ -0,0 +1,4 @@
+0 0 RESERVED FOR FUTURE USE
+1 1 HEAVE SENSOR
+2 2 SLOPE SENSOR
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2047.table b/definitions/bufr/tables/0/wmo/43/codetables/2047.table
new file mode 100644
index 000000000..821393179
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2047.table
@@ -0,0 +1,9 @@
+0 0 RESERVED
+1 1 DART II (PMEL)
+2 2 DART ETD
+3 3 SAIC TSUNAMI BUOY (STB)
+4 4 GFZ - POTSDAM
+5 5 INCOIS (INDIA)
+6 6 INABUOY (INDONESIA)
+7 7 ENVIRTECH
+127 127 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2048.table b/definitions/bufr/tables/0/wmo/43/codetables/2048.table
new file mode 100644
index 000000000..e4325f83b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2048.table
@@ -0,0 +1,16 @@
+0 0 HIRS
+1 1 MSU
+2 2 SSU
+3 3 AMSU-A
+4 4 AMSU-B
+5 5 AVHRR
+6 6 SSMI
+7 7 NSCAT
+8 8 SEAWINDS
+9 9 POSEIDON ALTIMETER
+10 10 JMR (JASON MICROWAVE RADIOMETER)
+11 11 MHS
+12 12 ASCAT
+13 13 OSCAT2
+14 14 RESERVED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2049.table b/definitions/bufr/tables/0/wmo/43/codetables/2049.table
new file mode 100644
index 000000000..ade5cac86
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2049.table
@@ -0,0 +1,4 @@
+1 1 PROCESSING TECHNIQUE NOT DEFINED
+2 2 SIMULTANEOUS PHYSICAL RETRIEVAL
+3 3 CLEAR SOUNDING
+4 4 CLOUDY SOUNDING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2050.table b/definitions/bufr/tables/0/wmo/43/codetables/2050.table
new file mode 100644
index 000000000..fbcce617d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2050.table
@@ -0,0 +1,19 @@
+1 1 1
+2 2 2
+3 3 3
+4 4 4
+5 5 5
+6 6 6
+7 7 7
+8 8 8
+9 9 9
+10 10 10
+11 11 11
+12 12 12
+13 13 13
+14 14 14
+15 15 15
+16 16 16
+17 17 17
+18 18 18
+19 19 19
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2051.table b/definitions/bufr/tables/0/wmo/43/codetables/2051.table
new file mode 100644
index 000000000..3524ae72d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2051.table
@@ -0,0 +1,5 @@
+0 0 RESERVED
+1 1 MAXIMUM/MINIMUM THERMOMETERS
+2 2 AUTOMATED INSTRUMENTS
+3 3 THERMOGRAPH
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2052.table b/definitions/bufr/tables/0/wmo/43/codetables/2052.table
new file mode 100644
index 000000000..8b6262caa
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2052.table
@@ -0,0 +1,5 @@
+1 1 1
+2 2 2
+3 3 3
+4 4 4
+5 5 5
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2053.table b/definitions/bufr/tables/0/wmo/43/codetables/2053.table
new file mode 100644
index 000000000..03e5e295e
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2053.table
@@ -0,0 +1,5 @@
+0 0 OBSERVED BRIGHTNESS TEMPERATURE
+1 1 BRIGHTNESS TEMPERATURE WITH BIAS CORRECTION APPLIED
+2 2 BRIGHTNESS TEMPERATURE CALCULATED FROM FIRST GUESS
+3 3 BRIGHTNESS TEMPERATURE CALCULATED FROM SOUNDING
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2054.table b/definitions/bufr/tables/0/wmo/43/codetables/2054.table
new file mode 100644
index 000000000..0995688ba
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2054.table
@@ -0,0 +1,6 @@
+0 0 PARAMETER DERIVED USING OBSERVED SOUNDER BRIGHTNESS TEMPERATURES
+1 1 PARAMETER DERIVED USING OBSERVED IMAGER BRIGHTNESS TEMPERATURES
+2 2 PARAMETER DERIVED USING FIRST GUESS INFORMATION
+3 3 PARAMETER DERIVED USING NMC ANALYSIS INFORMATION
+4 4 PARAMETER DERIVED USING RADIOSONDE INFORMATION
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2055.table b/definitions/bufr/tables/0/wmo/43/codetables/2055.table
new file mode 100644
index 000000000..ce06f0089
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2055.table
@@ -0,0 +1,10 @@
+0 0 STATISTICS GENERATED COMPARING RETRIEVAL VERSUS RADIOSONDE
+1 1 STATISTICS GENERATED COMPARING RETRIEVAL VERSUS FIRST GUESS
+2 2 STATISTICS GENERATED COMPARING RADIOSONDE VERSUS FIRST GUESS
+3 3 STATISTICS GENERATED COMPARING OBSERVED VERSUS RETRIEVAL
+4 4 STATISTICS GENERATED COMPARING OBSERVED VERSUS FIRST GUESS
+5 5 STATISTICS GENERATED COMPARING RADIOSONDE VERSUS IMAGER
+6 6 STATISTICS GENERATED COMPARING RADIOSONDE VERSUS SOUNDER
+7 7 STATISTICS GENERATED FOR RADIOSONDE
+8 8 STATISTICS GENERATED FOR FIRST GUESS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2056.table b/definitions/bufr/tables/0/wmo/43/codetables/2056.table
new file mode 100644
index 000000000..86eb98302
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2056.table
@@ -0,0 +1,6 @@
+0 0 SUMS OF DIFFERENCES
+1 1 SUMS OF SQUARED DIFFERENCES
+2 2 SAMPLE SIZE
+3 3 MINIMUM DIFFERENCE
+4 4 MAXIMUM DIFFERENCE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2057.table b/definitions/bufr/tables/0/wmo/43/codetables/2057.table
new file mode 100644
index 000000000..681e6bd08
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2057.table
@@ -0,0 +1,7 @@
+0 0 NESTED GRID MODEL (NGM)
+1 1 AVIATION MODEL (AVN)
+2 2 MEDIUM RANGE FORECAST (MRF) MODEL
+3 3 GLOBAL DATA ASSIMILATION SYSTEM (GDAS) FORECAST MODEL
+4 4 PRIOR SOUNDINGS (WITHIN 3 HOURS OF CURRENT TIME)
+5 5 CLIMATOLOGY
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2058.table b/definitions/bufr/tables/0/wmo/43/codetables/2058.table
new file mode 100644
index 000000000..6c45eda11
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2058.table
@@ -0,0 +1,5 @@
+0 0 12 HOUR AND 18 HOUR
+1 1 18 HOUR AND 24 HOUR
+2 2 6 HOUR AND 12 HOUR
+3 3 GREATER THAN 24 HOURS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2059.table b/definitions/bufr/tables/0/wmo/43/codetables/2059.table
new file mode 100644
index 000000000..8f089d3c4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2059.table
@@ -0,0 +1,5 @@
+0 0 NCEP NESTED GRID MODEL (NGM) ANALYSIS
+1 1 NCEP AVIATION MODEL (AVN) ANALYSIS
+2 2 NCEP MEDIUM RANGE FORECAST (MRF) MODEL ANALYSIS
+3 3 NCEP GLOBAL DATA ASSIMILATION SYSTEM (GDAS) FORECAST MODEL ANALYSIS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2060.table b/definitions/bufr/tables/0/wmo/43/codetables/2060.table
new file mode 100644
index 000000000..6f846987b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2060.table
@@ -0,0 +1,7 @@
+0 0 CURRENT SURFACE HOURLY REPORTS
+1 1 CURRENT SHIP REPORTS
+2 2 CURRENT BUOY REPORTS
+3 3 ONE HOUR OLD SURFACE HOURLY REPORTS
+4 4 ONE HOUR OLD SHIP REPORTS
+5 5 ONE HOUR OLD BUOY REPORTS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2061.table b/definitions/bufr/tables/0/wmo/43/codetables/2061.table
new file mode 100644
index 000000000..592d51eb4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2061.table
@@ -0,0 +1,3 @@
+0 0 INERTIAL NAVIGATION SYSTEM
+1 1 OMEGA
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2062.table b/definitions/bufr/tables/0/wmo/43/codetables/2062.table
new file mode 100644
index 000000000..2d0f4e202
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2062.table
@@ -0,0 +1,7 @@
+0 0 ASDAR
+1 1 ASDAR (ACARS ALSO AVAILABLE BUT NOT OPERATIVE)
+2 2 ASDAR (ACARS ALSO AVAILABLE AND OPERATIVE)
+3 3 ACARS
+4 4 ACARS (ASDAR ALSO AVAILABLE BUT NOT OPERATIVE)
+5 5 ACARS (ASDAR ALSO AVAILABLE AND OPERATIVE)
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2064.table b/definitions/bufr/tables/0/wmo/43/codetables/2064.table
new file mode 100644
index 000000000..741430292
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2064.table
@@ -0,0 +1,4 @@
+0 0 GOOD
+1 1 BAD
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2066.table b/definitions/bufr/tables/0/wmo/43/codetables/2066.table
new file mode 100644
index 000000000..a3865dc68
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2066.table
@@ -0,0 +1,9 @@
+0 0 INTERMET IMS 2000
+1 1 INTERMET IMS 1500C
+2 2 SHANGHAI GTC1
+3 3 NANJING GTC2
+4 4 NANJING GFE(L)1
+5 5 MARL-A RADAR
+6 6 VEKTOR-M RADAR
+62 62 OTHER
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2070.table b/definitions/bufr/tables/0/wmo/43/codetables/2070.table
new file mode 100644
index 000000000..5a098ea26
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2070.table
@@ -0,0 +1,13 @@
+0 0 ACTUAL LOCATION IN SECONDS
+1 1 ACTUAL LOCATION IN MINUTES
+2 2 ACTUAL LOCATION IN DEGREES
+3 3 ACTUAL LOCATION IN DECIDEGREES
+4 4 ACTUAL LOCATION IN CENTIDEGREES
+5 5 REFERENCED TO CHECKPOINT IN SECONDS
+6 6 REFERENCED TO CHECKPOINT IN MINUTES
+7 7 REFERENCED TO CHECKPOINT IN DEGREES
+8 8 REFERENCED TO CHECKPOINT IN DECIDEGREES
+9 9 REFERENCED TO CHECKPOINT IN CENTIDEGREES
+10 10 ACTUAL LOCATION IN TENTHS OF A MINUTE
+11 11 REFERENCED TO CHECKPOINT IN TENTHS OF A MINUTE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2080.table b/definitions/bufr/tables/0/wmo/43/codetables/2080.table
new file mode 100644
index 000000000..cf1695b29
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2080.table
@@ -0,0 +1,8 @@
+0 0 KAYSAM
+1 1 TOTEX
+2 2 KKS
+3 3 GUANGZHOU SHUANGYI (CHINA)
+4 4 CHEMCHINA ZHUZHOU (CHINA)
+5 5 WINDBORNE
+62 62 OTHER
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2081.table b/definitions/bufr/tables/0/wmo/43/codetables/2081.table
new file mode 100644
index 000000000..dfe9551a9
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2081.table
@@ -0,0 +1,11 @@
+0 0 GP26
+1 1 GP28
+2 2 GP30
+3 3 HM26
+4 4 HM28
+5 5 HM30
+6 6 SV16
+7 7 TOTEX TA TYPE BALLOONS
+8 8 TOTEX TX TYPE BALLOONS
+30 30 OTHER
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2083.table b/definitions/bufr/tables/0/wmo/43/codetables/2083.table
new file mode 100644
index 000000000..611c5bf64
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2083.table
@@ -0,0 +1,7 @@
+0 0 HIGH BAY
+1 1 LOW BAY
+2 2 BALLOON-INFLATED LAUNCH SYSTEM (BILS)
+3 3 ROOF-TOP BILS
+4 4 AUTOMATED UNMANNED SOUNDING SYSTEM
+14 14 OTHER
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2084.table b/definitions/bufr/tables/0/wmo/43/codetables/2084.table
new file mode 100644
index 000000000..be6430ae6
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2084.table
@@ -0,0 +1,5 @@
+0 0 HYDROGEN
+1 1 HELIUM
+2 2 NATURAL GAS
+14 14 OTHER
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2092.table b/definitions/bufr/tables/0/wmo/43/codetables/2092.table
new file mode 100644
index 000000000..b171b55c8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2092.table
@@ -0,0 +1,4 @@
+0 0 UV CHANNEL BASED RETRIEVAL
+1 1 VISIBLE CHANNEL BASED RETRIEVAL
+2 2 COMBINED UV BASED RETRIEVAL AND VISIBLE BASED RETRIEVAL
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2095.table b/definitions/bufr/tables/0/wmo/43/codetables/2095.table
new file mode 100644
index 000000000..580fe930c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2095.table
@@ -0,0 +1,7 @@
+0 0 CAPACITANCE ANEROID
+1 1 DERIVED FROM GPS
+2 2 RESISTIVE STRAIN GAUGE
+3 3 SILICON CAPACITOR
+4 4 DERIVED FROM RADAR HEIGHT
+30 30 OTHER
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2096.table b/definitions/bufr/tables/0/wmo/43/codetables/2096.table
new file mode 100644
index 000000000..9f1b1027c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2096.table
@@ -0,0 +1,9 @@
+0 0 ROD THERMISTOR
+1 1 BEAD THERMISTOR
+2 2 CAPACITANCE BEAD
+3 3 CAPACITANCE WIRE
+4 4 RESISTIVE SENSOR
+5 5 CHIP THERMISTOR
+6 6 MERCURY
+7 7 ALCOHOL/GLYCOL
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2097.table b/definitions/bufr/tables/0/wmo/43/codetables/2097.table
new file mode 100644
index 000000000..309ef642a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2097.table
@@ -0,0 +1,26 @@
+0 0 VIZ MARK II CARBON HYGRISTOR
+1 1 VIZ B2 HYGRISTOR
+2 2 VAISALA A-HUMICAP
+3 3 VAISALA H-HUMICAP
+4 4 CAPACITANCE SENSOR
+5 5 VAISALA RS90
+6 6 SIPPICAN MARK IIA CARBON HYGRISTOR
+7 7 TWIN ALTERNATIVELY HEATED HUMICAP CAPACITANCE SENSOR
+8 8 HUMICAP CAPACITANCE SENSOR WITH ACTIVE DE-ICING METHOD
+9 9 CARBON HYGRISTOR
+10 10 PSYCHROMETER
+11 11 CAPACITIVE (POLYMER)
+12 12 CAPACITIVE (CERAMIC, INCLUDING METAL OXIDE)
+13 13 RESISTIVE (GENERIC)
+14 14 RESISTIVE (SALT POLYMER)
+15 15 RESISTIVE (CONDUCTIVE POLYMER)
+16 16 THERMAL CONDUCTIVITY
+17 17 GRAVIMETRIC
+18 18 PAPER-METAL COIL
+19 19 ORDINARY HUMAN HAIR
+20 20 ROLLED HAIR (TORSION)
+21 21 GOLDBEATER'S SKIN
+22 22 CHILLED MIRROR HYGROMETER
+23 23 DEW CELL
+24 24 OPTICAL ABSORPTION SENSOR
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2099.table b/definitions/bufr/tables/0/wmo/43/codetables/2099.table
new file mode 100644
index 000000000..74cb817c9
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2099.table
@@ -0,0 +1,5 @@
+0 0 HH POLARIZATION
+1 1 VV POLARIZATION
+2 2 HV POLARIZATION REAL VALUED COMPONENT
+3 3 HV POLARIZATION IMAGINARY VALUED COMPONENT
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2101.table b/definitions/bufr/tables/0/wmo/43/codetables/2101.table
new file mode 100644
index 000000000..efdb3ec56
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2101.table
@@ -0,0 +1,10 @@
+0 0 CENTRE FRONT-FED PARABOLOID
+1 1 OFFSET FRONT-FED PARABOLOID
+2 2 CENTRE CASSEGRAIN PARABOLOID
+3 3 OFFSET CASSEGRAIN PARABOLOID
+4 4 PLANAR ARRAY
+5 5 COAXIAL-COLLINEAR ARRAY
+6 6 YAGI ELEMENTS ARRAY
+7 7 MICROSTRIP
+14 14 OTHER
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21026.table b/definitions/bufr/tables/0/wmo/43/codetables/21026.table
new file mode 100644
index 000000000..819a6ebfd
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21026.table
@@ -0,0 +1,4 @@
+0 0 NOMINAL
+1 1 CLOSE TO NOMINAL
+2 2 FAR FROM NOMINAL
+7 7 MISSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2103.table b/definitions/bufr/tables/0/wmo/43/codetables/2103.table
new file mode 100644
index 000000000..417d2c9a4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2103.table
@@ -0,0 +1 @@
+1 1 RADAR ANTENNA IS PROTECTED BY A RADOME
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2104.table b/definitions/bufr/tables/0/wmo/43/codetables/2104.table
new file mode 100644
index 000000000..e39a15365
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2104.table
@@ -0,0 +1,9 @@
+0 0 HORIZONTAL POLARIZATION
+1 1 VERTICAL POLARIZATION
+2 2 RIGHT CIRCULAR POLARIZATION
+3 3 LEFT CIRCULAR POLARIZATION
+4 4 HORIZONTAL AND VERTICAL POLARIZATION
+5 5 RIGHT AND LEFT CIRCULAR POLARIZATION
+6 6 QUASI-HORIZONTAL POLARIZATION
+7 7 QUASI-VERTICAL POLARIZATION
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21066.table b/definitions/bufr/tables/0/wmo/43/codetables/21066.table
new file mode 100644
index 000000000..9bcafea2a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21066.table
@@ -0,0 +1,11 @@
+1 1 PROCESSING EQUIPMENT NOT WORKING
+2 2 EQUIPMENT FAILED
+3 3 PRF CODE CHANGED DURING IMAGE GENERATION
+4 4 SAMPLING WINDOW CHANGED DURING IMAGE GENERATION
+5 5 GAIN CHANGED DURING IMAGE GENERATION
+6 6 CHIRP REPLICA EXCEEDS SPECIFIED VALUE
+7 7 INPUT DATA MEAN AND STANDARD DEVIATION OF IN-PHASE AND QUADRATURE OUT OF RANGE
+8 8 DOPPLER CENTROID CONFIDENCE > MMCC VALUE
+9 9 DOPPLER CENTROID ABSOLUTE VALUE > PRF/2
+10 10 DOPPLER AMBIGUITY CONFIDENCE < MMCC VALUE
+11 11 OUTPUT DATA MEAN AND STANDARD DEVIATION =< MMCC VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21067.table b/definitions/bufr/tables/0/wmo/43/codetables/21067.table
new file mode 100644
index 000000000..a0ed399e4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21067.table
@@ -0,0 +1,12 @@
+1 1 NO FOREBEAM CALCULATION
+2 2 NO MIDBEAM CALCULATION
+3 3 NO AFTBEAM CALCULATION
+4 4 FOREBEAM ARCING DETECTED
+5 5 MIDBEAM ARCING DETECTED
+6 6 AFTBEAM ARCING DETECTED
+7 7 ANY BEAM NOISE CONTENT ABOVE OR EQUAL TO THRESHOLD
+8 8 LAND (ANY LAND IN CELL FOOTPRINT)
+9 9 AUTONOMOUS AMBIGUITY REMOVAL NOT USED
+10 10 METEOROLOGICAL BACKGROUND NOT USED
+11 11 MINIMUM RESIDUAL EXCEEDED THRESHOLD
+12 12 FRAME CHECKSUM ERROR DETECTED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21068.table b/definitions/bufr/tables/0/wmo/43/codetables/21068.table
new file mode 100644
index 000000000..102171f44
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21068.table
@@ -0,0 +1,7 @@
+1 1 STANDARD DEVIATION OF WIND SPEED OUTSIDE MMCC LIMIT
+2 2 STANDARD DEVIATION OF SIGNIFICANT WAVE HEIGHT OUTSIDE MMCC LIMIT
+3 3 STANDARD DEVIATION OF ALTITUDE OUTSIDE MMCC LIMIT
+4 4 MEAN PEAKINESS OUTSIDE MMCC LIMIT
+5 5 FRAME CHECKSUM ERROR DETECTED
+6 6 HEIGHT-TIME LOOP TIME CONSTANT CORRECTION NOT PERFORMED
+7 7 NOT ENOUGH MEASUREMENTS (N < 10)
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21069.table b/definitions/bufr/tables/0/wmo/43/codetables/21069.table
new file mode 100644
index 000000000..b258fae22
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21069.table
@@ -0,0 +1,9 @@
+1 1 12.0 MICRON CHANNEL PRESENT IN SOURCE DATA
+2 2 11.0 MICRON CHANNEL PRESENT IN SOURCE DATA
+3 3 3.7 MICRON CHANNEL PRESENT IN SOURCE DATA
+4 4 1.6 MICRON CHANNEL PRESENT IN SOURCE DATA
+5 5 CLOUD IDENTIFICATION USED 1.6 MICRON HISTOGRAM REFLECTANCE CLOUD TEST
+6 6 1.6 MICRON HISTOGRAM REFLECTANCE CLOUD TEST USED DYNAMIC THRESHOLD
+7 7 SUN GLINT DETECTED BY 1.6 MICRON REFLECTANCE CLOUD TEST
+8 8 3.7 MICRON CHANNEL USED IN SEA-SURFACE TEMPERATURE RETRIEVAL
+9 9 SEA-SURFACE TEMPERATURE DERIVATION USED DAYTIME DATA (NIGHT-TIME IF ZERO)
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21070.table b/definitions/bufr/tables/0/wmo/43/codetables/21070.table
new file mode 100644
index 000000000..669655f00
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21070.table
@@ -0,0 +1,22 @@
+1 1 CELL 1: NADIR-ONLY VIEW SST USED 3.7 MICRON CHANNEL
+2 2 CELL 2: NADIR-ONLY VIEW SST USED 3.7 MICRON CHANNEL
+3 3 CELL 3: NADIR-ONLY VIEW SST USED 3.7 MICRON CHANNEL
+4 4 CELL 4: NADIR-ONLY VIEW SST USED 3.7 MICRON CHANNEL
+5 5 CELL 5: NADIR-ONLY VIEW SST USED 3.7 MICRON CHANNEL
+6 6 CELL 6: NADIR-ONLY VIEW SST USED 3.7 MICRON CHANNEL
+7 7 CELL 7: NADIR-ONLY VIEW SST USED 3.7 MICRON CHANNEL
+8 8 CELL 8: NADIR-ONLY VIEW SST USED 3.7 MICRON CHANNEL
+9 9 CELL 9: NADIR-ONLY VIEW SST USED 3.7 MICRON CHANNEL
+10 10 CELL 1: DUAL VIEW SST USED 3.7 MICRON CHANNEL
+11 11 CELL 2: DUAL VIEW SST USED 3.7 MICRON CHANNEL
+12 12 CELL 3: DUAL VIEW SST USED 3.7 MICRON CHANNEL
+13 13 CELL 4: DUAL VIEW SST USED 3.7 MICRON CHANNEL
+14 14 CELL 5: DUAL VIEW SST USED 3.7 MICRON CHANNEL
+15 15 CELL 6: DUAL VIEW SST USED 3.7 MICRON CHANNEL
+16 16 CELL 7: DUAL VIEW SST USED 3.7 MICRON CHANNEL
+17 17 CELL 8: DUAL VIEW SST USED 3.7 MICRON CHANNEL
+18 18 CELL 9: DUAL VIEW SST USED 3.7 MICRON CHANNEL
+19 19 NADIR VIEW CONTAINS DAY-TIME DATA (NIGHT IF ZERO)
+20 20 FORWARD VIEW CONTAINS DAY-TIME DATA (NIGHT IF ZERO)
+21 21 RECORD CONTAINS CONTRIBUTIONS FROM INSTRUMENT SCANS ACQUIRED WHEN ERS PLATFORM NOT IN YAW-STEERING MODE
+22 22 RECORD CONTAINS CONTRIBUTIONS FROM INSTRUMENT SCANS FOR WHICH PRODUCT CONFIDENCE DATA SHOW QUALITY IS POOR OR UNKNOWN
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21072.table b/definitions/bufr/tables/0/wmo/43/codetables/21072.table
new file mode 100644
index 000000000..99e4b1c29
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21072.table
@@ -0,0 +1,3 @@
+1 1 HEIGHT ERROR CORRECTION APPLIED INSTEAD OF OPEN LOOP CALIBRATION
+2 2 MICROWAVE SOUNDER USED FOR TROPOSPHERE CORRECTION
+3 3 AGC OUTPUT CORRECTION APPLIED INSTEAD OF OPEN LOOP CALIBRATION
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21073.table b/definitions/bufr/tables/0/wmo/43/codetables/21073.table
new file mode 100644
index 000000000..9538fa553
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21073.table
@@ -0,0 +1,8 @@
+1 1 BLANK DATA RECORD
+2 2 TEST
+3 3 CALIBRATION (CLOSED LOOP)
+4 4 BITE
+5 5 ACQUISITION ON ICE
+6 6 ACQUISITION ON OCEAN
+7 7 TRACKING ON ICE
+8 8 TRACKING ON OCEAN
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21076.table b/definitions/bufr/tables/0/wmo/43/codetables/21076.table
new file mode 100644
index 000000000..bc52ac558
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21076.table
@@ -0,0 +1,4 @@
+0 0 LINEAR
+1 1 LOGARITHMIC (BASE E)
+2 2 LOGARITHMIC (BASE 10)
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21109.table b/definitions/bufr/tables/0/wmo/43/codetables/21109.table
new file mode 100644
index 000000000..deb577aa0
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21109.table
@@ -0,0 +1,7 @@
+1 1 NOT ENOUGH GOOD SIGMA-0 AVAILABLE FOR WIND RETRIEVAL
+2 2 POOR AZIMUTH DIVERSITY AMONG SIGMA-0 FOR WIND RETRIEVAL
+8 8 SOME PORTION OF WIND VECTOR CELL IS OVER LAND
+9 9 SOME PORTION OF WIND VECTOR CELL IS OVER ICE
+10 10 WIND RETRIEVAL NOT PERFORMED FOR WIND VECTOR CELL
+11 11 REPORTED WIND SPEED IS GREATER THAN 30 M S-1
+12 12 REPORTED WIND SPEED IS LESS THAN OR EQUAL TO 3 M S-1
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21115.table b/definitions/bufr/tables/0/wmo/43/codetables/21115.table
new file mode 100644
index 000000000..9e90133cd
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21115.table
@@ -0,0 +1,10 @@
+1 1 SIGMA-0 MEASUREMENT IS NOT USABLE
+2 2 SIGNAL TO NOISE RATIO IS LOW
+3 3 SIGMA-0 IS NEGATIVE
+4 4 SIGMA-0 IS OUTSIDE OF ACCEPTABLE RANGE
+5 5 SCATTEROMETER PULSE QUALITY IS NOT ACCEPTABLE
+6 6 SIGMA-0 CELL LOCATION ALGORITHM DOES NOT CONVERGE
+7 7 FREQUENCY SHIFT LIES BEYOND THE RANGE OF THE X FACTOR TABLE
+8 8 SPACECRAFT TEMPERATURE IS BEYOND CALIBRATION COEFFICIENT RANGE
+9 9 NO APPLICABLE ALTITUDE RECORDS WERE FOUND FOR THIS SIGMA-0
+10 10 INTERPOLATED EPHEMERIS DATA ARE NOT ACCEPTABLE FOR THIS SIGMA-0
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21116.table b/definitions/bufr/tables/0/wmo/43/codetables/21116.table
new file mode 100644
index 000000000..08d5412e4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21116.table
@@ -0,0 +1,16 @@
+1 1 CALIBRATION/MEASUREMENT PULSE FLAG (1)
+2 2 CALIBRATION/MEASUREMENT PULSE FLAG (2)
+3 3 OUTER ANTENNA BEAM
+4 4 SIGMA-0 CELL IS AFT OF SPACECRAFT
+5 5 CURRENT MODE (1)
+6 6 CURRENT MODE (2)
+7 7 EFFECTIVE GATE WIDTH - SLICE RESOLUTION (1)
+8 8 EFFECTIVE GATE WIDTH - SLICE RESOLUTION (2)
+9 9 EFFECTIVE GATE WIDTH - SLICE RESOLUTION (3)
+10 10 LOW-RESOLUTION MODE - WHOLE PULSE DATA
+11 11 SCATTEROMETER ELECTRONIC SUBSYSTEM B
+12 12 ALTERNATE SPIN RATE - 19.8 RPM
+13 13 RECEIVER PROTECTION ON
+14 14 SLICES PER COMPOSITE FLAG (1)
+15 15 SLICES PER COMPOSITE FLAG (2)
+16 16 SLICES PER COMPOSITE FLAG (3)
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21119.table b/definitions/bufr/tables/0/wmo/43/codetables/21119.table
new file mode 100644
index 000000000..e17e3c04a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21119.table
@@ -0,0 +1,14 @@
+0 0 RESERVED
+1 1 SASS
+2 2 SASS2
+3 3 NSCAT0
+4 4 NSCAT1
+5 5 NSCAT2
+6 6 QSCAT0
+7 7 QSCAT1
+31 31 CMOD1
+32 32 CMOD2
+33 33 CMOD3
+34 34 CMOD4
+35 35 CMOD5
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21144.table b/definitions/bufr/tables/0/wmo/43/codetables/21144.table
new file mode 100644
index 000000000..1f082e6d9
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21144.table
@@ -0,0 +1 @@
+1 1 RAIN
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21148.table b/definitions/bufr/tables/0/wmo/43/codetables/21148.table
new file mode 100644
index 000000000..11413ed72
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21148.table
@@ -0,0 +1,2 @@
+1 1 NON SHORT SCALE VARIATION
+2 2 SHORT SCALE VARIATION
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2115.table b/definitions/bufr/tables/0/wmo/43/codetables/2115.table
new file mode 100644
index 000000000..c7e866c7a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2115.table
@@ -0,0 +1,7 @@
+0 0 PDB
+1 1 RSOIS
+2 2 ASOS
+3 3 PSYCHROMETER
+4 4 F420
+30 30 OTHER
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21150.table b/definitions/bufr/tables/0/wmo/43/codetables/21150.table
new file mode 100644
index 000000000..851004635
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21150.table
@@ -0,0 +1,4 @@
+0 0 DATA FROM SINGLE GROUND STATION (NO CO-LOCATION)
+1 1 DATA FROM MULTIPLE GROUND STATION (CO-LOCATED DATA)
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21155.table b/definitions/bufr/tables/0/wmo/43/codetables/21155.table
new file mode 100644
index 000000000..a7837cfa7
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21155.table
@@ -0,0 +1,16 @@
+1 1 NOT ENOUGH GOOD SIGMA-0 AVAILABLE FOR WIND RETRIEVAL
+2 2 POOR AZIMUTH DIVERSITY AMONG SIGMA-0 FOR WIND RETRIEVAL
+3 3 ANY BEAM NOISE CONTENT ABOVE THRESHOLD
+4 4 PRODUCT MONITORING NOT USED
+5 5 PRODUCT MONITORING FLAG
+6 6 KNMI QUALITY CONTROL FAILS
+7 7 VARIATIONAL QUALITY CONTROL FAILS
+8 8 SOME PORTION OF WIND VECTOR CELL IS OVER LAND
+9 9 SOME PORTION OF WIND VECTOR CELL IS OVER ICE
+10 10 WIND RETRIEVAL NOT PERFORMED FOR WIND VECTOR CELL
+11 11 REPORTED WIND SPEED IS GREATER THAN 30 M/S
+12 12 REPORTED WIND SPEED IS LESS THAN OR EQUAL TO 3 M/S
+13 13 RAIN FLAG FOR THE WIND VECTOR CELL IS NOT USABLE
+14 14 RAIN FLAG ALGORITHM DETECTS RAIN
+15 15 NO METEOROLOGICAL BACKGROUND USED
+16 16 DATA ARE REDUNDANT
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21158.table b/definitions/bufr/tables/0/wmo/43/codetables/21158.table
new file mode 100644
index 000000000..dd53c5159
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21158.table
@@ -0,0 +1,4 @@
+0 0 ACCEPTABLE
+1 1 NOT ACCEPTABLE
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21159.table b/definitions/bufr/tables/0/wmo/43/codetables/21159.table
new file mode 100644
index 000000000..1703f9b8e
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21159.table
@@ -0,0 +1,4 @@
+0 0 GOOD
+1 1 USABLE
+2 2 BAD
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/21169.table b/definitions/bufr/tables/0/wmo/43/codetables/21169.table
new file mode 100644
index 000000000..9b93444ce
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/21169.table
@@ -0,0 +1,4 @@
+0 0 NO ICE PRESENT
+1 1 ICE PRESENT
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2119.table b/definitions/bufr/tables/0/wmo/43/codetables/2119.table
new file mode 100644
index 000000000..0640af68b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2119.table
@@ -0,0 +1,8 @@
+0 0 INTERMEDIATE FREQUENCY CALIBRATION MODE (IF CAL)
+1 1 BUILT-IN TEST EQUIPMENT DIGITAL (BITE DGT)
+2 2 BUILT-IN TEST EQUIPMENT RADIO FREQUENCY (BITE RF)
+3 3 PRESET TRACKING (PSET TRK)
+4 4 PRESET LOOP OUT
+5 5 ACQUISITION
+6 6 TRACKING
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2131.table b/definitions/bufr/tables/0/wmo/43/codetables/2131.table
new file mode 100644
index 000000000..f4336ef79
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2131.table
@@ -0,0 +1 @@
+1 1 STC OPERATIONAL
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2137.table b/definitions/bufr/tables/0/wmo/43/codetables/2137.table
new file mode 100644
index 000000000..40d33fdd3
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2137.table
@@ -0,0 +1,4 @@
+1 1 3:2
+2 2 4:3
+3 3 5:4
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2138.table b/definitions/bufr/tables/0/wmo/43/codetables/2138.table
new file mode 100644
index 000000000..a574506ad
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2138.table
@@ -0,0 +1,3 @@
+1 1 CLOCKWISE ROTATION
+2 2 COUNTERCLOCKWISE ROTATION
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2139.table b/definitions/bufr/tables/0/wmo/43/codetables/2139.table
new file mode 100644
index 000000000..f6cf80294
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2139.table
@@ -0,0 +1,3 @@
+0 0 SIRAL NOMINAL
+1 1 SIRAL REDUNDANT
+2 2 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2143.table b/definitions/bufr/tables/0/wmo/43/codetables/2143.table
new file mode 100644
index 000000000..975d068be
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2143.table
@@ -0,0 +1,21 @@
+0 0 RESERVED
+1 1 BREWER SPECTROPHOTOMETER
+2 2 CAVER TEICHERT
+3 3 DOBSON
+4 4 DOBSON (JAPAN)
+5 5 EHMET
+6 6 FECKER TELESCOPE
+7 7 HOELPER
+8 8 JODMETER
+9 9 FILTER OZONOMETER M-83
+10 10 MAST
+11 11 OXFORD
+12 12 PAETZOLD
+13 13 REGENER
+14 14 RESERVED FOR FUTURE USE
+15 15 VASSY FILTER OZONOMETER
+16 16 CARBON IODIDE
+17 17 SURFACE OZONE BUBBLER
+18 18 FILTER OZONOMETER M-124
+19 19 ECC SONDE
+127 127 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2144.table b/definitions/bufr/tables/0/wmo/43/codetables/2144.table
new file mode 100644
index 000000000..5b0f37b34
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2144.table
@@ -0,0 +1,8 @@
+0 0 DIRECT SUN
+1 1 DIRECT SUN, ATTENUATOR #1
+2 2 DIRECT SUN, ATTENUATOR #2
+3 3 FOCUSED MOON
+4 4 FOCUSED SUN
+5 5 FOCUSED SUN CORRECTED WITH ADJACENT SKY MEASUREMENTS
+6 6 ZENITH SKY
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2145.table b/definitions/bufr/tables/0/wmo/43/codetables/2145.table
new file mode 100644
index 000000000..1944e69fc
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2145.table
@@ -0,0 +1,9 @@
+0 0 WAVELENGTHS AD ORDINARY SETTING
+1 1 WAVELENGTHS BD ORDINARY SETTING
+2 2 WAVELENGTHS CD ORDINARY SETTING
+3 3 WAVELENGTHS CC' ORDINARY SETTING
+4 4 WAVELENGTHS AD FOCUSED IMAGE
+5 5 WAVELENGTHS BD FOCUSED IMAGE
+6 6 WAVELENGTHS CD FOCUSED IMAGE
+7 7 WAVELENGTHS CC' FOCUSED IMAGE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2146.table b/definitions/bufr/tables/0/wmo/43/codetables/2146.table
new file mode 100644
index 000000000..871b35709
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2146.table
@@ -0,0 +1,11 @@
+0 0 ON DIRECT SUN
+1 1 ON DIRECT MOON
+2 2 ON BLUE ZENITH SKY
+3 3 ON ZENITH CLOUD (UNIFORM STRATIFIED LAYER OF SMALL OPACITY)
+4 4 ON ZENITH CLOUD (UNIFORM OR MODERATELY VARIABLE LAYER OF MEDIUM OPACITY)
+5 5 ON ZENITH CLOUD (UNIFORM OR MODERATELY VARIABLE LAYER OF LARGE OPACITY)
+6 6 ON ZENITH CLOUD (HIGHLY VARIABLE OPACITY, WITH OR WITHOUT PRECIPITATION)
+7 7 ON ZENITH CLOUD (FOG)
+8 8 ON ZENITH HAZE
+9 9 ON DIRECT SUN THROUGH THIN CLOUD, FOG OR HAZE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2147.table b/definitions/bufr/tables/0/wmo/43/codetables/2147.table
new file mode 100644
index 000000000..5ef81f4a8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2147.table
@@ -0,0 +1,11 @@
+0 0 RESERVED
+1 1 DIRECT LEASED CIRCUIT
+2 2 DIALLED UP CONNECTION
+3 3 INTERNET ISP
+4 4 DCP VIA SATELLITE (MTSAT, METEOSAT, ETC.)
+5 5 VSAT
+6 6 GAN, BGAN
+7 7 THISS TERMINAL
+8 8 IRIDIUM SATELLITES
+9 9 MOBILE TELEPHONY
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2148.table b/definitions/bufr/tables/0/wmo/43/codetables/2148.table
new file mode 100644
index 000000000..7d8ca51e3
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2148.table
@@ -0,0 +1,12 @@
+0 0 RESERVED
+1 1 ARGOS
+2 2 GPS
+3 3 GOES DCP
+4 4 METEOSAT DCP
+5 5 ORBCOMM
+6 6 INMARSAT
+7 7 IRIDIUM
+8 8 IRIDIUM AND GPS
+9 9 ARGOS-3
+10 10 ARGOS-4
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2149.table b/definitions/bufr/tables/0/wmo/43/codetables/2149.table
new file mode 100644
index 000000000..04638d229
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2149.table
@@ -0,0 +1,38 @@
+0 0 UNSPECIFIED DRIFTING BUOY
+1 1 STANDARD LAGRANGIAN DRIFTER (GLOBAL DRIFTER PROGRAMME)
+2 2 STANDARD FGGE TYPE DRIFTING BUOY (NON-LAGRANGIAN METEOROLOGICAL DRIFTING BUOY)
+3 3 WIND MEASURING FGGE TYPE DRIFTING BUOY (NON-LAGRANGIAN METEOROLOGICAL DRIFTING BUOY)
+4 4 ICE DRIFTER
+5 5 SVPG STANDARD LAGRANGIAN DRIFTER WITH GPS
+6 6 SVP-HR DRIFTER WITH HIGH-RESOLUTION TEMPERATURE OR THERMISTOR STRING
+7 7 RESERVED
+8 8 UNSPECIFIED SUBSURFACE FLOAT
+9 9 SOFAR
+10 10 ALACE
+11 11 MARVOR
+12 12 RAFOS
+13 13 PROVOR
+14 14 SOLO
+15 15 APEX
+16 16 UNSPECIFIED MOORED BUOY
+17 17 NOMAD
+18 18 3-METRE DISCUS
+19 19 10-12-METRE DISCUS
+20 20 ODAS 30 SERIES
+21 21 ATLAS (E.G. TAO AREA)
+22 22 TRITON BUOY
+23 23 FLEX MOORING (E.G. TIP AREA)
+24 24 OMNIDIRECTIONAL WAVERIDER
+25 25 DIRECTIONAL WAVERIDER
+26 26 SUBSURFACE ARGO FLOAT
+27 27 PALACE
+28 28 NEMO
+29 29 NINJA
+30 30 ICE BUOY/FLOAT (POPS OR ITP)
+34 34 MOORING OCEANOGRAPHIC
+35 35 MOORING METEOROLOGICAL
+36 36 MOORING MULTIDISCIPLINARY (OCEANSITES)
+37 37 MOORING TIDE GAUGE OR TSUNAMI BUOY
+38 38 ICE BEACON
+39 39 ICE MASS BALANCE BUOY
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2150.table b/definitions/bufr/tables/0/wmo/43/codetables/2150.table
new file mode 100644
index 000000000..8193b575a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2150.table
@@ -0,0 +1,55 @@
+0 0 RESERVED
+1 1 HIRS 1
+2 2 HIRS 2
+3 3 HIRS 3
+4 4 HIRS 4
+5 5 HIRS 5
+6 6 HIRS 6
+7 7 HIRS 7
+8 8 HIRS 8
+9 9 HIRS 9
+10 10 HIRS 10
+11 11 HIRS 11
+12 12 HIRS 12
+13 13 HIRS 13
+14 14 HIRS 14
+15 15 HIRS 15
+16 16 HIRS 16
+17 17 HIRS 17
+18 18 HIRS 18
+19 19 HIRS 19
+20 20 HIRS 20
+21 21 MSU 1
+22 22 MSU 2
+23 23 MSU 3
+24 24 MSU 4
+25 25 SSU 1
+26 26 SSU 2
+27 27 SSU 3
+28 28 AMSU-A 1
+29 29 AMSU-A 2
+30 30 AMSU-A 3
+31 31 AMSU-A 4
+32 32 AMSU-A 5
+33 33 AMSU-A 6
+34 34 AMSU-A 7
+35 35 AMSU-A 8
+36 36 AMSU-A 9
+37 37 AMSU-A 10
+38 38 AMSU-A 11
+39 39 AMSU-A 12
+40 40 AMSU-A 13
+41 41 AMSU-A 14
+42 42 AMSU-A 15
+43 43 AMSU-B 1 / MHS 1
+44 44 AMSU-B 2 / MHS 2
+45 45 AMSU-B 3 / MHS 3
+46 46 AMSU-B 4 / MHS 4
+47 47 AMSU-B 5 / MHS 5
+48 48 AVHRR 1
+49 49 AVHRR 2
+50 50 AVHRR 3A
+51 51 AVHRR 3B
+52 52 AVHRR 4
+53 53 AVHRR 5
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2151.table b/definitions/bufr/tables/0/wmo/43/codetables/2151.table
new file mode 100644
index 000000000..45c80df10
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2151.table
@@ -0,0 +1,11 @@
+0 0 HIRS
+1 1 MSU
+2 2 SSU
+3 3 AMSU-A1-1
+4 4 AMSU-A1-2
+5 5 AMSU-A2
+6 6 AMSU-B
+7 7 AVHRR
+8 8 RESERVED
+9 9 MHS
+2047 2047 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2152.table b/definitions/bufr/tables/0/wmo/43/codetables/2152.table
new file mode 100644
index 000000000..880c384cf
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2152.table
@@ -0,0 +1,13 @@
+1 1 HIGH-RESOLUTION INFRARED SOUNDER (HIRS)
+2 2 MICROWAVE SOUNDING UNIT (MSU)
+3 3 STRATOSPHERIC SOUNDING UNIT (SSU)
+4 4 AMI WIND MODE
+5 5 AMI WAVE MODE
+6 6 AMI IMAGE MODE
+7 7 RADAR ALTIMETER
+8 8 ATSR
+9 9 GEOSTATIONARY IMAGER
+10 10 GEOSTATIONARY SOUNDER
+11 11 GEOSTATIONARY EARTH RADIATION (GERB)
+12 12 MULTI-CHANNEL SCANNING RADIOMETER
+13 13 POLAR-ORBITING IMAGER
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2158.table b/definitions/bufr/tables/0/wmo/43/codetables/2158.table
new file mode 100644
index 000000000..97c4449c5
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2158.table
@@ -0,0 +1,8 @@
+1 1 MISMATCH IN RED VEC HPA
+2 2 MISMATCH IN RED VEC RFSS
+3 3 PTR CALIBRATION BAND 320 MHZ (KU)
+4 4 PTR CALIBRATION BAND 80 MHZ (KU)
+5 5 PTR CALIBRATION BAND 20 MHZ (KU)
+6 6 PTR CALIBRATION BAND 160 MHZ (S)
+7 7 KU FLIGHT CALIBRATION PARAMETERS AVAILABLE
+8 8 S FLIGHT CALIBRATION PARAMETERS AVAILABLE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2159.table b/definitions/bufr/tables/0/wmo/43/codetables/2159.table
new file mode 100644
index 000000000..63cb87c78
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2159.table
@@ -0,0 +1,7 @@
+1 1 TEMPERATURE INCONSISTENCY
+2 2 DATA IS MISSING
+3 3 REDUNDANCY CHANNEL
+4 4 POWER BUS PROTECTION
+5 5 OVERVOLTAGE/OVERLOAD PROTECTION
+6 6 RESERVED
+7 7 RESERVED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2160.table b/definitions/bufr/tables/0/wmo/43/codetables/2160.table
new file mode 100644
index 000000000..fd7f37274
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2160.table
@@ -0,0 +1,11 @@
+0 0 RESERVED
+1 1 10 TO LESS THAN 20 MM
+2 2 RESERVED
+3 3 20 TO LESS THAN 40 MM
+4 4 RESERVED
+5 5 40 TO LESS THAN 60 MM
+6 6 RESERVED
+7 7 60 TO LESS THAN 90 MM
+8 8 90 TO LESS THAN 110 MM
+9 9 110 MM AND GREATER
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2161.table b/definitions/bufr/tables/0/wmo/43/codetables/2161.table
new file mode 100644
index 000000000..55b88f4de
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2161.table
@@ -0,0 +1,5 @@
+11 11 WIND HEIGHT CALCULATED FROM MEDIAN CLOUD-TOP PRESSURE OF TARGET
+12 12 TARGET IS CLOUDY
+13 13 LOW-LEVEL INVERSION
+14 14 CROSS CORRELATION CONTRIBUTION (CCC) METHOD
+15 15 NESTED TRACKING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2162.table b/definitions/bufr/tables/0/wmo/43/codetables/2162.table
new file mode 100644
index 000000000..510f09aa3
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2162.table
@@ -0,0 +1,19 @@
+0 0 AUTO EDITOR
+1 1 IRW HEIGHT ASSIGNMENT
+2 2 WV HEIGHT ASSIGNMENT
+3 3 H2O INTERCEPT HEIGHT ASSIGNMENT
+4 4 CO2 SLICING HEIGHT ASSIGNMENT
+5 5 LOW PIXEL MAX GRADIENT
+6 6 HIGHER PIXEL MAX GRADIENT
+7 7 PRIMARY HEIGHT ASSIGNMENT
+8 8 LAYER THICKNESS ASSIGNMENT
+9 9 CUMULATIVE CONTRIBUTION FUNCTION - 10 PER CENT HEIGHT
+10 10 CUMULATIVE CONTRIBUTION FUNCTION - 50 PER CENT HEIGHT
+11 11 CUMULATIVE CONTRIBUTION FUNCTION - 90 PER CENT HEIGHT
+12 12 CUMULATIVE CONTRIBUTION FUNCTION - HEIGHT OF MAXIMUM GRADIENT
+13 13 IR/TWO WV CHANNEL RATIONING METHOD
+14 14 COMPOSITE HEIGHT ASSIGNMENT
+15 15 OPTIMAL ESTIMATION
+16 16 INVERSION CORRECTION
+17 17 GEOMETRIC HEIGHT ASSIGNMENT
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2163.table b/definitions/bufr/tables/0/wmo/43/codetables/2163.table
new file mode 100644
index 000000000..8cac63196
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2163.table
@@ -0,0 +1,16 @@
+0 0 AUTO EDITOR
+1 1 IRW HEIGHT ASSIGNMENT
+2 2 WV HEIGHT ASSIGNMENT
+3 3 H2O INTERCEPT HEIGHT ASSIGNMENT
+4 4 CO2 SLICING HEIGHT ASSIGNMENT
+5 5 LOW PIXEL MAX GRADIENT
+6 6 HIGHER PIXEL MAX GRADIENT
+7 7 PRIMARY HEIGHT ASSIGNMENT
+8 8 LAYER THICKNESS ASSIGNMENT
+9 9 CUMULATIVE CONTRIBUTION FUNCTION - 10 PER CENT HEIGHT
+10 10 CUMULATIVE CONTRIBUTION FUNCTION - 50 PER CENT HEIGHT
+11 11 CUMULATIVE CONTRIBUTION FUNCTION - 90 PER CENT HEIGHT
+12 12 CUMULATIVE CONTRIBUTION FUNCTION - HEIGHT OF MAXIMUM GRADIENT
+13 13 IR / TWO WV CHANNEL RATIOING METHOD
+14 14 COMPOSITE HEIGHT ASSIGNMENT
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2164.table b/definitions/bufr/tables/0/wmo/43/codetables/2164.table
new file mode 100644
index 000000000..4bf9aa961
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2164.table
@@ -0,0 +1,5 @@
+0 0 LP - NORMS LEAST SQUARE MINIMUM
+1 1 EN - EUCLIDEAN NORM WITH RADIANCE CORRELATION
+2 2 CC - CROSS CORRELATION
+3 3 STEREO MATCHING
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2165.table b/definitions/bufr/tables/0/wmo/43/codetables/2165.table
new file mode 100644
index 000000000..628be0e75
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2165.table
@@ -0,0 +1,7 @@
+1 1 CLEAR PATH
+2 2 PARTLY CLOUDY PATH
+3 3 CLOUDY PATH
+4 4 APODIZED
+5 5 UNAPODIZED
+6 6 RECONSTRUCTED
+7 7 CLOUD CLEARED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2166.table b/definitions/bufr/tables/0/wmo/43/codetables/2166.table
new file mode 100644
index 000000000..efac38f8d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2166.table
@@ -0,0 +1,6 @@
+0 0 TYPE NOT DEFINED
+1 1 AUTOMATED STATISTICAL REGRESSION
+2 2 CLEAR PATH
+3 3 PARTLY CLOUDY PATH
+4 4 CLOUDY PATH
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2167.table b/definitions/bufr/tables/0/wmo/43/codetables/2167.table
new file mode 100644
index 000000000..acb2f9d9c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2167.table
@@ -0,0 +1,4 @@
+0 0 METHOD NOT DEFINED
+1 1 1B RAW RADIANCE
+2 2 PROCESSED RADIANCE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2169.table b/definitions/bufr/tables/0/wmo/43/codetables/2169.table
new file mode 100644
index 000000000..bd31667d0
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2169.table
@@ -0,0 +1,5 @@
+0 0 CUP ROTOR
+1 1 PROPELLER ROTOR
+2 2 WIND OBSERVATION THROUGH AMBIENT NOISE (WOTAN)
+3 3 SONIC
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2170.table b/definitions/bufr/tables/0/wmo/43/codetables/2170.table
new file mode 100644
index 000000000..05bab00d7
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2170.table
@@ -0,0 +1,5 @@
+0 0 SPECTRASENSORS WVSS-II, VERSION 1
+1 1 SPECTRASENSORS WVSS-II, VERSION 2
+2 2 SPECTRASENSORS WVSS-II, VERSION 3
+62 62 OTHER
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2172.table b/definitions/bufr/tables/0/wmo/43/codetables/2172.table
new file mode 100644
index 000000000..e10ef52b8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2172.table
@@ -0,0 +1,5 @@
+0 0 RESERVED
+1 1 RETRIEVAL FROM A NADIR SOUNDING
+2 2 RETRIEVAL FROM A LIMB SOUNDING
+3 3 RETRIEVAL FROM AN OCCULTATION SOUNDING
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2175.table b/definitions/bufr/tables/0/wmo/43/codetables/2175.table
new file mode 100644
index 000000000..2cf2a3d55
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2175.table
@@ -0,0 +1,9 @@
+0 0 MANUAL MEASUREMENT
+1 1 TIPPING BUCKET METHOD
+2 2 WEIGHING METHOD
+3 3 OPTICAL METHOD
+4 4 PRESSURE METHOD
+5 5 FLOAT METHOD
+6 6 DROP COUNTER METHOD
+14 14 OTHERS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2176.table b/definitions/bufr/tables/0/wmo/43/codetables/2176.table
new file mode 100644
index 000000000..2c27a6f91
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2176.table
@@ -0,0 +1,6 @@
+0 0 MANUAL OBSERVATION
+1 1 VIDEO CAMERA METHOD
+2 2 INFRARED METHOD
+3 3 LASER METHOD
+14 14 OTHERS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2177.table b/definitions/bufr/tables/0/wmo/43/codetables/2177.table
new file mode 100644
index 000000000..e7bb67a7d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2177.table
@@ -0,0 +1,6 @@
+0 0 MANUAL OBSERVATION
+1 1 ULTRASONIC METHOD
+2 2 VIDEO CAMERA METHOD
+3 3 LASER METHOD
+14 14 OTHERS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2178.table b/definitions/bufr/tables/0/wmo/43/codetables/2178.table
new file mode 100644
index 000000000..f4f8b592c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2178.table
@@ -0,0 +1,5 @@
+0 0 MANUAL OBSERVATION
+1 1 OPTICAL METHOD
+2 2 CAPACITIVE METHOD
+14 14 OTHERS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2179.table b/definitions/bufr/tables/0/wmo/43/codetables/2179.table
new file mode 100644
index 000000000..9e9ba189a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2179.table
@@ -0,0 +1,6 @@
+0 0 MANUAL OBSERVATION
+1 1 VAISALA ALGORITHM
+2 2 ASOS (FAA) ALGORITHM
+3 3 AWOS (CANADA) ALGORITHM
+14 14 OTHERS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2180.table b/definitions/bufr/tables/0/wmo/43/codetables/2180.table
new file mode 100644
index 000000000..0b21b2c26
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2180.table
@@ -0,0 +1,8 @@
+0 0 MANUAL OBSERVATION
+1 1 OPTICAL SCATTER SYSTEM COMBINED WITH PRECIPITATION OCCURRENCE SENSING SYSTEM
+2 2 FORWARD AND/OR BACKSCATTER SYSTEM OF VISIBLE LIGHT
+3 3 FORWARD AND/OR BACKSCATTER SYSTEM OF INFRARED LIGHT
+4 4 INFRARED LIGHT EMITTING DIODE (IRED) SYSTEM
+5 5 DOPPLER RADAR SYSTEM
+14 14 OTHERS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2181.table b/definitions/bufr/tables/0/wmo/43/codetables/2181.table
new file mode 100644
index 000000000..5096dc48a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2181.table
@@ -0,0 +1,5 @@
+1 1 RAIN DETECTOR
+2 2 FREEZING RAIN SENSOR
+3 3 ICE DETECTION SENSOR
+4 4 HAIL AND ICE PELLET SENSOR
+20 20 OTHERS
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2182.table b/definitions/bufr/tables/0/wmo/43/codetables/2182.table
new file mode 100644
index 000000000..4ffab2652
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2182.table
@@ -0,0 +1,7 @@
+0 0 MANUAL MEASUREMENT
+1 1 TRANSMISSOMETER SYSTEM (BASE > 25 M)
+2 2 TRANSMISSOMETER SYSTEM (BASE < 25 M)
+3 3 FORWARD SCATTER SYSTEM
+4 4 BACKSCATTER SYSTEM
+14 14 OTHERS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2183.table b/definitions/bufr/tables/0/wmo/43/codetables/2183.table
new file mode 100644
index 000000000..a804ea1e1
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2183.table
@@ -0,0 +1,9 @@
+0 0 MANUAL OBSERVATION
+1 1 CEILOMETER SYSTEM
+2 2 INFRARED CAMERA SYSTEM
+3 3 MICROWAVE VISUAL CAMERA SYSTEM
+4 4 SKY IMAGER SYSTEM
+5 5 VIDEO TIME-LAPSED CAMERA SYSTEM
+6 6 MICROPULSE LIDAR (MPL) SYSTEM
+14 14 OTHERS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2184.table b/definitions/bufr/tables/0/wmo/43/codetables/2184.table
new file mode 100644
index 000000000..cf5ee84ac
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2184.table
@@ -0,0 +1,9 @@
+0 0 MANUAL OBSERVATION
+1 1 LIGHTNING IMAGING SENSOR
+2 2 ELECTRICAL STORM IDENTIFICATION SENSOR
+3 3 MAGNETIC FINDER SENSOR
+4 4 LIGHTNING STRIKE SENSOR
+5 5 FLASH COUNTER
+6 6 ATDNET VLF WAVEFORM CORRELATED SENSOR
+14 14 OTHERS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2185.table b/definitions/bufr/tables/0/wmo/43/codetables/2185.table
new file mode 100644
index 000000000..45b081051
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2185.table
@@ -0,0 +1,7 @@
+0 0 MANUAL MEASUREMENT
+1 1 BALANCED FLOATING METHOD
+2 2 PRESSURE METHOD
+3 3 ULTRASONIC METHOD
+4 4 HYDRAULIC METHOD
+14 14 OTHERS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2186.table b/definitions/bufr/tables/0/wmo/43/codetables/2186.table
new file mode 100644
index 000000000..2a9e71004
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2186.table
@@ -0,0 +1,24 @@
+1 1 PRECIPITATION-UNKNOWN TYPE
+2 2 LIQUID PRECIPITATION NOT FREEZING
+3 3 LIQUID FREEZING PRECIPITATION
+4 4 DRIZZLE
+5 5 RAIN
+6 6 SOLID PRECIPITATION
+7 7 SNOW
+8 8 SNOW GRAINS
+9 9 SNOW PELLETS
+10 10 ICE PELLETS
+11 11 ICE CRYSTALS
+12 12 DIAMOND DUST
+13 13 SMALL HAIL
+14 14 HAIL
+15 15 GLAZE
+16 16 RIME
+17 17 SOFT RIME
+18 18 HARD RIME
+19 19 CLEAR ICE
+20 20 WET SNOW
+21 21 HOAR FROST
+22 22 DEW
+23 23 WHITE DEW
+24 24 CONVECTIVE PRECIPITATION
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2187.table b/definitions/bufr/tables/0/wmo/43/codetables/2187.table
new file mode 100644
index 000000000..def3d2feb
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2187.table
@@ -0,0 +1,11 @@
+1 1 DUST/SAND WHIRL
+2 2 SQUALLS
+3 3 SAND STORM
+4 4 DUST STORM
+5 5 LIGHTNING - CLOUD TO SURFACE
+6 6 LIGHTNING - CLOUD TO CLOUD
+7 7 LIGHTNING - DISTANT
+8 8 THUNDERSTORM
+9 9 FUNNEL CLOUD NOT TOUCHING SURFACE
+10 10 FUNNEL CLOUD TOUCHING SURFACE
+11 11 SPRAY
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2188.table b/definitions/bufr/tables/0/wmo/43/codetables/2188.table
new file mode 100644
index 000000000..bb8114ca8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2188.table
@@ -0,0 +1,10 @@
+1 1 FOG
+2 2 ICE FOG
+3 3 STEAM FOG
+7 7 MIST
+8 8 HAZE
+9 9 SMOKE
+10 10 VOLCANIC ASH
+11 11 DUST
+12 12 SAND
+13 13 SNOW
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2189.table b/definitions/bufr/tables/0/wmo/43/codetables/2189.table
new file mode 100644
index 000000000..61ac9e322
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2189.table
@@ -0,0 +1,4 @@
+1 1 MANUAL OBSERVATION
+2 2 ALL LIGHTNING STRIKES WITHOUT DISCRIMINATION
+3 3 LIGHTNING STRIKES CLOUD TO GROUND ONLY
+4 4 ALL LIGHTNING STRIKES WITH DISCRIMINATION BETWEEN CLOUD TO GROUND AND CLOUD TO CLOUD
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/2191.table b/definitions/bufr/tables/0/wmo/43/codetables/2191.table
new file mode 100644
index 000000000..2e96256c7
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/2191.table
@@ -0,0 +1,4 @@
+0 0 GEOPOTENTIAL HEIGHT CALCULATED FROM PRESSURE
+1 1 GEOPOTENTIAL HEIGHT CALCULATED FROM GPS HEIGHT
+2 2 GEOPOTENTIAL HEIGHT CALCULATED FROM RADAR HEIGHT
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/22056.table b/definitions/bufr/tables/0/wmo/43/codetables/22056.table
new file mode 100644
index 000000000..28ddbf4e4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/22056.table
@@ -0,0 +1,4 @@
+0 0 UPWARDS PROFILE
+1 1 DOWNWARDS PROFILE
+2 2 HORIZONTAL
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/22060.table b/definitions/bufr/tables/0/wmo/43/codetables/22060.table
new file mode 100644
index 000000000..b73ad3235
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/22060.table
@@ -0,0 +1,4 @@
+0 0 DROGUE IS DETACHED
+1 1 DROGUE IS ATTACHED
+2 2 DROGUE STATUS UNKNOWN
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/22061.table b/definitions/bufr/tables/0/wmo/43/codetables/22061.table
new file mode 100644
index 000000000..aa8c62bae
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/22061.table
@@ -0,0 +1,11 @@
+0 0 CALM (GLASSY)
+1 1 CALM (RIPPLED)
+2 2 SMOOTH (WAVELETS)
+3 3 SLIGHT
+4 4 MODERATE
+5 5 ROUGH
+6 6 VERY ROUGH
+7 7 HIGH
+8 8 VERY HIGH
+9 9 PHENOMENAL
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/22067.table b/definitions/bufr/tables/0/wmo/43/codetables/22067.table
new file mode 100644
index 000000000..9ec3c9e85
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/22067.table
@@ -0,0 +1,129 @@
+1 1 SIPPICAN T-4
+2 2 SIPPICAN T-4
+11 11 SIPPICAN T-5
+21 21 SIPPICAN FAST DEEP
+31 31 SIPPICAN T-6
+32 32 SIPPICAN T-6
+41 41 SIPPICAN T-7
+42 42 SIPPICAN T-7
+51 51 SIPPICAN DEEP BLUE
+52 52 SIPPICAN DEEP BLUE
+61 61 SIPPICAN T-10
+71 71 SIPPICAN T-11
+81 81 SIPPICAN AXBT (300 M PROBES)
+201 201 TSK T-4
+202 202 TSK T-4
+211 211 TSK T-6
+212 212 TSK T-6
+221 221 TSK T-7
+222 222 TSK T-7
+231 231 TSK T-5
+241 241 TSK T-10
+251 251 TSK DEEP BLUE
+252 252 TSK DEEP BLUE
+261 261 TSK AXBT
+401 401 SPARTON XBT-1
+411 411 SPARTON XBT-3
+421 421 SPARTON XBT-4
+431 431 SPARTON XBT-5
+441 441 SPARTON XBT-5DB
+451 451 SPARTON XBT-6
+461 461 SPARTON XBT-7
+462 462 SPARTON XBT-7
+471 471 SPARTON XBT-7DB
+481 481 SPARTON XBT-10
+491 491 SPARTON XBT-20
+501 501 SPARTON XBT-20DB
+510 510 SPARTON 536 AXBT
+700 700 SIPPICAN XCTD STANDARD
+710 710 SIPPICAN XCTD DEEP
+720 720 SIPPICAN AXCTD
+730 730 SIPPICAN SXCTD
+741 741 TSK XCTD/XCTD-1/XCTD-1N/XCTD-1A
+742 742 TSK XCTD-2/XCTD-2N/XCTD-4A
+743 743 TSK XCTD-2F
+744 744 TSK XCTD-3/XCTD-3N
+745 745 TSK XCTD-4/XCTD-4N
+746 746 TSK XCTP-1
+747 747 TSK XCTP-4
+751 751 TSK AXCTD
+780 780 SEA-BIRD SBE21 SEACAT THERMOSALINOGRAPH
+781 781 SEA-BIRD SBE45 MICROTSG THERMOSALINOGRAPH
+800 800 MECHANICAL BT
+810 810 HYDROCAST
+820 820 THERMISTOR CHAIN
+825 825 TEMPERATURE (SONIC) AND PRESSURE PROBES
+830 830 CTD
+831 831 CTD-P-ALACE FLOAT
+834 834 PROVOR V SBE
+835 835 PROVOR IV
+836 836 PROVOR III
+837 837 ARVOR_C, SBE CONDUCTIVITY SENSOR
+838 838 ARVOR_D, SBE CONDUCTIVITY SENSOR
+839 839 PROVOR-II, SBE CONDUCTIVITY SENSOR
+840 840 PROVOR, NO CONDUCTIVITY SENSOR
+841 841 PROVOR, SEA-BIRD CONDUCTIVITY SENSOR
+842 842 PROVOR, FSI CONDUCTIVITY SENSOR
+843 843 POLAR OCEAN PROFILING SYSTEM (POPS), PROVOR, SBE CTD
+844 844 PROFILING FLOAT, ARVOR, SEA-BIRD CONDUCTIVITY SENSOR
+845 845 WEBB RESEARCH, NO CONDUCTIVITY SENSOR
+846 846 WEBB RESEARCH, SEA-BIRD CONDUCTIVITY SENSOR
+847 847 WEBB RESEARCH, FSI CONDUCTIVITY SENSOR
+848 848 APEX-EM, SBE CONDUCTIVITY SENSOR
+849 849 APEX_D, SBE CONDUCTIVITY SENSOR
+850 850 SOLO, NO CONDUCTIVITY SENSOR
+851 851 SOLO, SEA-BIRD CONDUCTIVITY SENSOR
+852 852 SOLO, FSI CONDUCTIVITY SENSOR
+853 853 PROFILING FLOAT, SOLO2 (SCRIPPS), SEA-BIRD CONDUCTIVITY SENSOR
+854 854 S2A, SBE CONDUCTIVITY SENSOR
+855 855 PROFILING FLOAT, NINJA, NO CONDUCTIVITY SENSOR
+856 856 PROFILING FLOAT, NINJA, SBE CONDUCTIVITY SENSOR
+857 857 PROFILING FLOAT, NINJA, FSI CONDUCTIVITY SENSOR
+858 858 PROFILING FLOAT, NINJA, TSK CONDUCTIVITY SENSOR
+859 859 PROFILING FLOAT, NEMO, NO CONDUCTIVITY SENSOR
+860 860 PROFILING FLOAT, NEMO, SBE CONDUCTIVITY SENSOR
+861 861 PROFILING FLOAT, NEMO, FSI CONDUCTIVITY SENSOR
+862 862 SOLO_D, SBE CONDUCTIVITY SENSOR
+863 863 NAVIS-A, SBE CONDUCTIVITY SENSOR
+864 864 NINJA_D, SBE CONDUCTIVITY SENSOR
+865 865 NOVA, SBE CONDUCTIVITY SENSOR
+866 866 ALAMO, NO CONDUCTIVITY SENSOR
+867 867 ALAMO, RBR CONDUCTIVITY SENSOR
+868 868 ALAMO, SBE CONDUCTIVITY SENSOR
+869 869 NAVIS_EBR, SBE CONDUCTIVITY SENSOR
+870 870 HM2000
+871 871 COPEX
+872 872 S2X
+873 873 ALTO
+874 874 SOLO_D_MRV
+875 875 ALTO RBR
+876 876 ALTO SBE
+877 877 APEX RBR
+878 878 ARVOR RBR
+879 879 SOLO II RBR
+880 880 S2A RBR
+881 881 HM4000 SBE
+882 882 HM6000 SBE
+883 883 APEX_D RBR
+884 884 SOLO_BGC, SBE
+885 885 SOLO_BGC, RBR
+886 886 SOLO_BGC_MRV, SBE
+887 887 SOLO_BGC_MRV, RBR
+888 888 PROVOR_V - JUMBO, SBE
+889 889 PROVOR_V - JUMBO, RBR
+890 890 PROVOR_III - JUMBO, SBE
+891 891 PROVOR_III - JUMBO, RBR
+900 900 SIPPICAN LMP-5 XBT
+901 901 ICE-TETHERED PROFILER (ITP), SBE CTD
+902 902 BROOKE OCEAN MOVING VESSEL PROFILER (MVP)
+903 903 SEA-BIRD CTD
+904 904 AML OCEANOGRAPHIC CTD
+905 905 FALMOUTH SCIENTIFIC CTD
+906 906 OCEAN SENSORS CTD
+907 907 VALEPORT CTD
+908 908 OCEANSCIENCE MVP
+909 909 IDRONAUT CTD
+910 910 SEA-BIRD SBE 38
+995 995 INSTRUMENT ATTACHED TO MARINE MAMMALS
+996 996 INSTRUMENT ATTACHED TO ANIMALS OTHER THAN MARINE MAMMALS
+1023 1023 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/22068.table b/definitions/bufr/tables/0/wmo/43/codetables/22068.table
new file mode 100644
index 000000000..992097fd8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/22068.table
@@ -0,0 +1,43 @@
+1 1 SIPPICAN STRIP CHART RECORDER
+2 2 SIPPICAN MK2A/SSQ-61
+3 3 SIPPICAN MK-9
+4 4 SIPPICAN AN/BHQ-7/MK8
+5 5 SIPPICAN MK-12
+6 6 SIPPICAN MK-21
+7 7 SIPPICAN MK-8 LINEAR RECORDER
+8 8 SIPPICAN MK-10
+10 10 SPARTON SOC BT/SV PROCESSOR MODEL 100
+11 11 LOCKHEED-SANDERS MODEL OL5005
+20 20 ARGOS XBT-ST
+21 21 CLS-ARGOS/PROTECNO XBT-ST MODEL-1
+22 22 CLS-ARGOS/PROTECNO XBT-ST MODEL-2
+30 30 BATHY SYSTEMS SA-810
+31 31 SCRIPPS METROBYTE CONTROLLER
+32 32 MURAYAMA DENKI Z-60-16 III
+33 33 MURAYAMA DENKI Z-60-16 II
+34 34 PROTECNO ETSM2
+35 35 NAUTILUS MARINE SERVICE NMS-XBT
+40 40 TSK MK-2A
+41 41 TSK MK-2S
+42 42 TSK MK-30
+43 43 TSK MK-30N
+45 45 TSK MK-100
+46 46 TSK MK-130 COMPATIBLE RECORDER FOR BOTH XBT AND XCTD
+47 47 TSK MK-130A XCTD RECORDER
+48 48 TSK AXBT RECEIVER MK-300
+49 49 TSK MK-150/MK-150N/MK-200 COMPATIBLE RECORDER FOR BOTH XBT AND XCTD
+50 50 JMA ASTOS
+60 60 ARGOS COMMUNICATIONS, SAMPLING ON UP TRANSIT
+61 61 ARGOS COMMUNICATIONS, SAMPLING ON DOWN TRANSIT
+62 62 ORBCOMM COMMUNICATIONS, SAMPLING ON UP TRANSIT
+63 63 ORBCOMM COMMUNICATIONS, SAMPLING ON DOWN TRANSIT
+64 64 IRIDIUM COMMUNICATIONS, SAMPLING ON UP TRANSIT
+65 65 IRIDIUM COMMUNICATIONS, SAMPLING ON DOWN TRANSIT
+70 70 CSIRO DEVIL-1 XBT ACQUISITION SYSTEM
+71 71 CSIRO DEVIL-2 XBT ACQUISITION SYSTEM
+72 72 TURO/CSIRO QUOLL XBT ACQUISITION SYSTEM
+80 80 APPLIED MICROSYSTEMS LTD., MICRO-SVT&P
+81 81 SEA MAMMAL RESEARCH UNIT, UNIV. ST. ANDREWS, UK, UNCORRECTED SALINITY FROM A SEA MAMMAL MOUNTED INSTRUMENT
+82 82 SEA MAMMAL RESEARCH UNIT, UNIV. ST. ANDREWS, UK, CORRECTED SALINITY FROM A SEA MAMMAL MOUNTED INSTRUMENT
+99 99 UNKNOWN
+127 127 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/22120.table b/definitions/bufr/tables/0/wmo/43/codetables/22120.table
new file mode 100644
index 000000000..8c747ce66
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/22120.table
@@ -0,0 +1,13 @@
+0 0 GOOD DATA
+1 1 MAXIMUM (HIGH) WATER LEVEL LIMIT EXCEEDED
+2 2 MINIMUM (LOW) WATER LEVEL LIMIT EXCEEDED
+3 3 RATE OF CHANGE LIMIT FOR WATER LEVEL EXCEEDED
+4 4 FLAT LIMIT FOR WATER LEVEL EXCEEDED
+5 5 OBSERVED MINUS PREDICTED WATER LEVEL VALUE LIMIT EXCEEDED
+6 6 OBSERVED VALUE FROM PRIMARY WATER LEVEL SENSOR MINUS BACKUP WATER LEVEL SENSOR
+7 7 VALUE EXCEEDED SPECIFIED TOLERANCE FROM EXPECTED VALUE
+8 8 WATER LEVEL QA PARAMETER (SIGMAS AND/OR OUTLIERS) LIMITS EXCEEDED
+9 9 SEA TEMPERATURE OUTSIDE OF EXPECTED RANGE
+10 10 MULTIPLE QC CHECKS (ABOVE) FAILED
+11 11 NO AUTOMATED WATER LEVEL CHECKS PERFORMED
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/22121.table b/definitions/bufr/tables/0/wmo/43/codetables/22121.table
new file mode 100644
index 000000000..7d4dfa821
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/22121.table
@@ -0,0 +1,9 @@
+0 0 OPERATIONAL
+1 1 POSSIBLE CLOGGING PROBLEM OR OTHERWISE DEGRADED WATER LEVEL DATA
+2 2 POSSIBLE DATUM SHIFT
+3 3 UNKNOWN STATUS OF WATER LEVEL SENSOR
+4 4 SUSPECTED OR KNOWN SEA TEMPERATURE SENSOR PROBLEM
+5 5 MULTIPLE POSSIBLE PROBLEMS (ABOVE)
+6 6 BAD DATA - DO NOT DISSEMINATE!
+7 7 NO MANUAL WATER LEVEL CHECKS PERFORMED
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/22122.table b/definitions/bufr/tables/0/wmo/43/codetables/22122.table
new file mode 100644
index 000000000..aa9d5ebbe
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/22122.table
@@ -0,0 +1,8 @@
+0 0 GOOD DATA FROM ALL SENSORS
+1 1 WIND DIRECTION OUTSIDE OF ALLOWABLE RANGE
+2 2 WIND SPEED OUTSIDE OF EXPECTED RANGE
+3 3 BAROMETRIC PRESSURE OUTSIDE OF EXPECTED RANGE
+4 4 AIR TEMPERATURE OUTSIDE OF EXPECTED RANGE
+5 5 MULTIPLE SENSORS FAILED QC CHECKS
+6 6 NO AUTOMATED METEOROLOGICAL DATA CHECKS PERFORMED
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/22123.table b/definitions/bufr/tables/0/wmo/43/codetables/22123.table
new file mode 100644
index 000000000..acfb61609
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/22123.table
@@ -0,0 +1,9 @@
+0 0 OPERATIONAL
+1 1 SUSPECTED OR KNOWN PROBLEM WITH WIND SENSOR
+2 2 SUSPECTED OR KNOWN PROBLEM WITH BAROMETRIC PRESSURE SENSOR
+3 3 SUSPECTED OR KNOWN PROBLEM WITH AIR TEMPERATURE SENSOR
+4 4 UNKNOWN STATUS OF ALL SENSORS
+5 5 SUSPECTED OR KNOWN PROBLEMS WITH MULTIPLE SENSORS
+6 6 BAD DATA - DO NOT DISSEMINATE!
+7 7 NO MANUAL METEOROLOGICAL DATA CHECKS PERFORMED
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/22178.table b/definitions/bufr/tables/0/wmo/43/codetables/22178.table
new file mode 100644
index 000000000..355848cc5
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/22178.table
@@ -0,0 +1,12 @@
+0 0 UNKNOWN
+1 1 LM-2A DECK-MOUNTED
+2 2 LM-3A HAND-HELD
+3 3 LM-4A THRU-HULL
+10 10 AL-12 TSK AUTOLAUNCHER (UP TO 12 PROBES)
+20 20 SIO XBT AUTOLAUNCHER (UP TO 6 PROBES)
+30 30 AOML XBT V6 AUTOLAUNCHER (UP TO 6 DEEP BLUE PROBES)
+31 31 AOML XBT V8.0 AUTOLAUNCHER (UP TO 8 DEEP BLUE PROBES)
+32 32 AOML XBT V8.1 AUTOLAUNCHER (UP TO 8 DEEP BLUE AND FAST DEEP PROBES)
+90 90 CSIRO DEVIL AUTOLAUNCHER
+100 100 MFSTEP AUTOLAUNCHER (MEDITERRANEAN)
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/23001.table b/definitions/bufr/tables/0/wmo/43/codetables/23001.table
new file mode 100644
index 000000000..92ac5deaf
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/23001.table
@@ -0,0 +1,5 @@
+0 0 RESERVED
+1 1 ARTICLES 1 AND 2
+2 2 ARTICLE 3
+3 3 ARTICLE 5.2
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/23002.table b/definitions/bufr/tables/0/wmo/43/codetables/23002.table
new file mode 100644
index 000000000..12815c6a8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/23002.table
@@ -0,0 +1,16 @@
+0 0 RESERVED
+1 1 NUCLEAR REACTOR ON GROUND
+2 2 NUCLEAR REACTOR AT SEA
+3 3 NUCLEAR REACTOR IN SPACE
+4 4 NUCLEAR FUEL FACILITY
+5 5 RADIOACTIVE WASTE MANAGEMENT FACILITY
+6 6 TRANSPORT OF NUCLEAR FUEL OR RADIOACTIVE WASTE
+7 7 STORAGE OF NUCLEAR FUEL OR RADIOACTIVE WASTE
+8 8 MANUFACTURE OF RADIO-ISOTOPES
+9 9 USE OF RADIO-ISOTOPES
+10 10 STORAGE OF RADIO-ISOTOPES
+11 11 DISPOSAL OF RADIO-ISOTOPES
+12 12 TRANSPORT OF RADIO-ISOTOPES
+13 13 USE OF RADIO-ISOTOPES FOR POWER GENERATION
+30 30 OTHER
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/23003.table b/definitions/bufr/tables/0/wmo/43/codetables/23003.table
new file mode 100644
index 000000000..e3e891f9b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/23003.table
@@ -0,0 +1,8 @@
+0 0 NO RELEASE
+1 1 RELEASE TO ATMOSPHERE
+2 2 RELEASE TO WATER
+3 3 RELEASE TO BOTH ATMOSPHERE AND WATER
+4 4 EXPECTED RELEASE TO ATMOSPHERE
+5 5 EXPECTED RELEASE TO WATER
+6 6 EXPECTED RELEASE TO BOTH ATMOSPHERE AND WATER
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/23004.table b/definitions/bufr/tables/0/wmo/43/codetables/23004.table
new file mode 100644
index 000000000..383731cec
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/23004.table
@@ -0,0 +1,6 @@
+0 0 NO COUNTERMEASURES
+1 1 EVACUATION
+2 2 SHELTERING
+3 3 PROPHYLAXIS
+4 4 WATER
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/23005.table b/definitions/bufr/tables/0/wmo/43/codetables/23005.table
new file mode 100644
index 000000000..c5ff5ae75
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/23005.table
@@ -0,0 +1,4 @@
+0 0 INCIDENT STATE DOES NOT UNDERSTAND WHAT HAPPENED
+1 1 INCIDENT STATE KNOWS THE CAUSE OF THE INCIDENT
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/23006.table b/definitions/bufr/tables/0/wmo/43/codetables/23006.table
new file mode 100644
index 000000000..fe7706af4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/23006.table
@@ -0,0 +1,8 @@
+0 0 NO IMPROVEMENT
+1 1 UNSTABLE
+2 2 NO DETERIORATION
+3 3 IMPROVING
+4 4 STABLE
+5 5 DETERIORATING
+6 6 RESERVED
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/23007.table b/definitions/bufr/tables/0/wmo/43/codetables/23007.table
new file mode 100644
index 000000000..59fc043a8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/23007.table
@@ -0,0 +1,5 @@
+0 0 NO RELEASE
+1 1 RELEASE HAS STOPPED
+2 2 RELEASE
+3 3 RELEASE IS CONTINUING
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/23008.table b/definitions/bufr/tables/0/wmo/43/codetables/23008.table
new file mode 100644
index 000000000..4ac5c5837
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/23008.table
@@ -0,0 +1,4 @@
+0 0 GASEOUS
+1 1 PARTICULATE
+2 2 MIXTURE OF GASEOUS AND PARTICULATE
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/23009.table b/definitions/bufr/tables/0/wmo/43/codetables/23009.table
new file mode 100644
index 000000000..4ac5c5837
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/23009.table
@@ -0,0 +1,4 @@
+0 0 GASEOUS
+1 1 PARTICULATE
+2 2 MIXTURE OF GASEOUS AND PARTICULATE
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/23016.table b/definitions/bufr/tables/0/wmo/43/codetables/23016.table
new file mode 100644
index 000000000..ae84bae45
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/23016.table
@@ -0,0 +1,4 @@
+0 0 NO SIGNIFICANT CHEMICAL TOXIC HEALTH EFFECT
+1 1 SIGNIFICANT CHEMICAL TOXIC HEALTH EFFECT POSSIBLE
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/23018.table b/definitions/bufr/tables/0/wmo/43/codetables/23018.table
new file mode 100644
index 000000000..ccdcc456d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/23018.table
@@ -0,0 +1,6 @@
+0 0 RELEASE NO LONGER OCCURRING
+1 1 RELEASE STILL OCCURRING
+2 2 RELEASE EXPECTED TO INCREASE IN NEXT SIX HOURS
+3 3 RELEASE EXPECTED TO REMAIN CONSTANT IN NEXT SIX HOURS
+4 4 RELEASE EXPECTED TO DECREASE IN NEXT SIX HOURS
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/23031.table b/definitions/bufr/tables/0/wmo/43/codetables/23031.table
new file mode 100644
index 000000000..cf20e26ee
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/23031.table
@@ -0,0 +1,4 @@
+0 0 PLUME WILL NOT ENCOUNTER RAIN IN INCIDENT STATE
+1 1 PLUME WILL ENCOUNTER RAIN IN INCIDENT STATE
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/23032.table b/definitions/bufr/tables/0/wmo/43/codetables/23032.table
new file mode 100644
index 000000000..0f439b70d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/23032.table
@@ -0,0 +1,4 @@
+0 0 NO SIGNIFICANT CHANGE EXPECTED WITHIN THE NEXT SIX HOURS
+1 1 ANTICIPATED SIGNIFICANT CHANGE EXPECTED WITHIN THE NEXT SIX HOURS
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/24003.table b/definitions/bufr/tables/0/wmo/43/codetables/24003.table
new file mode 100644
index 000000000..2daa8104b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/24003.table
@@ -0,0 +1,5 @@
+0 0 NOBLE GASES
+1 1 IODINES
+2 2 CAESIUMS
+3 3 TRANSURANICS
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25004.table b/definitions/bufr/tables/0/wmo/43/codetables/25004.table
new file mode 100644
index 000000000..dfe451727
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25004.table
@@ -0,0 +1,4 @@
+0 0 INCOHERENT
+1 1 COHERENT (DOPPLER)
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25005.table b/definitions/bufr/tables/0/wmo/43/codetables/25005.table
new file mode 100644
index 000000000..bc693a7bf
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25005.table
@@ -0,0 +1,4 @@
+0 0 LOGARITHM - 2.5 DB
+1 1 LINEAR
+2 2 SPECIAL
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25006.table b/definitions/bufr/tables/0/wmo/43/codetables/25006.table
new file mode 100644
index 000000000..bf9d1f52a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25006.table
@@ -0,0 +1,5 @@
+0 0 ZH TO R CONVERSION
+1 1 (ZH, ZDR) TO (NO, DO) TO R
+2 2 (Z (F1), Z (F2)) TO ATTENUATION TO R
+6 6 OTHER
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25009.table b/definitions/bufr/tables/0/wmo/43/codetables/25009.table
new file mode 100644
index 000000000..bf34fb227
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25009.table
@@ -0,0 +1,4 @@
+1 1 NONE
+2 2 CALIBRATION TARGET OR SIGNAL
+3 3 AGAINST RAINGAUGES
+4 4 AGAINST OTHER INSTRUMENTS (DISDROMETER - ATTENUATION)
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25010.table b/definitions/bufr/tables/0/wmo/43/codetables/25010.table
new file mode 100644
index 000000000..e88b3ca3c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25010.table
@@ -0,0 +1,8 @@
+0 0 NONE
+1 1 MAP
+2 2 INSERTION OF HIGHER ELEVATION DATA AND MAP
+3 3 ANALYSIS OF THE FLUCTUATING LOGARITHM SIGNAL (CLUTTER DETECTION)
+4 4 EXTRACTION OF THE FLUCTUATING PART OF LINEAR SIGNAL (CLUTTER SUPPRESSION)
+5 5 CLUTTER SUPPRESSION - DOPPLER
+6 6 MULTIPARAMETER ANALYSIS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25011.table b/definitions/bufr/tables/0/wmo/43/codetables/25011.table
new file mode 100644
index 000000000..f73949830
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25011.table
@@ -0,0 +1,4 @@
+0 0 NONE
+1 1 MAP OF CORRECTION FACTORS
+2 2 INTERPOLATION (AZIMUTH OR ELEVATION)
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25012.table b/definitions/bufr/tables/0/wmo/43/codetables/25012.table
new file mode 100644
index 000000000..c869a4ace
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25012.table
@@ -0,0 +1,4 @@
+0 0 HARDWARE
+1 1 SOFTWARE
+2 2 HARDWARE AND SOFTWARE
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25013.table b/definitions/bufr/tables/0/wmo/43/codetables/25013.table
new file mode 100644
index 000000000..b91ea71db
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25013.table
@@ -0,0 +1 @@
+1 1 BRIGHT-BAND CORRECTION
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25015.table b/definitions/bufr/tables/0/wmo/43/codetables/25015.table
new file mode 100644
index 000000000..043e587b6
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25015.table
@@ -0,0 +1 @@
+1 1 RADOME ATTENUATION CORRECTION
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25017.table b/definitions/bufr/tables/0/wmo/43/codetables/25017.table
new file mode 100644
index 000000000..ed48487e1
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25017.table
@@ -0,0 +1 @@
+1 1 PRECIPITATION ATTENUATION CORRECTION
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25020.table b/definitions/bufr/tables/0/wmo/43/codetables/25020.table
new file mode 100644
index 000000000..6133da3bf
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25020.table
@@ -0,0 +1,4 @@
+0 0 FFT (FAST FOURIER TRANSFORM)
+1 1 PPP (PULSE-PAIR PROCESSING)
+2 2 VPC (VECTOR-PHASE CHANGE)
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25021.table b/definitions/bufr/tables/0/wmo/43/codetables/25021.table
new file mode 100644
index 000000000..314716b3b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25021.table
@@ -0,0 +1,5 @@
+1 1 SIMPLE AVERAGE
+2 2 CONSENSUS AVERAGE
+3 3 MEDIAN CHECK
+4 4 VERTICAL CONSISTENCY CHECK
+5 5 OTHER
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25022.table b/definitions/bufr/tables/0/wmo/43/codetables/25022.table
new file mode 100644
index 000000000..95848784f
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25022.table
@@ -0,0 +1,8 @@
+1 1 UNPROCESSED
+2 2 LAND SUSPECTED
+3 3 WIND SPEED TOO LARGE
+4 4 ICE DETECTED
+5 5 RAIN DETECTED (MICROWAVE RETRIEVALS ONLY)
+6 6 CLOUDY DETECTED (INFRA-RED RETRIEVALS ONLY)
+7 7 COSMETIC VALUE
+8 8 SST OUT OF RANGE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25023.table b/definitions/bufr/tables/0/wmo/43/codetables/25023.table
new file mode 100644
index 000000000..e4840dc8c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25023.table
@@ -0,0 +1,8 @@
+1 1 DEFAULT CONFIDENCE VALUE HAS BEEN USED
+2 2 DEFAULT BIAS AND STANDARD DEVIATION HAVE BEEN USED
+3 3 SUN GLINT SUSPECTED
+4 4 SEA ICE RETRIEVAL FOR MICROWAVE DATA
+5 5 HIGH WIND SPEED RETRIEVAL
+6 6 INACCURATE SST DUE TO LOW SST (< 285K) (ONLY APPLIES TO THE TMI INSTRUMENT)
+7 7 RELAXED RAIN CONTAMINATION SUSPECTED
+8 8 POTENTIAL SIDE LOBE CONTAMINATION
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25024.table b/definitions/bufr/tables/0/wmo/43/codetables/25024.table
new file mode 100644
index 000000000..81b26380c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25024.table
@@ -0,0 +1,13 @@
+0 0 UNPROCESSED INFRARED RETRIEVAL
+1 1 CLOUDY RETRIEVALS
+2 2 BAD: DATA THAT ARE PROBABLY CONTAMINATED BY CLOUD
+3 3 SUSPECT DATA
+4 4 ACCEPTABLE DATA
+5 5 EXCELLENT DATA
+6 6 COOL SKIN SUSPECTED
+10 10 UNPROCESSED MICROWAVE RETRIEVAL
+11 11 QUESTIONABLE MICROWAVE RETRIEVAL THAT MAY BE CONTAMINATED
+12 12 ACCEPTABLE MICROWAVE RETRIEVAL
+13 13 HIGH PROBABILITY OF DIURNAL VARIABILITY
+14 14 RESERVED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25029.table b/definitions/bufr/tables/0/wmo/43/codetables/25029.table
new file mode 100644
index 000000000..fb00d01ca
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25029.table
@@ -0,0 +1,5 @@
+1 1 RESERVED
+2 2 CALIBRATION TARGET OR SIGNAL
+3 3 AGAINST RAINGAUGES
+4 4 AGAINST OTHER INSTRUMENTS (DISDROMETER - ATTENUATION)
+5 5 RESERVED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25030.table b/definitions/bufr/tables/0/wmo/43/codetables/25030.table
new file mode 100644
index 000000000..c3235d6e5
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25030.table
@@ -0,0 +1,4 @@
+0 0 RUNNING MEAN SEA-SURFACE TEMPERATURE NOT USED BECAUSE USAGE CRITERIA NOT MET
+1 1 RUNNING MEAN SEA-SURFACE TEMPERATURE NOT USED BECAUSE DATA NOT AVAILABLE
+2 2 RUNNING MEAN SEA-SURFACE TEMPERATURE USED AS PREDICTOR
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25031.table b/definitions/bufr/tables/0/wmo/43/codetables/25031.table
new file mode 100644
index 000000000..16ff950a1
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25031.table
@@ -0,0 +1,6 @@
+0 0 RESERVED
+1 1 NO THINNING APPLIED (ALL NATIVE MODEL LEVELS ARE INCLUDED FROM BASE TO TOP OF PSEUDO-SOUNDING)
+2 2 NATIVE MODEL LEVELS ARE PRESENT ONLY IF THEY ARE SIGNIFICANT LEVELS AS PER REGULATIONS B/C 25 FOR CONVENTIONAL TEMP SOUNDINGS
+3 3 A PREDEFINED SUBSET OF NATIVE MODEL LEVELS IS PRESENT
+4 4 NO NATIVE MODEL LEVELS ARE PRESENT.  ALL PROFILE LEVELS ARE INTERPOLATED TO A PREDEFINED SET OF PRESSURE COORDINATE LEVELS
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25032.table b/definitions/bufr/tables/0/wmo/43/codetables/25032.table
new file mode 100644
index 000000000..9b894f470
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25032.table
@@ -0,0 +1,4 @@
+0 0 RESERVED
+1 1 DATA FROM LOW MODE
+2 2 DATA FROM HIGH MODE
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25033.table b/definitions/bufr/tables/0/wmo/43/codetables/25033.table
new file mode 100644
index 000000000..e7141c078
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25033.table
@@ -0,0 +1,4 @@
+0 0 WIND PROFILER OPERATING IN SUBMODE A
+1 1 WIND PROFILER OPERATING IN SUBMODE B
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25034.table b/definitions/bufr/tables/0/wmo/43/codetables/25034.table
new file mode 100644
index 000000000..473338a40
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25034.table
@@ -0,0 +1,3 @@
+1 1 TEST A PERFORMED AND FAILED
+2 2 TEST B PERFORMED AND FAILED
+3 3 TEST RESULTS INCONCLUSIVE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25035.table b/definitions/bufr/tables/0/wmo/43/codetables/25035.table
new file mode 100644
index 000000000..a0c8faa59
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25035.table
@@ -0,0 +1,8 @@
+0 0 NOT DEFINED
+1 1 INDIVIDUAL VOLTAGE DEFLECTION
+2 2 CURRENT BASED, ABOVE A THRESHOLD
+3 3 VOLTAGE BASED, ABOVE A THRESHOLD
+4 4 CONSENSUS OF SENSORS, CURRENT ABOVE A THRESHOLD
+5 5 CONSENSUS OF SENSORS, VOLTAGE ABOVE A THRESHOLD
+6 6 RESERVED
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25036.table b/definitions/bufr/tables/0/wmo/43/codetables/25036.table
new file mode 100644
index 000000000..79ebd8887
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25036.table
@@ -0,0 +1,4 @@
+0 0 NETWORK OF SEVERAL DIRECTION-FINDERS OPERATING ON THE SAME INDIVIDUAL ATMOSPHERICS
+1 1 NETWORK OF SEVERAL ARRIVAL-TIME STATIONS OPERATING ON THE SAME INDIVIDUAL ATMOSPHERICS
+6 6 SINGLE STATION RANGE BEARING TECHNIQUE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25040.table b/definitions/bufr/tables/0/wmo/43/codetables/25040.table
new file mode 100644
index 000000000..3ddf12e20
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25040.table
@@ -0,0 +1,10 @@
+0 0 NON-SPECIFIC MODE
+1 1 FIRST GUESS DATA
+2 2 CLOUD DATA
+3 3 AVERAGE VECTOR DATA
+4 4 PRIMARY DATA
+5 5 GUESS DATA
+6 6 VECTOR DATA
+7 7 TRACER DATA; THIS IMAGE
+8 8 TRACER DATA TO NEXT IMAGE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25041.table b/definitions/bufr/tables/0/wmo/43/codetables/25041.table
new file mode 100644
index 000000000..f388da0c2
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25041.table
@@ -0,0 +1,4 @@
+0 0 DIRECTION ORIGINALLY REPORTED IN TRUE DEGREES
+1 1 DIRECTION ORIGINALLY REPORTED USING CODE TABLE 0700, FM 13
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25042.table b/definitions/bufr/tables/0/wmo/43/codetables/25042.table
new file mode 100644
index 000000000..f3cf05999
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25042.table
@@ -0,0 +1,4 @@
+0 0 SPEED ORIGINALLY REPORTED IN METRES PER SECOND
+1 1 SPEED ORIGINALLY REPORTED USING CODE TABLE 4451, FM 13
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25053.table b/definitions/bufr/tables/0/wmo/43/codetables/25053.table
new file mode 100644
index 000000000..af3413851
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25053.table
@@ -0,0 +1,6 @@
+1 1 GOOD
+2 2 REDUNDANT
+3 3 QUESTIONABLE
+4 4 BAD
+5 5 EXPERIMENTAL
+6 6 PRECIPITATING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25063.table b/definitions/bufr/tables/0/wmo/43/codetables/25063.table
new file mode 100644
index 000000000..a8970eaf4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25063.table
@@ -0,0 +1,4 @@
+0 0 NOT DEFINED
+1 1 MAIN PROCESSOR
+2 2 BACKUP PROCESSOR
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25069.table b/definitions/bufr/tables/0/wmo/43/codetables/25069.table
new file mode 100644
index 000000000..e627613dd
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25069.table
@@ -0,0 +1,7 @@
+1 1 SMOOTHED
+2 2 BASELINE ADJUSTED
+3 3 NORMALIZED TIME INTERVAL
+4 4 OUTLIER CHECKED
+5 5 PLAUSIBILITY CHECKED
+6 6 CONSISTENCY CHECKED
+7 7 INTERPOLATED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25086.table b/definitions/bufr/tables/0/wmo/43/codetables/25086.table
new file mode 100644
index 000000000..294fa6977
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25086.table
@@ -0,0 +1,4 @@
+0 0 DEPTHS ARE NOT CORRECTED
+1 1 DEPTHS ARE CORRECTED
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25090.table b/definitions/bufr/tables/0/wmo/43/codetables/25090.table
new file mode 100644
index 000000000..77c509d1a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25090.table
@@ -0,0 +1,11 @@
+0 0 ORBIT COMPUTED DURING A MANOEUVRE
+1 1 ADJUSTED MISSION OPERATIONS ORBIT
+2 2 EXTRAPOLATED MISSION OPERATIONS ORBIT
+3 3 ADJUSTED (PRELIMINARY/PRECISE) ORBIT
+4 4 (PRELIMINARY/PRECISE) ORBIT IS ESTIMATED DURING A MANOEUVRE PERIOD
+5 5 (PRELIMINARY/PRECISE) ORBIT IS INTERPOLATED OVER A TRACKING DATA GAP
+6 6 (PRELIMINARY/PRECISE) ORBIT IS EXTRAPOLATED FOR A DURATION LESS THAN 1 DAY
+7 7 (PRELIMINARY/PRECISE) ORBIT IS EXTRAPOLATED FOR A DURATION THAT RANGES FROM 1 DAY TO 2 DAYS
+8 8 (PRELIMINARY/PRECISE) ORBIT IS EXTRAPOLATED FOR A DURATION LARGER THAN 2 DAYS, OR THAT THE ORBIT IS EXTRAPOLATED JUST AFTER A MANOEUVRE
+9 9 DORIS DIODE NAVIGATOR ORBIT
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25093.table b/definitions/bufr/tables/0/wmo/43/codetables/25093.table
new file mode 100644
index 000000000..e547e6c81
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25093.table
@@ -0,0 +1,3 @@
+1 1 NO CORRECTION
+2 2 VERTICAL VELOCITY CORRECTION
+7 7 ALL CORRECTIONS
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25095.table b/definitions/bufr/tables/0/wmo/43/codetables/25095.table
new file mode 100644
index 000000000..c446a5045
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25095.table
@@ -0,0 +1 @@
+1 1 ALTIMETER OPERATING (0 IF NOMINAL, 1 IF BACKUP)
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25096.table b/definitions/bufr/tables/0/wmo/43/codetables/25096.table
new file mode 100644
index 000000000..89dcc3914
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25096.table
@@ -0,0 +1,4 @@
+1 1 MODE INDICATOR (0 IF MODE 2, 1 IF MODE 1)
+2 2 MODE 1 CALIBRATION SEQUENCE INDICATOR (0 IF NORMAL DATA TAKING EITHER MODE 1 OR 2, 1 IF MODE 1 CALIBRATION SEQUENCE)  BITS 3 AND 4 INDICATE ACTIVE 23.8 GHZ CHANNEL(S):
+3 3 CHANNEL 2 (0 IF ON, 1 IF OFF)
+4 4 CHANNEL 3 (0 IF ON, 1 IF OFF)
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25097.table b/definitions/bufr/tables/0/wmo/43/codetables/25097.table
new file mode 100644
index 000000000..d4e1e4646
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25097.table
@@ -0,0 +1,11 @@
+0 0 RANGES BETWEEN 0 AND 30 CM
+1 1 RANGES BETWEEN 30 AND 60 CM
+2 2 RANGES BETWEEN 60 AND 90 CM
+3 3 RANGES BETWEEN 90 AND 120 CM
+4 4 RANGES BETWEEN 120 AND 150 CM
+5 5 RANGES BETWEEN 150 AND 180 CM
+6 6 RANGES BETWEEN 180 AND 210 CM
+7 7 RANGES BETWEEN 210 AND 240 CM
+8 8 RANGES BETWEEN 240 AND 270 CM
+9 9 RANGES LARGER THAN 270 CM
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25098.table b/definitions/bufr/tables/0/wmo/43/codetables/25098.table
new file mode 100644
index 000000000..ac736f5c0
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25098.table
@@ -0,0 +1,8 @@
+1 1 KU BAND RANGE
+2 2 C BAND RANGE
+3 3 KU BAND SWH
+4 4 C BAND SWH
+5 5 KU BAND BACKSCATTER COEFFICIENT
+6 6 C BAND BACKSCATTER COEFFICIENT
+7 7 OFF NADIR ANGLE FROM KU BAND WAVEFORM PARAMETERS
+8 8 OFF NADIR ANGLE FROM PLATFORM
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25099.table b/definitions/bufr/tables/0/wmo/43/codetables/25099.table
new file mode 100644
index 000000000..94d679c10
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25099.table
@@ -0,0 +1,6 @@
+1 1 KU BAND RANGE INSTRUMENTAL CORRECTION
+2 2 C BAND RANGE INSTRUMENTAL CORRECTION
+3 3 KU BAND SWH INSTRUMENTAL CORRECTION
+4 4 C BAND SWH INSTRUMENTAL CORRECTION
+5 5 KU BAND BACKSCATTER COEFFICIENT INSTRUMENTAL CORRECTION
+6 6 C BAND BACKSCATTER COEFFICIENT INSTRUMENTAL CORRECTION
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25110.table b/definitions/bufr/tables/0/wmo/43/codetables/25110.table
new file mode 100644
index 000000000..912e01f54
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25110.table
@@ -0,0 +1,6 @@
+1 1 RAW DATA ANALYSIS USED FOR RAW DATA CORRECTION. CORRECTION DONE USING DEFAULT PARAMETERS
+2 2 RAW DATA ANALYSIS USED FOR RAW DATA CORRECTION. CORRECTION DONE USING RAW DATA ANALYSIS RESULTS
+3 3 ANTENNA ELEVATION PATTERN CORRECTION APPLIED
+4 4 NOMINAL CHIRP REPLICA USED
+5 5 RECONSTRUCTED CHIRP USED
+6 6 SLANT RANGE TO GROUND RANGE CONVERSION APPLIED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25112.table b/definitions/bufr/tables/0/wmo/43/codetables/25112.table
new file mode 100644
index 000000000..a2a4ec9d3
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25112.table
@@ -0,0 +1,5 @@
+1 1 BAND SPECIFIC RANGE
+2 2 BAND SPECIFIC SIGNIFICANT WAVE HEIGHT
+3 3 BAND SPECIFIC BACKSCATTER COEFFICIENT
+4 4 OFF NADIR ANGLE FROM BAND SPECIFIC WAVEFORM PARAMETERS
+5 5 OFF NADIR ANGLE FROM PLATFORM
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25113.table b/definitions/bufr/tables/0/wmo/43/codetables/25113.table
new file mode 100644
index 000000000..ef394b626
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25113.table
@@ -0,0 +1,3 @@
+1 1 BAND SPECIFIC RANGE INSTRUMENTAL CORRECTION
+2 2 BAND SPECIFIC SIGNIFICANT WAVE HEIGHT INSTRUMENTAL CORRECTION
+3 3 BAND SPECIFIC BACKSCATTER COEFFICIENT INSTRUMENTAL CORRECTION
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25120.table b/definitions/bufr/tables/0/wmo/43/codetables/25120.table
new file mode 100644
index 000000000..c45b0addf
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25120.table
@@ -0,0 +1,4 @@
+0 0 PERCENTAGE OF DSRS FREE OF PROCESSING ERRORS DURING LEVEL 2 PROCESSING IS GREATER THAN THE ACCEPTABLE THRESHOLD
+1 1 PERCENTAGE OF DSRS FREE OF PROCESSING ERRORS DURING LEVEL 2 PROCESSING IS LESS THAN THE ACCEPTABLE THRESHOLD
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25122.table b/definitions/bufr/tables/0/wmo/43/codetables/25122.table
new file mode 100644
index 000000000..1085ef980
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25122.table
@@ -0,0 +1,4 @@
+0 0 HARDWARE CONFIGURATION FOR RF IS A
+1 1 HARDWARE CONFIGURATION FOR RF IS B
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25123.table b/definitions/bufr/tables/0/wmo/43/codetables/25123.table
new file mode 100644
index 000000000..70f0670e9
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25123.table
@@ -0,0 +1,4 @@
+0 0 HARDWARE CONFIGURATION FOR HPA IS A
+1 1 HARDWARE CONFIGURATION FOR HPA IS B
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25124.table b/definitions/bufr/tables/0/wmo/43/codetables/25124.table
new file mode 100644
index 000000000..c45b0addf
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25124.table
@@ -0,0 +1,4 @@
+0 0 PERCENTAGE OF DSRS FREE OF PROCESSING ERRORS DURING LEVEL 2 PROCESSING IS GREATER THAN THE ACCEPTABLE THRESHOLD
+1 1 PERCENTAGE OF DSRS FREE OF PROCESSING ERRORS DURING LEVEL 2 PROCESSING IS LESS THAN THE ACCEPTABLE THRESHOLD
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25139.table b/definitions/bufr/tables/0/wmo/43/codetables/25139.table
new file mode 100644
index 000000000..39b215e09
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25139.table
@@ -0,0 +1,3 @@
+0 0 L1B
+1 1 L2A
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25150.table b/definitions/bufr/tables/0/wmo/43/codetables/25150.table
new file mode 100644
index 000000000..7b452c327
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25150.table
@@ -0,0 +1,3 @@
+1 1 THE DVORAK'S VIS (VISUAL IMAGERY) INTENSITY ANALYSIS
+2 2 THE DVORAK'S EIR (ENHANCED INFRARED IMAGERY) INTENSITY ANALYSIS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25174.table b/definitions/bufr/tables/0/wmo/43/codetables/25174.table
new file mode 100644
index 000000000..c8a11b6d7
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25174.table
@@ -0,0 +1,13 @@
+1 1 PIXEL IS AFFECTED BY RFI EFFECTS
+2 2 PIXEL IS LOCATED IN THE HEXAGONAL ALIAS DIRECTION CENTRED ON SUN ALIAS
+3 3 PIXEL IS CLOSE TO THE BORDER DELIMITING THE EXTENDED ALIAS FREE ZONE
+4 4 PIXEL IS INSIDE THE EXTENDED ALIAS FREE ZONE
+5 5 PIXEL IS INSIDE THE EXCLUSIVE OF ALIAS FREE ZONE
+6 6 PIXEL IS LOCATED IN A ZONE WHERE A MOON ALIAS WAS RECONSTRUCTED
+7 7 PIXEL IS LOCATED IN A ZONE WHERE SUN REFLECTION HAS BEEN DETECTED
+8 8 PIXEL IS LOCATED IN A ZONE WHERE SUN ALIAS WAS RECONSTRUCTED
+9 9 FLAT TARGET TRANSFORMATION HAS BEEN PERFORMED DURING IMAGE RECONSTRUCTION OF THIS PIXEL
+10 10 SCENE HAS BEEN COMBINED WITH AN ADJUSTMENT SCENE IN OPPOSITE POLARIZATION DURING IMAGE RECONSTRUCTION TO ACCOUNT FOR CROSS-POLARIZATION LEAKAGE
+11 11 DIRECT MOON CORRECTION HAS BEEN PERFORMED DURING IMAGE RECONSTRUCTION OF THIS PIXEL
+12 12 REFLECTED SUN CORRECTION HAS BEEN PERFORMED DURING IMAGE RECONSTRUCTION OF THIS PIXEL
+13 13 DIRECT SUN CORRECTION HAS BEEN PERFORMED DURING IMAGE RECONSTRUCTION OF THIS IMAGE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25181.table b/definitions/bufr/tables/0/wmo/43/codetables/25181.table
new file mode 100644
index 000000000..2c1eabf7c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25181.table
@@ -0,0 +1,3 @@
+0 0 OK
+1 1 PERCENTAGE OF L2B RECORDS FREE OF PROCESSING ERRORS IS LESS THAN ACCEPTABLE THRESHOLD
+2 2 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25182.table b/definitions/bufr/tables/0/wmo/43/codetables/25182.table
new file mode 100644
index 000000000..9827b1dfd
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25182.table
@@ -0,0 +1,3 @@
+0 0 OK
+1 1 PERCENTAGE OF L1B RECORDS FREE OF PROCESSING ERRORS IS LESS THAN ACCEPTABLE THRESHOLD
+2 2 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25184.table b/definitions/bufr/tables/0/wmo/43/codetables/25184.table
new file mode 100644
index 000000000..29005c133
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25184.table
@@ -0,0 +1,3 @@
+0 0 OK
+1 1 PRODUCT AS A DURATION SHORTER THAN THE INPUT PRODUCT
+2 2 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25185.table b/definitions/bufr/tables/0/wmo/43/codetables/25185.table
new file mode 100644
index 000000000..ac18abae4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25185.table
@@ -0,0 +1,2 @@
+0 0 AES 256
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25187.table b/definitions/bufr/tables/0/wmo/43/codetables/25187.table
new file mode 100644
index 000000000..683c09709
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25187.table
@@ -0,0 +1,3 @@
+0 0 VALID
+1 1 INVALID
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25188.table b/definitions/bufr/tables/0/wmo/43/codetables/25188.table
new file mode 100644
index 000000000..b18013f21
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25188.table
@@ -0,0 +1,6 @@
+0 0 PRESSURE ADJUSTED TO MEAN SEA LEVEL FOLLOWING WMO-NO. 8 FOR LOW LEVEL (< 50 M) STATIONS
+1 1 PRESSURE ADJUSTED TO MEAN SEA LEVEL FOLLOWING WMO-NO. 8 FOR STATIONS BELOW 750 M
+2 2 PRESSURE ADJUSTED TO SEA LEVEL FOLLOWING NATIONAL PRACTICE
+3 3 PRESSURE ADJUSTED TO LOCAL WATER LEVEL FOLLOWING NATIONAL PRACTICE
+4 4 PRESSURE NOT CORRECTED FOR HEIGHT
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25190.table b/definitions/bufr/tables/0/wmo/43/codetables/25190.table
new file mode 100644
index 000000000..62fbc7616
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25190.table
@@ -0,0 +1,7 @@
+0 0 LOW-RESOLUTION MODE (LRM)
+1 1 SYNTHETIC APERTURE RADAR (SAR)
+2 2 LRM AND SAR (INTERLEAVED)
+3 3 RESERVED
+4 4 PSEUDO-LRM (PLRM)
+5 5 SAR INTERFEROMETRIC MODE (SARIN)
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/25191.table b/definitions/bufr/tables/0/wmo/43/codetables/25191.table
new file mode 100644
index 000000000..ea22b6872
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/25191.table
@@ -0,0 +1,4 @@
+0 0 OPEN  LOOP
+1 1 CLOSED LOOP
+2 2 OPEN LOOP FIXED GAIN
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/26010.table b/definitions/bufr/tables/0/wmo/43/codetables/26010.table
new file mode 100644
index 000000000..f825040f4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/26010.table
@@ -0,0 +1,25 @@
+1 1 0100 INCLUDED
+2 2 0200 INCLUDED
+3 3 0300 INCLUDED
+4 4 0400 INCLUDED
+5 5 0500 INCLUDED
+6 6 0600 INCLUDED
+7 7 0700 INCLUDED
+8 8 0800 INCLUDED
+9 9 0900 INCLUDED
+10 10 1000 INCLUDED
+11 11 1100 INCLUDED
+12 12 1200 INCLUDED
+13 13 1300 INCLUDED
+14 14 1400 INCLUDED
+15 15 1500 INCLUDED
+16 16 1600 INCLUDED
+17 17 1700 INCLUDED
+18 18 1800 INCLUDED
+19 19 1900 INCLUDED
+20 20 2000 INCLUDED
+21 21 2100 INCLUDED
+22 22 2200 INCLUDED
+23 23 2300 INCLUDED
+24 24 2400 INCLUDED
+25 25 UNKNOWN MIXTURE OF HOURS
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/29001.table b/definitions/bufr/tables/0/wmo/43/codetables/29001.table
new file mode 100644
index 000000000..884b29a84
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/29001.table
@@ -0,0 +1,8 @@
+0 0 GNOMONIC PROJECTION
+1 1 POLAR STEREOGRAPHIC PROJECTION
+2 2 LAMBERT'S CONFORMAL CONIC PROJECTION
+3 3 MERCATOR'S PROJECTION
+4 4 SCANNING CONE (RADAR)
+5 5 RESERVED
+6 6 NO PROJECTION
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/29002.table b/definitions/bufr/tables/0/wmo/43/codetables/29002.table
new file mode 100644
index 000000000..1d7efd0c8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/29002.table
@@ -0,0 +1,4 @@
+0 0 CARTESIAN
+1 1 POLAR
+2 2 OTHER
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3001.table b/definitions/bufr/tables/0/wmo/43/codetables/3001.table
new file mode 100644
index 000000000..e9caa2a14
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3001.table
@@ -0,0 +1,12 @@
+0 0 LAND STATION (SYNOPTIC NETWORK)
+1 1 SHALLOW WATER STATION (FIXED TO SEA/LAKE FLOOR)
+2 2 SHIP
+3 3 RIG/PLATFORM
+4 4 MOORED BUOY
+5 5 DRIFTING BUOY (OR DRIFTER)
+6 6 ICE BUOY
+7 7 LAND STATION (LOCAL NETWORK)
+8 8 LAND VEHICLE
+9 9 AUTONOMOUS MARINE VEHICLE
+10 10 TAG ATTACHED TO MARINE ANIMAL
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3003.table b/definitions/bufr/tables/0/wmo/43/codetables/3003.table
new file mode 100644
index 000000000..cf530237f
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3003.table
@@ -0,0 +1,8 @@
+0 0 SCREEN
+1 1 SLING/WHIRLING
+2 2 UNSCREENED
+3 3 RADIATION SHIELD
+4 4 ASPIRATED (E.G. ASSMANN)
+5 5 OTHER SHELTER
+6 6 HANDHELD
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/30031.table b/definitions/bufr/tables/0/wmo/43/codetables/30031.table
new file mode 100644
index 000000000..80cce26f1
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/30031.table
@@ -0,0 +1,13 @@
+0 0 PPI
+1 1 COMPOSITE
+2 2 CAPPL
+3 3 VERTICAL SECTION
+4 4 ALPHANUMERIC DATA
+5 5 MAP OF SUBJECT CLUTTER
+6 6 MAP
+7 7 TEST PICTURE
+8 8 COMMENTS
+9 9 MAP OF GROUND OCCULTATION
+10 10 MAP OF RADAR BEAM HEIGHT
+14 14 OTHER
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/30032.table b/definitions/bufr/tables/0/wmo/43/codetables/30032.table
new file mode 100644
index 000000000..942cb5d7f
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/30032.table
@@ -0,0 +1,9 @@
+1 1 MAP
+2 2 SATELLITE IR
+3 3 SATELLITE VIS
+4 4 SATELLITE WV
+5 5 SATELLITE MULTISPECTRAL
+6 6 SYNOPTIC OBSERVATIONS
+7 7 FORECAST PARAMETERS
+8 8 LIGHTNING DATA
+15 15 OTHER DATA
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3004.table b/definitions/bufr/tables/0/wmo/43/codetables/3004.table
new file mode 100644
index 000000000..571e234bf
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3004.table
@@ -0,0 +1,11 @@
+0 0 STEVENSON SCREEN
+1 1 MARINE STEVENSON SCREEN
+2 2 CYLINDRICAL SECTION PLATE SHIELD
+3 3 CONCENTRIC TUBE
+4 4 RECTANGULAR SECTION SHIELD
+5 5 SQUARE SECTION SHIELD
+6 6 TRIANGULAR SECTION SHIELD
+7 7 OPEN COVERED LEAN-TO
+8 8 OPEN COVERED INVERTED V ROOF
+9 9 INTEGRATED (E.G. CHILLED MIRROR)
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3008.table b/definitions/bufr/tables/0/wmo/43/codetables/3008.table
new file mode 100644
index 000000000..e321d5562
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3008.table
@@ -0,0 +1,4 @@
+0 0 NATURAL VENTILATION IN USE
+1 1 ARTIFICIAL ASPIRATION IN USE: CONSTANT FLOW AT TIME OF READING
+2 2 ARTIFICIAL ASPIRATION IN USE: VARIABLE FLOW AT TIME OF READING
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3010.table b/definitions/bufr/tables/0/wmo/43/codetables/3010.table
new file mode 100644
index 000000000..75746a1c3
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3010.table
@@ -0,0 +1,12 @@
+0 0 RESERVED
+1 1 ADCP
+2 2 GEK (GEOMAGNETIC ELECTROKINETOGRAPH)
+3 3 SHIP'S SET AND DRIFT DETERMINED BY FIXES 3-6 HOURS APART
+4 4 SHIP'S SET AND DRIFT DETERMINED BY FIXES MORE THAN 6 HOURS BUT LESS THAN 12 HOURS APART
+5 5 DRIFT OF BUOY
+6 6 ADCP
+7 7 ADCP BOTTOM TRACKING MODE
+8 8 ELECTROMAGNETIC SENSOR
+9 9 ROTOR AND VANE
+10 10 LOWERED ADCP
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3011.table b/definitions/bufr/tables/0/wmo/43/codetables/3011.table
new file mode 100644
index 000000000..748826848
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3011.table
@@ -0,0 +1,4 @@
+0 0 DEPTH CALCULATED USING FALL RATE EQUATION
+1 1 DEPTH CALCULATED FROM WATER PRESSURE/EQUATION OF STATE
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3012.table b/definitions/bufr/tables/0/wmo/43/codetables/3012.table
new file mode 100644
index 000000000..35bdeadd5
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3012.table
@@ -0,0 +1,3 @@
+0 0 ANDERRAA OXYGEN OPTODE
+1 1 WINKLER BOTTLE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3016.table b/definitions/bufr/tables/0/wmo/43/codetables/3016.table
new file mode 100644
index 000000000..792788f42
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3016.table
@@ -0,0 +1,9 @@
+0 0 FAST LANE BETWEEN THE WHEEL TRACKS
+1 1 FAST LANE BETWEEN THE WHEEL TRACKS IN THE OPPOSITE DIRECTION
+2 2 FAST LANE IN THE WHEEL TRACKS
+3 3 FAST LANE IN THE WHEEL TRACKS IN THE OPPOSITE DIRECTION
+4 4 SLOW LANE BETWEEN THE WHEEL TRACKS
+5 5 SLOW LANE BETWEEN THE WHEEL TRACKS IN THE OPPOSITE DIRECTION
+6 6 SLOW LANE IN THE WHEEL TRACKS
+7 7 SLOW LANE IN THE WHEEL TRACKS IN THE OPPOSITE DIRECTION
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3017.table b/definitions/bufr/tables/0/wmo/43/codetables/3017.table
new file mode 100644
index 000000000..e94c0a449
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3017.table
@@ -0,0 +1,5 @@
+1 1 AUTOMATIC
+2 2 MANNED
+3 3 EVENT TRIGGERED
+4 4 LONGER TIME PERIOD THAN THE STANDARD
+5 5 RESERVED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3018.table b/definitions/bufr/tables/0/wmo/43/codetables/3018.table
new file mode 100644
index 000000000..b3769ae40
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3018.table
@@ -0,0 +1,22 @@
+0 0 FREE TRACK WITHOUT FURTHER INFORMATION
+1 1 FREE TRACK, EMBANKMENT
+2 2 FREE TRACK, FLAT RELATIVE TO SURROUNDINGS
+3 3 FREE TRACK, WATER BASIN(S) IN VICINITY
+4 4 FREE TRACK, FOREST
+5 5 FREE TRACK, CLEFT
+6 6 FREE TRACK, ON HILLTOP
+7 7 FREE TRACK, ON HILLTOP, FOREST
+8 8 FREE TRACK, IN VALLEY
+9 9 FREE TRACK, IN VALLEY, FOREST
+10 10 FREE TRACK, NORTH INCLINATION
+11 11 FREE TRACK, NORTH INCLINATION, FOREST
+12 12 FREE TRACK, SOUTH INCLINATION
+13 13 FREE TRACK, SOUTH INCLINATION, FOREST
+20 20 BRIDGE WITHOUT FURTHER INFORMATION
+21 21 BRIDGE ACROSS A VALLEY IN AN URBAN AREA
+22 22 BRIDGE ACROSS A VALLEY WITH FOREST/MEADOWS/FIELDS
+23 23 BRIDGE ACROSS STREET/TRACK
+24 24 BRIDGE ACROSS BIG RIVER/CANAL
+25 25 BRIDGE ACROSS RIVER/CANAL OF MEDIUM SIZE
+26 26 BRIDGE ACROSS A SMALL STREAM/LOADING CANAL
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3019.table b/definitions/bufr/tables/0/wmo/43/codetables/3019.table
new file mode 100644
index 000000000..2f55b0028
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3019.table
@@ -0,0 +1,8 @@
+0 0 ASPHALT
+1 1 CONCRETE
+2 2 CONCRETE CONSTRUCTION
+3 3 STEEL-GIRDER CONSTRUCTION
+4 4 BOX GIRDER BRIDGE
+5 5 ORTHOTROPIC SLAB
+6 6 DRAIN ASPHALT
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3020.table b/definitions/bufr/tables/0/wmo/43/codetables/3020.table
new file mode 100644
index 000000000..9f0feaea7
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3020.table
@@ -0,0 +1,5 @@
+0 0 WOOD
+1 1 METAL ALLOY
+2 2 PLASTIC/GRP
+3 3 REED/GRASS/LEAF
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3021.table b/definitions/bufr/tables/0/wmo/43/codetables/3021.table
new file mode 100644
index 000000000..27e1bfad4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3021.table
@@ -0,0 +1,4 @@
+0 0 UNHEATED
+1 1 HEATED
+2 2 NOT APPLICABLE
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3022.table b/definitions/bufr/tables/0/wmo/43/codetables/3022.table
new file mode 100644
index 000000000..daf67e27f
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3022.table
@@ -0,0 +1,4 @@
+0 0 NATIONAL HYDROMETEOROLOGICAL/WEATHER SERVICE
+1 1 OTHER
+2 2 STANDARDS INSTITUTE
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3023.table b/definitions/bufr/tables/0/wmo/43/codetables/3023.table
new file mode 100644
index 000000000..9e683c891
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3023.table
@@ -0,0 +1,8 @@
+0 0 SINGLE V-SECTION LOUVERS
+1 1 OVERLAPPING LOUVERS
+2 2 DOUBLE V-SECTION LOUVERS
+3 3 NON-OVERLAPPING LOUVERS
+4 4 VENTED, NON-LOUVERED
+5 5 NOT APPLICABLE
+6 6 RESERVED FOR FUTURE USE
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3027.table b/definitions/bufr/tables/0/wmo/43/codetables/3027.table
new file mode 100644
index 000000000..8280e8602
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3027.table
@@ -0,0 +1,8 @@
+0 0 SOLO (SINGLE RADIOSONDE)
+1 1 BLOCK
+2 2 BAR
+3 3 CROSS
+4 4 T-RIG
+5 5 DOUBLE T-RIG
+6 6 COMPLEX
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3028.table b/definitions/bufr/tables/0/wmo/43/codetables/3028.table
new file mode 100644
index 000000000..9cc805953
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3028.table
@@ -0,0 +1,8 @@
+0 0 MULTI POINT MANUAL SNOW SURVEY
+1 1 SINGLE POINT MANUAL SNOW WATER EQUIVALENT MEASUREMENT
+2 2 SNOW PILLOW OR SNOW SCALE
+3 3 PASSIVE GAMMA
+4 4 GNSS/GPS METHODS
+5 5 COSMIC RAY ATTENUATION
+6 6 TIME DOMAIN REFLECTOMETRY
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3029.table b/definitions/bufr/tables/0/wmo/43/codetables/3029.table
new file mode 100644
index 000000000..374df7c0e
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3029.table
@@ -0,0 +1,3 @@
+0 0 LEFT HAND SIDE
+1 1 RIGHT HAND SIDE
+7 7 MISSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/3030.table b/definitions/bufr/tables/0/wmo/43/codetables/3030.table
new file mode 100644
index 000000000..48033d8f4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/3030.table
@@ -0,0 +1,3 @@
+0 0 TRANSMITTING
+1 1 RECEIVING
+7 7 MISSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/31021.table b/definitions/bufr/tables/0/wmo/43/codetables/31021.table
new file mode 100644
index 000000000..3b4875d89
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/31021.table
@@ -0,0 +1,10 @@
+0 0 RESERVED
+1 1 1-BIT INDICATOR OF QUALITY
+2 2 2-BIT INDICATOR OF QUALITY
+5 5 8-BIT INDICATOR OF QUALITY CONTROL
+6 6 4-BIT INDICATOR OF QUALITY CONTROL CLASS ACCORDING TO GTSPP
+7 7 PERCENTAGE CONFIDENCE
+8 8 0 = NOT SUSPECTED, 1 = SUSPECTED, 2 = RESERVED, 3 = INFORMATION NOT REQUIRED
+9 9 0 = DATA PRESENT, GOOD, COLLOCATED, 1 = DATA AVAILABLE BUT OF DEGRADED QUALITY AND NOT USED, 2 = NO SPATIOTEMPORALLY COLLOCATED DATA AVAILABLE, 3-14 = NOT USED (RESERVED), 15 = MISSING VALUE
+21 21 1-BIT INDICATOR OF CORRECTION
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/31031.table b/definitions/bufr/tables/0/wmo/43/codetables/31031.table
new file mode 100644
index 000000000..d268b380c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/31031.table
@@ -0,0 +1 @@
+1 1 0 = DATA PRESENT, 1 = DATA NOT PRESENT
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33002.table b/definitions/bufr/tables/0/wmo/43/codetables/33002.table
new file mode 100644
index 000000000..4177c0577
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33002.table
@@ -0,0 +1,4 @@
+0 0 DATA NOT SUSPECT
+1 1 DATA SUSPECT
+2 2 RESERVED
+3 3 QUALITY INFORMATION NOT GIVEN
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33003.table b/definitions/bufr/tables/0/wmo/43/codetables/33003.table
new file mode 100644
index 000000000..7577129b0
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33003.table
@@ -0,0 +1,5 @@
+0 0 DATA NOT SUSPECT
+1 1 DATA SLIGHTLY SUSPECT
+2 2 DATA HIGHLY SUSPECT
+3 3 DATA CONSIDERED UNFIT FOR USE
+7 7 QUALITY INFORMATION NOT GIVEN
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33005.table b/definitions/bufr/tables/0/wmo/43/codetables/33005.table
new file mode 100644
index 000000000..8d7569ad2
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33005.table
@@ -0,0 +1,23 @@
+1 1 NO AUTOMATED METEOROLOGICAL DATA CHECKS PERFORMED
+2 2 PRESSURE DATA SUSPECT
+3 3 WIND DATA SUSPECT
+4 4 AIR TEMPERATURE DATA SUSPECT
+5 5 WET-BULB TEMPERATURE DATA SUSPECT
+6 6 HUMIDITY DATA SUSPECT
+7 7 GROUND TEMPERATURE DATA SUSPECT
+8 8 SOIL TEMPERATURE (DEPTH 1) DATA SUSPECT
+9 9 SOIL TEMPERATURE (DEPTH 2) DATA SUSPECT
+10 10 SOIL TEMPERATURE (DEPTH 3) DATA SUSPECT
+11 11 SOIL TEMPERATURE (DEPTH 4) DATA SUSPECT
+12 12 SOIL TEMPERATURE (DEPTH 5) DATA SUSPECT
+13 13 CLOUD DATA SUSPECT
+14 14 VISIBILITY DATA SUSPECT
+15 15 PRESENT WEATHER DATA SUSPECT
+16 16 LIGHTNING DATA SUSPECT
+17 17 ICE DEPOSIT DATA SUSPECT
+18 18 PRECIPITATION DATA SUSPECT
+19 19 STATE OF GROUND DATA SUSPECT
+20 20 SNOW DATA SUSPECT
+21 21 WATER CONTENT DATA SUSPECT
+22 22 EVAPORATION/EVAPOTRANSPIRATION DATA SUSPECT
+23 23 SUNSHINE DATA SUSPECT
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33006.table b/definitions/bufr/tables/0/wmo/43/codetables/33006.table
new file mode 100644
index 000000000..0ea44a50b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33006.table
@@ -0,0 +1,5 @@
+0 0 SELF-CHECK OK
+1 1 AT LEAST ONE WARNING ACTIVE, NO ALARMS
+2 2 AT LEAST ONE ALARM ACTIVE
+3 3 SENSOR FAILURE
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33015.table b/definitions/bufr/tables/0/wmo/43/codetables/33015.table
new file mode 100644
index 000000000..f585808d0
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33015.table
@@ -0,0 +1,16 @@
+0 0 PASSED ALL CHECKS
+1 1 MISSING DATA CHECK
+2 2 DESCENDING/REASCENDING BALLOON CHECK
+3 3 DATA PLAUSIBILITY CHECK (ABOVE LIMITS)
+4 4 DATA PLAUSIBILITY CHECK (BELOW LIMITS)
+5 5 SUPERADIABATIC LAPSE RATE CHECK
+6 6 LIMITING ANGLES CHECK
+7 7 ASCENSION RATE CHECK
+8 8 EXCESSIVE CHANGE FROM PREVIOUS FLIGHT
+9 9 BALLOON OVERHEAD CHECK
+10 10 WIND SPEED CHECK
+11 11 WIND DIRECTION CHECK
+12 12 DEPENDENCY CHECK
+13 13 DATA VALID BUT MODIFIED
+14 14 DATA OUTLIER CHECK
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33020.table b/definitions/bufr/tables/0/wmo/43/codetables/33020.table
new file mode 100644
index 000000000..ba7a4d4ea
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33020.table
@@ -0,0 +1,8 @@
+0 0 GOOD
+1 1 INCONSISTENT
+2 2 DOUBTFUL
+3 3 WRONG
+4 4 NOT CHECKED
+5 5 HAS BEEN CHANGED
+6 6 ESTIMATED
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33021.table b/definitions/bufr/tables/0/wmo/43/codetables/33021.table
new file mode 100644
index 000000000..e3e67ae8c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33021.table
@@ -0,0 +1,4 @@
+0 0 WITHIN LIMITS
+1 1 OUTSIDE LIMITS
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33022.table b/definitions/bufr/tables/0/wmo/43/codetables/33022.table
new file mode 100644
index 000000000..50ef65feb
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33022.table
@@ -0,0 +1,4 @@
+0 0 GOOD (SEVERAL IDENTICAL REPORTS HAVE BEEN RECEIVED)
+1 1 DUBIOUS (NO IDENTICAL REPORTS HAVE BEEN RECEIVED)
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33023.table b/definitions/bufr/tables/0/wmo/43/codetables/33023.table
new file mode 100644
index 000000000..896c816a9
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33023.table
@@ -0,0 +1,4 @@
+0 0 RELIABLE (LOCATION WAS MADE OVER TWO SATELLITE PASSES)
+1 1 LATEST KNOWN (NO LOCATION OVER THE CORRESPONDING PASS)
+2 2 DUBIOUS (LOCATION MADE OVER ONE PASS ONLY; A SECOND SOLUTION IS POSSIBLE IN 5 PER CENT OF THE CASES)
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33024.table b/definitions/bufr/tables/0/wmo/43/codetables/33024.table
new file mode 100644
index 000000000..771e04b81
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33024.table
@@ -0,0 +1,10 @@
+0 0 RESERVED
+1 1 EXCELLENT - WITHIN 3 METRES
+2 2 GOOD - WITHIN 10 METRES
+3 3 FAIR - WITHIN 20 METRES
+4 4 POOR - MORE THAN 20 METRES
+5 5 EXCELLENT - WITHIN 10 FEET
+6 6 GOOD - WITHIN 30 FEET
+7 7 FAIR - WITHIN 60 FEET
+8 8 POOR - MORE THAN 60 FEET
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33025.table b/definitions/bufr/tables/0/wmo/43/codetables/33025.table
new file mode 100644
index 000000000..4da695aa0
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33025.table
@@ -0,0 +1,5 @@
+0 0 TIME INTERPOLATED, LATITUDE AND LONGITUDE REPORTED
+1 1 TIME REPORTED, LATITUDE AND LONGITUDE INTERPOLATED
+2 2 TIME, LATITUDE, AND LONGITUDE INTERPOLATED
+3 3 TIME, LATITUDE, AND LONGITUDE REPORTED
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33026.table b/definitions/bufr/tables/0/wmo/43/codetables/33026.table
new file mode 100644
index 000000000..08c61254b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33026.table
@@ -0,0 +1,17 @@
+0 0 NORMAL OPERATIONS - MEASUREMENT MODE
+1 1 NORMAL OPERATIONS - NON-MEASUREMENT MODE
+2 2 SMALL RH
+3 3 HUMIDITY ELEMENT IS WET
+4 4 HUMIDITY ELEMENT CONTAMINATED
+5 5 HEATER FAIL
+6 6 HEATER FAIL AND WET/CONTAMINATED HUMIDITY ELEMENT
+7 7 AT LEAST ONE OF THE INPUT PARAMETERS USED IN THE CALCULATION OF MIXING RATIO IS INVALID
+8 8 NUMERIC ERROR
+9 9 SENSOR NOT INSTALLED
+10 10 CALCULATED RH > 100%
+11 11 INPUT LASER POWER TOO LOW
+12 12 PROBE WV TEMPERATURE OUT OF RANGE
+13 13 PROBE WV PRESSURE OUT OF RANGE
+14 14 SPECTRAL LINE OUT OF RANGE
+15 15 NO LASER OUTPUT
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33027.table b/definitions/bufr/tables/0/wmo/43/codetables/33027.table
new file mode 100644
index 000000000..c563af46f
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33027.table
@@ -0,0 +1,6 @@
+0 0 RADIUS >= 1500 M
+1 1 500 M =< RADIUS <1500 M
+2 2 250 M =< RADIUS < 500 M
+3 3 RADIUS < 250 M
+4 4 =< 100 M
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33028.table b/definitions/bufr/tables/0/wmo/43/codetables/33028.table
new file mode 100644
index 000000000..688dec0e4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33028.table
@@ -0,0 +1,7 @@
+1 1 NOMINAL
+2 2 DEGRADED BY SW ERROR; ANY ERROR REPORTED BY THE ALGORITHMS
+3 3 DEGRADED BY INSTRUMENT ERROR
+4 4 DEGRADED BY CORRUPTED /MISSING ADF
+5 5 GENERAL DEGRADATION
+6 6 RESERVED
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33030.table b/definitions/bufr/tables/0/wmo/43/codetables/33030.table
new file mode 100644
index 000000000..c9e36c0f4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33030.table
@@ -0,0 +1,7 @@
+1 1 DO NOT USE SCAN FOR PRODUCT GENERATION
+2 2 TIME SEQUENCE ERROR DETECTED WITH THIS SCAN
+3 3 DATA GAP PRECEDES THIS SCAN
+4 4 NO CALIBRATION
+5 5 NO EARTH LOCATION
+6 6 FIRST GOOD TIME FOLLOWING A CLOCK UPDATE
+7 7 INSTRUMENT STATUS CHANGED WITH THIS SCAN
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33031.table b/definitions/bufr/tables/0/wmo/43/codetables/33031.table
new file mode 100644
index 000000000..c11fd4a09
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33031.table
@@ -0,0 +1,21 @@
+1 1 TIME FIELD IS BAD BUT CAN PROBABLY BE INFERRED FROM THE PREVIOUS GOOD TIME
+2 2 TIME FIELD IS BAD AND CANNOT BE INFERRED FROM THE PREVIOUS GOOD TIME
+3 3 THIS RECORD STARTS A SEQUENCE THAT IS INCONSISTENT WITH PREVIOUS TIMES (I.E. THERE IS A TIME DISCONTINUITY). THIS MAY OR MAY NOT BE ASSOCIATED WITH A SPACECRAFT CLOCK UPDATE (SEE SCAN LINE STATUS FLAGS FOR ATOVS)
+4 4 START OF A SEQUENCE THAT APPARENTLY REPEATS SCAN TIMES THAT HAVE BEEN PREVIOUSLY ACCEPTED
+5 5 SCAN LINE WAS NOT CALIBRATED BECAUSE OF BAD TIME
+6 6 SCAN LINE WAS CALIBRATED USING FEWER THAN THE PREFERRED NUMBER OF SCAN LINES BECAUSE OF PROXIMITY TO START OR END OF DATA OR TO A DATA GAP
+7 7 SCAN LINE WAS NOT CALIBRATED BECAUSE OF BAD OR INSUFFICIENT PRT DATA
+8 8 SCAN LINE WAS CALIBRATED BUT WITH MARGINAL PRT DATA
+9 9 SOME UNCALIBRATED CHANNELS ON THIS SCAN
+10 10 UNCALIBRATED DUE TO INSTRUMENT MODE
+11 11 QUESTIONABLE CALIBRATION BECAUSE OF ANTENNA POSITION ERROR OF SPACE VIEW
+12 12 QUESTIONABLE CALIBRATION BECAUSE OF ANTENNA POSITION ERROR OF BLACK BODY
+13 13 NOT EARTH LOCATED BECAUSE OF BAD TIME
+14 14 EARTH LOCATION QUESTIONABLE BECAUSE OF QUESTIONABLE TIME CODE (SEE TIME PROBLEM CODE BITS)
+15 15 EARTH LOCATION QUESTIONABLE - ONLY MARGINAL AGREEMENT WITH REASONABLENESS CHECK
+16 16 EARTH LOCATION QUESTIONABLE - FAILS REASONABLENESS CHECK
+17 17 EARTH LOCATION QUESTIONABLE BECAUSE OF ANTENNA POSITION CHECK
+18 18 SCAN LINE CALIBRATION COLD BLACK BODY
+19 19 SCAN LINE CALIBRATION WARM BLACK BODY
+20 20 SCAN LINE CALIBRATION SPACE VIEW
+21 21 EARTH VIEW
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33032.table b/definitions/bufr/tables/0/wmo/43/codetables/33032.table
new file mode 100644
index 000000000..33307f50a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33032.table
@@ -0,0 +1,7 @@
+1 1 NO GOOD BLACKBODY COUNTS FOR SCAN LINE
+2 2 NO GOOD SPACE VIEW COUNTS FOR THIS LINE
+3 3 NO GOOD PRTS FOR THIS LINE
+4 4 SOME BAD BLACKBODY VIEW COUNTS FOR THIS LINE
+5 5 SOME BAD SPACE VIEW COUNTS FOR THIS LINE
+6 6 SOME BAD PRT TEMPS ON THIS LINE
+7 7 QUALITY FOR THIS SCAN IS REDUCED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33033.table b/definitions/bufr/tables/0/wmo/43/codetables/33033.table
new file mode 100644
index 000000000..6fd320510
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33033.table
@@ -0,0 +1,3 @@
+1 1 SET IF SECONDARY CALIBRATION USED
+22 22 SET IF ALL THE CHANNELS ARE MISSING
+23 23 SUSPECT
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33035.table b/definitions/bufr/tables/0/wmo/43/codetables/33035.table
new file mode 100644
index 000000000..01996bae4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33035.table
@@ -0,0 +1,10 @@
+0 0 AUTOMATIC QUALITY CONTROL PASSED AND NOT MANUALLY CHECKED
+1 1 AUTOMATIC QUALITY CONTROL PASSED AND MANUALLY CHECKED AND PASSED
+2 2 AUTOMATIC QUALITY CONTROL PASSED AND MANUALLY CHECKED AND DELETED
+3 3 AUTOMATIC QUALITY CONTROL FAILED AND MANUALLY NOT CHECKED
+4 4 AUTOMATIC QUALITY CONTROL FAILED AND MANUALLY CHECKED AND FAILED
+5 5 AUTOMATIC QUALITY CONTROL FAILED AND MANUALLY CHECKED AND RE-INSERTED
+6 6 AUTOMATIC QUALITY CONTROL FLAGGED DATA AS QUESTIONABLE AND NOT MANUALLY CHECKED
+7 7 AUTOMATIC QUALITY CONTROL FLAGGED DATA AS QUESTIONABLE AND MANUALLY CHECKED AND FAILED
+8 8 MANUALLY CHECKED AND FAILED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33037.table b/definitions/bufr/tables/0/wmo/43/codetables/33037.table
new file mode 100644
index 000000000..9f26652a5
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33037.table
@@ -0,0 +1,19 @@
+1 1 U DEPARTURE FROM GUESS
+2 2 V DEPARTURE FROM GUESS
+3 3 U AND V DEPARTURE FROM GUESS
+4 4 U ACCELERATION
+5 5 V ACCELERATION
+6 6 U AND V ACCELERATION
+7 7 POSSIBLE LAND FEATURE
+8 8 U ACCELERATION AND POSSIBLE LAND FEATURE
+9 9 V ACCELERATION AND POSSIBLE LAND FEATURE
+10 10 U AND V ACCELERATION AND POSSIBLE LAND FEATURE
+11 11 BAD WIND GUESS
+12 12 CORRELATION FAILURE
+13 13 SEARCH BOX OFF EDGE OF AREA
+14 14 TARGET BOX OFF EDGE OF AREA
+15 15 PIXEL BRIGHTNESS OUT OF BOUNDS (NOISY LINE)
+16 16 TARGET OUTSIDE OF LATITUDE/LONGITUDE BOX
+17 17 TARGET OUTSIDE OF PRESSURE MINIMUM/MAXIMUM
+18 18 AUTOEDITOR FLAGGED SLOW VECTOR
+19 19 AUTOEDITOR FLAGGED VECTORS
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33038.table b/definitions/bufr/tables/0/wmo/43/codetables/33038.table
new file mode 100644
index 000000000..3dc1192e8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33038.table
@@ -0,0 +1,9 @@
+1 1 TOTAL ZENITH DELAY QUALITY IS CONSIDERED POOR
+2 2 GALILEO SATELLITES USED
+3 3 GLONASS SATELLITES USED
+4 4 GPS SATELLITES USED
+5 5 METEOROLOGICAL DATA APPLIED
+6 6 ATMOSPHERIC LOADING CORRECTION APPLIED
+7 7 OCEAN TIDE LOADING APPLIED
+8 8 CLIMATE QUALITY DATA PROCESSING
+9 9 NEAR-REAL TIME DATA PROCESSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33039.table b/definitions/bufr/tables/0/wmo/43/codetables/33039.table
new file mode 100644
index 000000000..c34540914
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33039.table
@@ -0,0 +1,12 @@
+1 1 NON-NOMINAL QUALITY
+2 2 OFFLINE PRODUCT
+3 3 ASCENDING OCCULTATION FLAG
+4 4 EXCESS PHASE PROCESSING NON-NOMINAL
+5 5 BENDING ANGLE PROCESSING NON-NOMINAL
+6 6 REFRACTIVITY PROCESSING NON-NOMINAL
+7 7 METEOROLOGICAL PROCESSING NON-NOMINAL
+8 8 OPEN LOOP DATA INCLUDED
+9 9 SURFACE REFLECTIONS DETECTED
+10 10 L2C GNSS SIGNALS USED
+14 14 BACKGROUND PROFILE NON-NOMINAL
+15 15 BACKGROUND (I.E. NOT RETRIEVED) PROFILE PRESENT
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33041.table b/definitions/bufr/tables/0/wmo/43/codetables/33041.table
new file mode 100644
index 000000000..8bbdba90a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33041.table
@@ -0,0 +1,4 @@
+0 0 THE FOLLOWING VALUE IS THE TRUE VALUE
+1 1 THE FOLLOWING VALUE IS HIGHER THAN THE TRUE VALUE (THE MEASUREMENT HIT THE LOWER LIMIT OF THE INSTRUMENT)
+2 2 THE FOLLOWING VALUE IS LOWER THAN THE TRUE VALUE (THE MEASUREMENT HIT THE HIGHER LIMIT OF THE INSTRUMENT)
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33042.table b/definitions/bufr/tables/0/wmo/43/codetables/33042.table
new file mode 100644
index 000000000..b75447a4a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33042.table
@@ -0,0 +1,5 @@
+0 0 EXCLUSIVE LOWER LIMIT (>)
+1 1 INCLUSIVE LOWER LIMIT (>=)
+2 2 EXCLUSIVE UPPER LIMIT (<)
+3 3 INCLUSIVE UPPER LIMIT (=<)
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33043.table b/definitions/bufr/tables/0/wmo/43/codetables/33043.table
new file mode 100644
index 000000000..398d9ab2c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33043.table
@@ -0,0 +1,4 @@
+1 1 SEA MDS.  NADIR ONLY SST RETRIEVAL USED 3.7 MICRON CHANNEL.  LAND MDS RESERVED
+2 2 SEA MDS.  DUAL VIEW SST RETRIEVAL USED 3.7 MICRON CHANNEL.  LAND MDS RESERVED
+3 3 NADIR VIEW CONTAINS DAY TIME DATA
+4 4 FORWARD VIEW CONTAINS DAY TIME DATA
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33044.table b/definitions/bufr/tables/0/wmo/43/codetables/33044.table
new file mode 100644
index 000000000..01746c795
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33044.table
@@ -0,0 +1,14 @@
+1 1 INPUT DATA MEAN OUTSIDE NOMINAL RANGE FLAG
+2 2 INPUT DATA STANDARD DEVIATION OUTSIDE NOMINAL RANGE FLAG
+3 3 NUMBER OF INPUT DATA GAPS > THRESHOLD VALUE
+4 4 PERCENTAGE OF MISSING LINES > THRESHOLD VALUE
+5 5 DOPPLER CENTROID UNCERTAIN. CONFIDENCE MEASURE < SPECIFIC VALUE
+6 6 DOPPLER AMBIGUITY ESTIMATE UNCERTAIN. CONFIDENCE MEASURE < SPECIFIC VALUE
+7 7 OUTPUT DATA MEAN OUTSIDE NOMINAL RANGE FLAG
+8 8 OUTPUT DATA STANDARD DEVIATION OUTSIDE NOMINAL RANGE FLAG
+9 9 CHIRP RECONSTRUCTION FAILED OR IS OF LOW QUALITY FLAG
+10 10 DATA SET MISSING
+11 11 INVALID DOWNLINK PARAMETERS
+12 12 AZIMUTH CUT-OFF ITERATION COUNT. THE AZIMUTH CUT-OFF FIT DID NOT CONVERGE WITHIN A MINIMUM NUMBER OF ITERATIONS
+13 13 AZIMUTH CUT-OFF FIT DID NOT CONVERGE WITHIN A MINIMUM NUMBER OF ITERATIONS
+14 14 PHASE INFORMATION CONFIDENCE MEASURE. THE IMAGINARY SPECTRAL PEAK IS LESS THAN A MINIMUM THRESHOLD, OR THE ZERO LAG SHIFT IS GREATER THAN A MINIMUM THRESHOLD
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33047.table b/definitions/bufr/tables/0/wmo/43/codetables/33047.table
new file mode 100644
index 000000000..f69b56e18
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33047.table
@@ -0,0 +1,27 @@
+1 1 ERROR DETECTED AND ATTEMPTS TO RECOVER MADE
+2 2 ANOMALY IN ON-BOARD DATA HANDLING (OBDH) VALUE DETECTED
+3 3 ANOMALY IN ULTRA STABLE OSCILLATOR PROCESSING (USOP) VALUE DETECTED
+4 4 ERRORS DETECTED BY ON-BOARD COMPUTER
+5 5 AUTOMATIC GAIN CONTROL (AGC) OUT OF RANGE
+6 6 RECEPTION (RX) DELAY FAULT.  RX DISTANCE OUT OF RANGE
+7 7 WAVE FORM SAMPLES FAULT IDENTIFIER. ERROR
+8 8 S BAND ANOMALY/ERROR DETECTED
+12 12 BRIGHTNESS TEMPERATURE (CHANNEL 1) OUT OF RANGE
+13 13 BRIGHTNESS TEMPERATURE (CHANNEL 2) OUT OF RANGE
+14 14 RESERVED
+15 15 KU BAND OCEAN RETRACKING ERROR
+16 16 S BAND OCEAN RETRACKING ERROR
+17 17 KU BAND ICE 1 RETRACKING ERROR
+18 18 S BAND ICE 1 RETRACKING ERROR
+19 19 KU BAND ICE 2 RETRACKING ERROR
+20 20 S BAND ICE 2 RETRACKING ERROR
+21 21 KU BAND SEA ICE RETRACKING ERROR
+22 22 ARITHMETIC FAULT ERROR
+23 23 METEO DATA STATE. NO MAP
+24 24 METEO DATA STATE. 1 MAP
+25 25 METEO DATA STATE. 2 MAPS DEGRADED
+26 26 METEO DATA STATE. 2 MAPS NOMINAL
+27 27 ORBIT PROPAGATOR STATUS FOR PROPAGATION MODE, SEVERAL ERRORS
+28 28 ORBIT PROPAGATOR STATUS FOR PROPAGATION MODE, WARNING DETECTED
+29 29 ORBIT PROPAGATOR STATUS FOR INITIALIZATION MODE, SEVERAL ERRORS
+30 30 ORBIT PROPAGATOR STATUS FOR INITIALIZATION MODE, WARNING DETECTED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33048.table b/definitions/bufr/tables/0/wmo/43/codetables/33048.table
new file mode 100644
index 000000000..312ba4071
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33048.table
@@ -0,0 +1,4 @@
+0 0 INVERSION SUCCESSFUL
+1 1 INVERSION NOT SUCCESSFUL
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33049.table b/definitions/bufr/tables/0/wmo/43/codetables/33049.table
new file mode 100644
index 000000000..bdde0619b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33049.table
@@ -0,0 +1,4 @@
+0 0 EXTERNAL WIND DIRECTION USED DURING INVERSION
+1 1 EXTERNAL WIND DIRECTION NOT USED DURING INVERSION
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33050.table b/definitions/bufr/tables/0/wmo/43/codetables/33050.table
new file mode 100644
index 000000000..ee7bb6deb
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33050.table
@@ -0,0 +1,9 @@
+0 0 UNQUALIFIED
+1 1 CORRECT VALUE (ALL CHECKS PASSED)
+2 2 PROBABLY GOOD BUT VALUE INCONSISTENT WITH STATISTICS (DIFFER FROM CLIMATOLOGY)
+3 3 PROBABLY BAD (SPIKE, GRADIENT, ETC., IF OTHER TESTS PASSED)
+4 4 BAD VALUE, IMPOSSIBLE VALUE (OUT OF SCALE, VERTICAL INSTABILITY, CONSTANT PROFILE)
+5 5 VALUE MODIFIED DURING QUALITY CONTROL
+8 8 INTERPOLATED VALUE
+9 9 GOOD FOR OPERATIONAL USE; CAUTION; CHECK LITERATURE FOR OTHER USES
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33054.table b/definitions/bufr/tables/0/wmo/43/codetables/33054.table
new file mode 100644
index 000000000..d9ca13cf9
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33054.table
@@ -0,0 +1,5 @@
+0 0 PROFILE VALUES GOOD
+1 1 PROFILE VALUES SUSPECTED
+2 2 RESERVED
+3 3 PROFILE VALUES NOT GOOD
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33055.table b/definitions/bufr/tables/0/wmo/43/codetables/33055.table
new file mode 100644
index 000000000..b757af0bb
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33055.table
@@ -0,0 +1,13 @@
+11 11 OCEAN SIGMA-0 IS NOT AVAILABLE FOR WIND RETRIEVALS
+12 12 BACKGROUND WIND IS NOT AVAILABLE
+13 13 BACKGROUND MODEL DETECT LAND
+14 14 BACKGROUND MODEL DETECT ICE
+15 15 SIGMA-0 IS NOT LAND/ICE FREE
+16 16 SIGMA-0 LAND CONTAMINATION
+17 17 SIGMA-0 ICE CONTAMINATION
+18 18 NOT ENOUGH AZIMUTHAL DIVERSITY
+19 19 INVERSION IS NOT DONE
+20 20 OVERALL WVC FLAG
+21 21 INVERSION IS ATTEMPTED (FLAG IS SET)
+22 22 RAINFLAG IS ATTEMPTED (FLAG IS SET)
+23 23 RAIN IS DETECTED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33056.table b/definitions/bufr/tables/0/wmo/43/codetables/33056.table
new file mode 100644
index 000000000..ce44ca922
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33056.table
@@ -0,0 +1,13 @@
+8 8 ASCENDING
+9 9 VV POLARISATION
+10 10 FORE OF SPACECRAFT
+11 11 LAND
+12 12 POOR SIGMA-0 (SUMMARY)
+13 13 INVALID SIGMA-0 (SUMMARY)
+14 14 POOR BT
+15 15 INVALID BT
+16 16 LAND-SEA BOUNDARY
+17 17 NEGATIVE SIGMA-0
+21 21 ICE
+22 22 MISSING DATA AT A GIVEN LATITUDE-LONGITUDE FOR SEA-ICE FLAGGING PROCESS FOR 2 OR MORE DAYS
+23 23 ICE-OCEAN CONTAMINATION
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33060.table b/definitions/bufr/tables/0/wmo/43/codetables/33060.table
new file mode 100644
index 000000000..741430292
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33060.table
@@ -0,0 +1,4 @@
+0 0 GOOD
+1 1 BAD
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33066.table b/definitions/bufr/tables/0/wmo/43/codetables/33066.table
new file mode 100644
index 000000000..a80e6ab9a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33066.table
@@ -0,0 +1,4 @@
+20 20 GOOD WIND, BUT AN ALTERNATIVE CHANNEL USED FOR FEATURE TRACKING
+21 21 GOOD WIND, BUT AN ALTERNATIVE SET OF CHANNELS USED FOR THE DETERMINATION OF CLOUD-TOP HEIGHT/AMV HEIGHT ASSIGNMENT
+22 22 CORRELATION SURFACE CONSTRAINT FAILS
+23 23 RESERVED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33070.table b/definitions/bufr/tables/0/wmo/43/codetables/33070.table
new file mode 100644
index 000000000..8a0467b65
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33070.table
@@ -0,0 +1,14 @@
+0 0 GOOD RETRIEVAL
+1 1 BAD AEROSOL INFORMATION FLAG OR NOAA-16 RADIANCE ANOMALY
+2 2 SOLAR ZENITH ANGLE GREATER THAN 84 DEGREES
+3 3 380 NM RESIDUE GREATER THAN LIMIT
+4 4 OZONE INCONSISTENCY
+5 5 DIFFERENCE BETWEEN PROFILE OZONE AND STEP 3 TOTAL OZONE EXCEEDS THRESHOLD (SET TO 25 DU)
+6 6 STEP 1 OZONE ITERATION DID NOT CONVERGE
+7 7 ANY CHANNEL RESIDUE GREATER THAN 16 OR BAD RADIANCE
+8 8 INSUFFICIENT PIXELS - NOT PROCESSED
+9 9 FIRST GUESS GOOD - OZONE FORECAST DATA USED
+10 10 HIGH CLOUD IN PIXEL - NOT PROCESSED
+11 11 SUCCESSFUL OZONE RETRIEVAL
+12 12 UNSUCCESSFUL OZONE RETRIEVAL
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33071.table b/definitions/bufr/tables/0/wmo/43/codetables/33071.table
new file mode 100644
index 000000000..262a46c89
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33071.table
@@ -0,0 +1,10 @@
+0 0 GOOD RETRIEVAL
+1 1 SOLAR ZENITH ANGLE GREATER THAN 84 DEGREES
+2 2 DIFFERENCE BETWEEN STEP 3 AND PROFILE TOTAL OZONE GREATER THAN LIMIT (25 DU)
+3 3 AVERAGE FINAL RESIDUE FOR WAVELENGTHS USED IN RETRIEVAL GREATER THAN THRESHOLD
+4 4 FINAL RESIDUE GREATER THAN 3 TIMES A PRIORI ERROR
+5 5 DIFFERENCE BETWEEN RETRIEVED AND A PRIORI GREATER THAN 3 TIMES A PRIORI ERROR
+6 6 NON-CONVERGENT SOLUTION
+7 7 UPPER LEVEL PROFILE ANOMALY OR STRAY LIGHT ANOMALY
+8 8 INITIAL RESIDUE GREATER THAN 18.0 N-VALUE UNITS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33072.table b/definitions/bufr/tables/0/wmo/43/codetables/33072.table
new file mode 100644
index 000000000..fcc7f0972
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33072.table
@@ -0,0 +1,18 @@
+0 0 GOOD RETRIEVAL
+1 1 REFLECTIVITY OUT OF RANGE
+2 2 LARGER PIXELS (NUMBER OF CROSS-TRACK PIXELS LESS THAN 32) OR BACKWARD SCANS ERROR
+3 3 SOLAR ZENITH ANGLE GREATER THAN 88 DEGREES
+4 4 LATITUDE/LONGITUDE OUT OF RANGE
+5 5 VIEWING ZENITH ANGLE OR SOLAR ZENITH ANGLE OUT OF RANGE
+6 6 STEP-ONE PROCESS FAILED IN GENERAL
+7 7 FIRST GUESS OZONE OUT OF RANGE
+8 8 TOO MANY ITERATIONS (EXCEED 8)
+9 9 STEP-ONE RESIDUE CALCULATION FAILED
+10 10 STEP-TWO PROCESS FAILED IN GENERAL
+11 11 FIRST GUESS OZONE PROFILE OUT OF RANGE
+12 12 STEP-TWO OZONE VALUE OUT OF RANGE
+13 13 STEP-TWO RESIDUE CALCULATION FAILED
+14 14 STEP-THREE PROCESS FAILED IN GENERAL
+15 15 POLARIZATION CORRECTION ACCURACY ALERT
+16 16 RADIANCE OR IRRADIANCE LESS OR EQUAL TO ZERO
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33075.table b/definitions/bufr/tables/0/wmo/43/codetables/33075.table
new file mode 100644
index 000000000..23edae628
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33075.table
@@ -0,0 +1,5 @@
+1 1 GAP IN RAW DATA RECORD (RDR) DATA DETECTED (I.E., MISSING SCAN(S) PRECEDING THE CURRENT SCAN)
+2 2 RECORDED TIME IS NOT IN SEQUENCE (I.E., THE SCAN START TIME IS OUT OF SEQUENCE)
+3 3 LAMBDA MONITORED CALCULATION CANNOT BE UPDATED
+4 4 THE MEASURED TEMPERATURES OF ANY INSTRUMENT COMPONENTS (E.G., BEAM-SPLITTER, SCAN MIRROR, SCAN BAFFLE) ARE OUTSIDE THE ALLOWABLE RANGES
+5 5 AT LEAST ONE OF THE MONITORED INSTRUMENT TEMPERATURES HAS DRIFTED MORE THAN A SPECIFIED TOLERANCE VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33076.table b/definitions/bufr/tables/0/wmo/43/codetables/33076.table
new file mode 100644
index 000000000..7100c4a0d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33076.table
@@ -0,0 +1,2 @@
+1 1 LUNAR INTRUSION ON FIRST DEEP SPACE VIEW
+2 2 LUNAR INTRUSION ON SECOND DEEP SPACE VIEW
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33077.table b/definitions/bufr/tables/0/wmo/43/codetables/33077.table
new file mode 100644
index 000000000..769be02f2
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33077.table
@@ -0,0 +1,12 @@
+1 1 DEGRADED SDR QUALITY
+2 2 INVALID SDR QUALITY
+3 3 INVALID SDR GEOLOCATION INFORMATION
+4 4 DEGRADED RADIOMETRIC CALIBRATION
+5 5 INVALID RADIOMETRIC CALIBRATION
+6 6 DEGRADED SPECTRAL CALIBRATION
+7 7 INVALID SPECTRAL CALIBRATION
+8 8 FRINGE COUNT ERROR DETECTED AND CORRECTED
+9 9 DAY/NIGHT INDICATOR
+10 10 INVALID RDR DATA
+11 11 SIGNIFICANT FRINGE COUNT ERROR DETECTED
+12 12 BIT TRIM FAILED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33078.table b/definitions/bufr/tables/0/wmo/43/codetables/33078.table
new file mode 100644
index 000000000..f3a218067
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33078.table
@@ -0,0 +1,5 @@
+0 0 NOMINAL - ALTITUDE AND EPHEMERIS DATA AVAILABLE
+1 1 MISSING AT MOST A SMALL GAP OF ALTITUDE AND EPHEMERIS DATA
+2 2 MISSING MORE THAN A SMALL GAP OF ALTITUDE AND EPHEMERIS DATA, BUT NO MORE THAN A GRANULE BOUNDARY
+3 3 MISSING MORE THAN A GRANULE BOUNDARY OF ALTITUDE AND EPHEMERIS DATA
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33079.table b/definitions/bufr/tables/0/wmo/43/codetables/33079.table
new file mode 100644
index 000000000..08751431e
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33079.table
@@ -0,0 +1,10 @@
+6 6 THE NO. 1-NO. 7 HEALTH CHECKS FAILED
+7 7 THE NO. 8-NO. 15 HEALTH CHECKS FAILED
+8 8 THE NO. 16-NO. 23 HEALTH CHECKS FAILED
+9 9 THE NO. 24-NO. 31 HEALTH CHECKS FAILED
+10 10 THE NO. 32-NO. 39 HEALTH CHECKS FAILED
+11 11 THE NO. 40-NO. 47 HEALTH CHECKS FAILED
+12 12 THE NO. 48-NO. 55 HEALTH CHECKS FAILED
+13 13 THE NO. 56-NO. 63 HEALTH CHECKS FAILED
+14 14 THE NO. 64-NO. 70 HEALTH CHECKS FAILED
+15 15 QUADRATIC CORRECTION APPLIED TO THE RADIOMETRIC TRANSFER FUNCTION FOR NON-LINEARITY CORRECTION
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33080.table b/definitions/bufr/tables/0/wmo/43/codetables/33080.table
new file mode 100644
index 000000000..a39dd47ea
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33080.table
@@ -0,0 +1,13 @@
+7 7 DIVIDE-BY-ZERO CONDITION OR COMPUTATION LOOP FAILED TO CONVERGE IN THE K/KA AND V (KAV) BAND PRT
+8 8 DIVIDE-BY-ZERO CONDITION OR COMPUTATION LOOP FAILED TO CONVERGE IN THE WG BAND PRT
+9 9 DIVIDE-BY-ZERO CONDITION OR COMPUTATION LOOP FAILED TO CONVERGE IN THE K/KA, V, W, G BAND RECEIVER SHELF PRT K TEMPERATURE COMPUTATION
+10 10 OUT OF RANGE CONDITION FOR THE K/KA AND V BAND PRT
+11 11 OUT OF RANGE CONDITION FOR THE WG BAND PRT
+12 12 KAV PRT TEMPERATURE INCONSISTENCY
+13 13 WG PRT TEMPERATURE INCONSISTENCY
+14 14 TIME SEQUENCE ERROR
+15 15 DATA GAP - MISSING SCAN(S) PRECEDING THE CURRENT SCAN
+16 16 KAV PRT SUFFICIENCY - INSUFFICIENT KAV PRT DATA ARE AVAILABLE
+17 17 WG PRT SUFFICIENCY - INSUFFICIENT WG PRT DATA ARE AVAILABLE
+18 18 SPACE VIEW ANTENNA POSITION ERROR
+19 19 BLACKBODY ANTENNA POSITION ERROR
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33081.table b/definitions/bufr/tables/0/wmo/43/codetables/33081.table
new file mode 100644
index 000000000..f8759e0ef
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33081.table
@@ -0,0 +1,9 @@
+3 3 MOON IN SPACE VIEW
+4 4 GAIN ERROR - THE LOWEST BLACKBODY COUNT IS SMALLER THAN OR EQUAL TO THE HIGHEST SPACE VIEW COUNT IN A SCAN
+5 5 CALIBRATION WITH FEWER THAN PREFERRED SAMPLES
+6 6 SPACE VIEW DATA SUFFICIENCY CHECK - INSUFFICIENT SPACE VIEW SAMPLES ARE AVAILABLE
+7 7 BLACKBODY VIEW DATA SUFFICIENCY CHECK - INSUFFICIENT BLACKBODY VIEW SAMPLES ARE AVAILABLE
+8 8 OUT OF RANGE CONDITION FOR THE SPACE VIEW
+9 9 OUT OF RANGE CONDITION FOR THE BLACKBODY VIEW
+10 10 SPACE VIEW INCONSISTENCY
+11 11 BLACKBODY VIEW INCONSISTENCY
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33082.table b/definitions/bufr/tables/0/wmo/43/codetables/33082.table
new file mode 100644
index 000000000..467157461
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33082.table
@@ -0,0 +1,10 @@
+6 6 WITHIN SOUTH ATLANTIC ANOMALY
+7 7 INVALID INPUT DATA (INDICATES THAT ANY OF THE SPACECRAFT EPHEMERIS OR ATTITUDE DATA ARE INVALID)
+8 8 BAD POINTING (INDICATES THAT THE SENSOR LOS DOES NOT INTERSECT THE GEOID, IS NEAR THE LIMB, HAS INVALID SENSOR ANGLES OR OTHER SIMILAR CONDITION)
+9 9 BAD TERRAIN (INDICATES THAT THE ALGORITHM COULD NOT OBTAIN A VALID TERRAIN VALUE)
+10 10 INVALID SOLAR ANGLES
+11 11 MISSING AT MOST A SMALL GAP OF ALTITUDE AND EPHEMERIS DATA
+12 12 MISSING MORE THAN A SMALL GAP OF ALTITUDE AND EPHEMERIS DATA, BUT NO MORE THAN A GRANULE BOUNDARY
+13 13 MISSING MORE THAN A GRANULE BOUNDARY OF ALTITUDE AND EPHEMERIS DATA
+14 14 THE NUMBER OF ENCODER PULSE VALUES PER DELTA TIME IS NOT AS EXPECTED
+15 15 SOLAR ECLIPSE DURING EARTH VIEW SCAN
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33083.table b/definitions/bufr/tables/0/wmo/43/codetables/33083.table
new file mode 100644
index 000000000..ecd8a1abf
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33083.table
@@ -0,0 +1,10 @@
+6 6 PIXEL IS AFFECTED BY RADIO-FREQUENCY INTERFERENCE
+7 7 POOR CALIBRATION QUALITY DUE TO BAD SPACE VIEW OFFSETS, OBC VIEW OFFSETS, ETC. OR USE OF A PREVIOUS CALIBRATION VIEW
+8 8 SATURATED PIXEL
+9 9 MISSING DATA -DATA REQUIRED FOR CALIBRATION PROCESSING ARE NOT AVAILABLE FOR PROCESSING
+10 10 CALIBRATED PIXEL RADIANCE OUT OF RANGE
+11 11 CALIBRATED PIXEL REFLECTANCE OR EBBT OUT OF RANGE
+12 12 THE MOON HAS CORRUPTED THE SPACE VIEW
+13 13 SCAN DATA IS NOT PRESENT (NO VALID DATA)
+14 14 QUALITY FOR THIS SCAN-LINE IS REDUCED. THE VALUE IS DETERMINED BY THE COMBINED NUMBER OF STEPS REQUIRED TO FIND A REPLACEMENT FOR THERMISTOR OR CALIBRATION SOURCE DATA
+15 15 BAD DETECTOR
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33084.table b/definitions/bufr/tables/0/wmo/43/codetables/33084.table
new file mode 100644
index 000000000..accb209c5
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33084.table
@@ -0,0 +1,10 @@
+6 6 BULK SST OUTSIDE OF VALIDATION RANGE
+7 7 SKIN SST OUTSIDE OF VALIDATION RANGE
+8 8 SENSOR ZENITH ANGLE > 40 DEGREES (PIXEL IS NOT WITHIN 40 DEGREES OF NADIR AND THEREFORE IS NOT OF HIGH QUALITY)
+9 9 DEGRADATION - HORIZONTAL CELL SIZE (HCS) > 1.3 KM (HCS > 1.3 KM, SWATH WIDTH > 1 700 KM, SENSOR ZENITH ANGLE > 50.3 DEGREES)
+10 10 EXCLUSION: NO OCEAN IN PIXEL
+11 11 DEGRADATION: AEROSOL OPTICAL THICKNESS (AOT) > 0.6 (AOT IN HORIZONTAL CELL > 0.6 ON THE SLANT PATH (AOT @550 NM))
+12 12 EXCLUSION: AOT > 1.0 (AOT IN HORIZONTAL CELL > 1.0 ON THE SLANT PATH (AOT @550 NM))
+13 13 SUN GLINT PRESENT IN PIXEL
+14 14 ICE CONCENTRATION THRESHOLD EXCEEDED (SST NOT RETRIEVED DUE TO ICE CONCENTRATION EXCEEDING THRESHOLD IN SYSTEM SPEC)
+15 15 THIN CIRRUS DETECTED IN PIXEL
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33085.table b/definitions/bufr/tables/0/wmo/43/codetables/33085.table
new file mode 100644
index 000000000..844157b20
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33085.table
@@ -0,0 +1,14 @@
+4 4 ANGSTROM EXPONENT IS OUTSIDE OF THE SYSTEM SPECIFICATION RANGE
+5 5 EXCLUDED, ANGSTROM EXPONENT FOR AOT AT 550 NM < 0.15
+6 6 BRIGHT SURFACE IN CELL (IF OVER LAND), OR SHALLOW OR TURBID WATER IN CELL (IF OVER OCEAN)
+7 7 LOW SUN, EXCLUDED, SOLAR ZENITH ANGLE > 80 DEGREES
+8 8 LOW SUN, DEGRADED, 65 DEGREES < SOLAR ZENITH ANGLE =< 80 DEGREES
+9 9 FIRE DETECTED IN CELL
+10 10 SNOW/ICE IN CELL
+11 11 CLOUD SHADOW IN CELL
+12 12 SUN GLINT IN CELL
+13 13 BAD SDR DATA PRESENT IN HORIZONTAL CELL (QUALITY OF AOT/APSP DEGRADED OR AOT/APSP NOT RETRIEVED DUE TO BAD SDR DATA IN HORIZONTAL CELL)
+14 14 CIRRUS CONTAMINATION IN CELL
+15 15 CLOUD ADJACENT TO CELL
+16 16 CLOUD CONTAMINATION IN CELL
+17 17 AOT IS OUTSIDE OF THE SYSTEM SPECIFICATION RANGE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33086.table b/definitions/bufr/tables/0/wmo/43/codetables/33086.table
new file mode 100644
index 000000000..b7cda3212
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33086.table
@@ -0,0 +1,5 @@
+0 0 NOT RETRIEVED
+1 1 EXCLUDED
+2 2 DEGRADED
+3 3 HIGH QUALITY
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33087.table b/definitions/bufr/tables/0/wmo/43/codetables/33087.table
new file mode 100644
index 000000000..f3000e258
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33087.table
@@ -0,0 +1,10 @@
+0 0 LESS THAN OR EQUAL TO 10%
+1 1 GREATER THAN 10% BUT LESS THAN OR EQUAL TO 20%
+2 2 GREATER THAN 20% BUT LESS THAN OR EQUAL TO 30%
+3 3 GREATER THAN 30% BUT LESS THAN OR EQUAL TO 40%
+4 4 GREATER THAN 40% BUT LESS THAN OR EQUAL TO 50%
+5 5 GREATER THAN 50% BUT LESS THAN OR EQUAL TO 60%
+6 6 GREATER THAN 60% BUT LESS THAN OR EQUAL TO 70%
+7 7 GREATER THAN 70% BUT LESS THAN OR EQUAL TO 80%
+8 8 GREATER THAN 80%
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33088.table b/definitions/bufr/tables/0/wmo/43/codetables/33088.table
new file mode 100644
index 000000000..744a5d31b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33088.table
@@ -0,0 +1,12 @@
+6 6 SURFACE REFLECTIVITY OUT OF RANGE
+7 7 RESIDUAL TOO LARGE
+8 8 AEROSOL INDEX LIMIT EXCEEDED
+9 9 SOLAR ECLIPSE PRESENT (ALL OR PART OF THE IFOV IS AFFECTED BY A SOLAR ECLIPSE, UMBRA OR PENUMBRA VIEWING)
+10 10 SUN GLINT PRESENT WITHIN IFOV
+11 11 SNOW OR ICE SURFACE IS WITHIN THE IFOV
+12 12 SOLAR ZENITH ANGLE IN EXCLUDED (NIGHT) CONDITION (SOLAR ZENITH ANGLE >= 88 DEGREES)
+13 13 SOLAR ZENITH ANGLE IN DEGRADED CONDITION (80 DEGREES =< SOLAR ZENITH ANGLE < 88 DEGREES)
+14 14 SO2 INDEX > 6 DU (DEGRADED CONDITION)
+15 15 RESIDUES ARE NOT CONSISTENT (INDICATES WHETHER THE RESIDUES FROM THE 22 WAVELENGTHS ARE CONSISTENT)
+16 16 O3 TRIPLET SELECTION IS NOT CONSISTENT WITHIN RETRIEVAL (OZONE TRIPLET CONSISTENCY)
+17 17 INPUT DATA QUALITY IS NOT GOOD
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33092.table b/definitions/bufr/tables/0/wmo/43/codetables/33092.table
new file mode 100644
index 000000000..2a9557582
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33092.table
@@ -0,0 +1,2 @@
+1 1 ALTIMETER OPERATING
+2 2 MICROWAVE RADIOMETER (MWR) OPERATING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33093.table b/definitions/bufr/tables/0/wmo/43/codetables/33093.table
new file mode 100644
index 000000000..d872dc664
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33093.table
@@ -0,0 +1,19 @@
+1 1 PATH DELAY QUALITY IS CONSIDERED POOR
+2 2 GALILEO SATELLITES USED
+3 3 GLONASS SATELLITES USED
+4 4 GPS SATELLITES USED
+5 5 BEIDOU SATELLITES USED
+9 9 METEOROLOGICAL DATA APPLIED
+10 10 ATMOSPHERIC LOADING CORRECTION APPLIED
+11 11 OCEAN TIDE LOADING APPLIED
+12 12 SECOND ORDER IONOSPHERE CORRECTIONS APPLIED
+13 13 THIRD ORDER IONOSPHERE CORRECTIONS APPLIED
+14 14 PPP SOLUTION
+15 15 GRADIENTS APPLIED TO PATH DELAY
+16 16 MULTIPATH CORRECTIONS APPLIED TO PATH DELAY
+17 17 RESIDUAL APPLIED TO PATH DELAY
+18 18 CLIMATE QUALITY DATA PROCESSING
+19 19 RE-PROCESSING
+20 20 POST-PROCESSING
+21 21 NEAR-REAL TIME DATA PROCESSING
+22 22 REAL TIME DATA PROCESSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33094.table b/definitions/bufr/tables/0/wmo/43/codetables/33094.table
new file mode 100644
index 000000000..1365228b2
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33094.table
@@ -0,0 +1,8 @@
+16 16 NON-OCEAN
+17 17 LUNAR OR SOLAR INTRUSION
+18 18 SPACECRAFT MANOEUVRE
+19 19 COLD CALIBRATION CONSISTENCY
+20 20 WARM CALIBRATION CONSISTENCY
+21 21 DESCENDING
+22 22 NIGHT
+23 23 PAYLOAD REAR ORIENTATION
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33095.table b/definitions/bufr/tables/0/wmo/43/codetables/33095.table
new file mode 100644
index 000000000..67328ecfd
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33095.table
@@ -0,0 +1,7 @@
+1 1 PRT OR THM TEMPERATURES ARE MISSING OR WITH ANOMALOUS READINGS
+2 2 PRT TEMPERATURES OF OBCT USED IN THE RADIOMETRIC CALIBRATIONS ARE MISSING OR WITH ANOMALOUS READINGS
+3 3 THM TEMPERATURES OF SVR USED IN THE RADIOMETRIC CALIBRATIONS ARE MISSING OR WITH ANOMALOUS READINGS
+4 4 THM TEMPERATURES OF MAIN REFLECTOR ARE MISSING OR WITH ANOMALOUS READINGS
+5 5 THM TEMPERATURES OF THE RACETRACK ARE MISSING OR WITH ANOMALOUS READINGS
+6 6 THM TEMPERATURES OF THE RECEIVERS ARE MISSING OR WITH ANOMALOUS READINGS
+7 7 RESERVED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33096.table b/definitions/bufr/tables/0/wmo/43/codetables/33096.table
new file mode 100644
index 000000000..3bdfe18bf
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33096.table
@@ -0,0 +1,15 @@
+1 1 RADIOMETRIC CALIBRATION FAILED OR IS DEGRADED
+2 2 OBCT VIEW COUNTS AVERAGED VALUE OVER SCANS IS MISSING (THIS IS VALID FOR THE HIGH-REFERENCE CALIBRATION LOAD WHEN THE BACK-UP CALIBRATION IS APPLIED FOR CHANNELS MWI-1 TO MWI-3)
+3 3 COLD SPACE VIEW COUNTS AVERAGED VALUE OVER SCANS IS MISSING (THIS IS VALID FOR THE LOW-REFERENCE CALIBRATION LOAD WHEN THE BACK-UP CALIBRATION IS APPLIED FOR CHANNELS MWI-1 TO MWI-3)
+4 4 OBCT VIEW COUNTS AVERAGED VALUE OVER SCANS IS DEGRADED DUE TO MISSING OR ANOMALOUS COUNTS VALUES (THIS IS VALID FOR THE HIGH-REFERENCE CALIBRATION LOAD WHEN THE BACK-UP CALIBRATION IS APPLIED FOR CHANNELS MWI-1 TO MWI-3)
+5 5 COLD SPACE VIEW COUNTS AVERAGED VALUE OVER SCANS IS DEGRADED DUE TO MISSING OR ANOMALOUS COUNTS VALUES (THIS IS VALID FOR THE LOW-REFERENCE CALIBRATION LOAD WHEN THE BACK-UP CALIBRATION IS APPLIED FOR CHANNELS MWI-1 TO MWI-3)
+6 6 OBCT VIEW RADIANCE AVERAGED VALUE OVER SCANS IS MISSING (THIS IS VALID FOR THE HIGH-REFERENCE CALIBRATION LOAD WHEN THE BACK-UP CALIBRATION IS APPLIED FOR CHANNELS MWI-1 TO MWI-3)
+7 7 COLD SPACE VIEW RADIANCE AVERAGED VALUE OVER SCANS IS MISSING (THIS IS VALID FOR THE LOW-REFERENCE CALIBRATION LOAD WHEN THE BACK-UP CALIBRATION IS APPLIED FOR CHANNELS MWI-1 TO MWI-3)
+8 8 OBCT VIEW RADIANCE AVERAGED VALUE OVER SCANS IS DEGRADED DUE TO MISSING OR ANOMALOUS VALUES (THIS IS VALID FOR THE HIGH-REFERENCE CALIBRATION LOAD WHEN THE BACK-UP CALIBRATION IS APPLIED FOR CHANNELS MWI-1 TO MWI-3)
+9 9 COLD SPACE VIEW RADIANCE AVERAGED VALUE OVER SCANS IS DEGRADED DUE TO MISSING OR ANOMALOUS VALUES (THIS IS VALID FOR THE LOW-REFERENCE CALIBRATION LOAD WHEN THE BACK-UP CALIBRATION IS APPLIED FOR CHANNELS MWI-1 TO MWI-3)
+10 10 NON-LINEARITY PARAMETER COMPUTED USING NOISE DIODES IS MISSING (MEANINGFUL ONLY FOR CHANNELS MWI-1 TO MWI-3)
+11 11 NON-LINEARITY PARAMETER COMPUTED USING NOISE DIODES IS DEGRADED (MEANINGFUL ONLY FOR CHANNELS MWI-1 TO MWI-3)
+12 12 PRT OR THM TEMPERATURES OF CURRENT SCAN ARE MISSING OR WITH ANOMALOUS READINGS
+13 13 MOON INTRUSION IN COLD SPACE DEGRADED CALIBRATION (LESS THAN NVALID_C VALID SAMPLES ARE NOT AFFECTED BY MOON FOR THE CONSIDERED CHANNEL AND SCAN)
+14 14 BACK-UP CALIBRATION WITH NOISE DIODES PERFORMED (MEANINGFUL ONLY FOR MWI-1 TO MWI-3)
+15 15 DEGRADED RECEIVER TEMPERATURES LEAD TO DEGRADED CALIBRATION
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33097.table b/definitions/bufr/tables/0/wmo/43/codetables/33097.table
new file mode 100644
index 000000000..4a5ac50f1
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33097.table
@@ -0,0 +1,10 @@
+1 1 SCAN IS DEGRADED IN RAW DATA RECORD
+2 2 TIME SEQUENCE ERROR
+3 3 CURRENT SCAN IS ACQUIRED AFTER A GAP
+4 4 SCAN IS IN PERIOD OF INITIALIZATION OF CALIBRATION OF DATA AVERAGES OVER SCANS (BECAUSE OF COLD START/COLD END, MISSING WARM/COLD L0 PACKETS OR DATA GAPS).
+5 5 MOON INTRUSION ANGLE IN SPACE VIEW BELOW THRESHOLD FOR AT LEAST ONE CHANNEL
+6 6 MOON CORRECTION IS APPLIED BUT IS DEGRADED FOR AT LEAST ONE CHANNEL
+7 7 SUN GLINT ANGLE BELOW THRESHOLD FOR AT LEAST ONE CHANNEL
+8 8 RFI CONTAMINATION IN THE EARTH VIEW OR RFI PACKET MISSING FOR THE CONSIDERED SCAN (ONLY FOR MWI-1V AND MWI-1H)
+9 9 SATELLITE MANOEUVRE OCCURS IN CURRENT SCAN
+10 10 MISSING WARM OR COLD L0 PACKETS FOR THE CONSIDERED SCAN
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33098.table b/definitions/bufr/tables/0/wmo/43/codetables/33098.table
new file mode 100644
index 000000000..51170985b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33098.table
@@ -0,0 +1,8 @@
+1 1 MWI SPECTRAL RADIANCE DATA OF CHANNEL IS MISSING OR DEGRADED
+2 2 EARTH VIEW COUNTS OF CHANNEL WITHIN SCAN ARE MISSING OR OUT OF BOUNDS
+3 3 RADIOMETRIC CALIBRATION FAILED OR IS DEGRADED
+4 4 GEOLOCATION OF CHANNEL IS ERRONEOUS OR DEGRADED
+5 5 NEΔT OF THIS DATA GRANULE IS ABOVE THRESHOLD
+6 6 MR EMISSIVITY AND SPILLOVER CORRECTION FAILED OR DEGRADED
+7 7 MR SIDELOBE CORRECTION FAILED OR DEGRADED
+8 8 CHANNEL IS DEFECTIVE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33099.table b/definitions/bufr/tables/0/wmo/43/codetables/33099.table
new file mode 100644
index 000000000..0db9cfd52
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33099.table
@@ -0,0 +1,15 @@
+1 1 GEOLOCATION OF CHANNEL IS ERRONEOUS OR DEGRADED
+2 2 TIME SEQUENCE ERROR
+3 3 MISSING OR CORRUPTED NAVATT FILE LED TO THE USE OF PREDICTED ORBIT FILES
+4 4 NAVATT ATTITUDE DATA IS DEGRADED
+5 5 TIME CORRELATION ERROR (MISSING IERS BULLETIN)
+6 6 INVALID EPHEMERIS OR ATTITUDE DATA
+7 7 SATELLITE MANOEUVRE OCCURS IN CURRENT SCAN
+8 8 NON-NOMINAL ATTITUDE WITH YAW, PITCH, ROLL ERROR ABOVE THRESHOLD DELTA_YPR (NOMINALLY THESE ANGLES ARE 0.0 DEG FOR YSM)
+9 9 SAMPLING TIME NOT WITHIN PRESCRIBED LIMITS
+10 10 SCAN VELOCITY NOT WITHIN PRESCRIBED LIMITS
+11 11 BAD POINTING (SENSOR LOS DOES NOT INTERSECT ELLIPSOID OR NOT COMPLIANT WITH OBSERVATION AZIMUTH/ELEVATION LIMITS)
+12 12 INVALID SOLAR AZIMUTH/ZENITH ANGLES COMPUTED
+13 13 DEM GEOLOCATION NOT PERFORMED (WITH USE_DEM_FLAG = 1)
+14 14 ERROR IN LAND FRACTION COMPUTATION
+15 15 PREDICTED ORBIT FILE NOT AVAILABLE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33100.table b/definitions/bufr/tables/0/wmo/43/codetables/33100.table
new file mode 100644
index 000000000..0a5f9f64b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33100.table
@@ -0,0 +1,7 @@
+1 1 PRT OR THM TEMPERATURES ARE MISSING OR WITH ANOMALOUS READINGS
+2 2 PRT TEMPERATURES OF OBCT USED IN THE RADIOMETRIC CALIBRATIONS IS MISSING OR WITH ANOMALOUS READINGS
+3 3 PRT TEMPERATURES OF SVR USED IN THE RADIOMETRIC CALIBRATIONS ARE MISSING OR WITH ANOMALOUS READINGS
+4 4 PRT TEMPERATURES OF IRP AND SUN SHIELD ARE MISSING OR WITH ANOMALOUS READINGS
+5 5 THM TEMPERATURE OF BACK-END ARE MISSING OR WITH ANOMALOUS READINGS
+6 6 THM TEMPERATURE OF FRONT-END ARE MISSING OR WITH ANOMALOUS READINGS
+7 7 PRT TEMPERATURES OF MAIN REFLECTOR ARE MISSING OR WITH ANOMALOUS READINGS
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33101.table b/definitions/bufr/tables/0/wmo/43/codetables/33101.table
new file mode 100644
index 000000000..7257ef9e4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33101.table
@@ -0,0 +1,12 @@
+1 1 RADIOMETRIC CALIBRATION FAILED OR IS DEGRADED
+2 2 OBCT VIEW COUNTS AVERAGED VALUE OVER SCANS IS MISSING
+3 3 COLD SPACE VIEW COUNTS AVERAGED VALUE OVER SCANS IS MISSING
+4 4 OBCT VIEW COUNTS AVERAGED VALUE OVER SCANS IS DEGRADED DUE TO MISSING OR ANOMALOUS COUNTS VALUES
+5 5 COLD SPACE VIEW COUNTS AVERAGED VALUE OVER SCANS IS DEGRADED DUE TO MISSING OR ANOMALOUS COUNTS VALUES
+6 6 OBCT VIEW RADIANCE AVERAGED VALUE OVER SCANS IS MISSING
+7 7 COLD SPACE VIEW RADIANCE AVERAGED VALUE OVER SCANS IS MISSING
+8 8 OBCT VIEW RADIANCE AVERAGED VALUE OVER SCANS IS DEGRADED DUE TO MISSING OR ANOMALOUS VALUES
+9 9 COLD SPACE VIEW RADIANCE AVERAGED VALUE OVER SCANS IS DEGRADED DUE TO MISSING OR ANOMALOUS VALUES
+10 10 PRT OR THM TEMPERATURES OF CURRENT SCAN ARE MISSING OR WITH ANOMALOUS READINGS
+11 11 MOON INTRUSION IN COLD SPACE DEGRADED CALIBRATION (LESS THAN NVALID_C VALID SAMPLES ARE NOT AFFECTED BY MOON FOR THE CONSIDERED CHANNEL AND SCAN)
+12 12 DEGRADED OR MISSING BACK-END TEMPERATURES LEAD TO DEGRADED CALIBRATION
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33102.table b/definitions/bufr/tables/0/wmo/43/codetables/33102.table
new file mode 100644
index 000000000..cc406573d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33102.table
@@ -0,0 +1,9 @@
+1 1 SCAN IS DEGRADED IN RAW DATA RECORDS
+2 2 TIME SEQUENCE ERROR
+3 3 CURRENT SCAN IS ACQUIRED AFTER A GAP
+4 4 SCAN IS IN PERIOD OF INITIALIZATION OF CALIBRATION OF DATA AVERAGES OVER SCANS (BECAUSE OF COLD START/COLD END, MISSING WARM/COLD L0 PACKETS OR DATA GAPS)
+5 5 MOON INTRUSION ANGLE IN SPACE VIEW BELOW THRESHOLD FOR AT LEAST ONE CHANNEL
+6 6 MOON CORRECTION IS APPLIED BUT IS DEGRADED FOR AT LEAST ONE CHANNEL
+7 7 SUN GLINT ANGLE BELOW THRESHOLD FOR AT LEAST ONE CHANNEL
+8 8 SATELLITE MANOEUVRE OCCURS IN CURRENT SCAN
+9 9 MISSING WARM OR COLD L0 PACKETS FOR THE CONSIDERED SCAN
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33103.table b/definitions/bufr/tables/0/wmo/43/codetables/33103.table
new file mode 100644
index 000000000..7683c6afa
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33103.table
@@ -0,0 +1,8 @@
+1 1 ICI SPECTRAL RADIANCE DATA OF CHANNEL IS MISSING OR DEGRADED
+2 2 EARTH VIEW COUNTS OF CHANNEL WITHIN SCAN ARE MISSING OR OUT OF BOUNDS
+3 3 RADIOMETRIC CALIBRATION FAILED OR IS DEGRADED
+4 4 GEOLOCATION OF CHANNEL IS ERRONEOUS OR DEGRADED
+5 5 NEΔT OF THIS DATA GRANULE IS ABOVE THRESHOLD
+6 6 MR EMISSIVITY AND SPILLOVER CORRECTION FAILED OR DEGRADED
+7 7 MR SIDELOBE CORRECTION FAILED OR DEGRADED
+8 8 CHANNEL IS DEFECTIVE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33104.table b/definitions/bufr/tables/0/wmo/43/codetables/33104.table
new file mode 100644
index 000000000..56852332e
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33104.table
@@ -0,0 +1,15 @@
+1 1 GEOLOCATION OF CHANNELS IS ERRONEOUS OR DEGRADED
+2 2 TIME SEQUENCE ERROR
+3 3 MISSING OR CORRUPTED NAVATT FILE LED TO THE USE OF PREDICTED ORBIT FILES
+4 4 NAVATT ATTITUDE DATA IS DEGRADED
+5 5 TIME CORRELATION ERROR (MISSING IERS BULLETIN)
+6 6 INVALID EPHEMERIS OR ATTITUDE DATA
+7 7 SATELLITE MANOEUVRE OCCURS IN CURRENT SCAN
+8 8 NON-NOMINAL ATTITUDE WITH YAW, PITCH, ROLL ERROR ABOVE THRESHOLD DELTA_YPR (NOMINALLY THESE ANGLES ARE 0.0 DEG FOR YSM)
+9 9 SAMPLING TIME NOT WITHIN PRESCRIBED LIMITS
+10 10 SCAN VELOCITY NOT WITHIN PRESCRIBED LIMITS
+11 11 BAD POINTING (SENSOR LOS DOES NOT INTERSECT ELLIPSOID OR NOT COMPLIANT WITH OBSERVATION AZIMUTH/ELEVATION LIMITS)
+12 12 INVALID SOLAR AZIMUTH/ZENITH ANGLES COMPUTED
+13 13 DEM GEOLOCATION NOT PERFORMED (WITH USE_DEM_FLAG = 1)
+14 14 ERROR IN LAND FRACTION COMPUTATION
+15 15 PREDICTED ORBIT FILE NOT AVAILABLE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33105.table b/definitions/bufr/tables/0/wmo/43/codetables/33105.table
new file mode 100644
index 000000000..e4a8ce397
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33105.table
@@ -0,0 +1,9 @@
+1 1 MOON CONTAMINATION CORRECTION ON COLD SPACE VIEW COUNTS IS NOT APPLIED
+2 2 MR SPILLOVER CORRECTION RELATIVE TO EMISSION BY INSTRUMENT PLATFORM IS NOT APPLIED
+3 3 SVR SPILLOVER CORRECTION RELATIVE TO EMISSION BY INSTRUMENT PLATFORM IS NOT APPLIED
+4 4 SVR SIDELOBE CORRECTION IS NOT APPLIED
+5 5 FULL CROSS-POLARIZATION CORRECTION INCLUDING SMALL ANGLE CORRECTION IS APPLIED
+6 6 DYNAMIC SIDELOBE CORRECTION IS NOT APPLIED FOR ICI-1
+7 7 DYNAMIC SIDELOBE CORRECTION IS NOT APPLIED FOR ICI-2
+8 8 DYNAMIC SIDELOBE CORRECTION IS NOT APPLIED FOR ICI-3
+9 9 DYNAMIC SIDELOBE CORRECTION IS NOT APPLIED FOR ICI-4 V AND ICI-4 H
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33106.table b/definitions/bufr/tables/0/wmo/43/codetables/33106.table
new file mode 100644
index 000000000..9171a2f1a
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33106.table
@@ -0,0 +1,12 @@
+1 1 MOON CONTAMINATION CORRECTION ON COLD SPACE VIEW COUNTS IS NOT APPLIED
+2 2 CALIBRATION WITH NOISE DIODES IS NOT APPLIED FOR AT LEAST ONE CHANNEL AMONG MWI-1 TO MWI-3
+3 3 MR SPILLOVER CORRECTION RELATIVE TO EMISSION BY INSTRUMENT PLATFORM IS NOT APPLIED
+4 4 SVR SPILLOVER CORRECTION RELATIVE TO EMISSION BY INSTRUMENT PLATFORM IS NOT APPLIED
+5 5 SVR SIDELOBE CORRECTION IS NOT APPLIED
+6 6 FULL CROSS-POLARIZATION CORRECTION INCLUDING SMALL ANGLE CORRECTION IS APPLIED
+7 7 RFI CORRECTION IN THE EARTH VIEW IS NOT APPLIED
+8 8 DYNAMIC SIDELOBE CORRECTION IS NOT APPLIED FOR MWI-1
+9 9 DYNAMIC SIDELOBE CORRECTION IS NOT APPLIED FOR MWI-2
+10 10 DYNAMIC SIDELOBE CORRECTION IS NOT APPLIED FOR MWI-3
+11 11 DYNAMIC SIDELOBE CORRECTION IS NOT APPLIED FOR MWI-4
+12 12 DYNAMIC SIDELOBE CORRECTION IS NOT APPLIED FOR MWI-8
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33107.table b/definitions/bufr/tables/0/wmo/43/codetables/33107.table
new file mode 100644
index 000000000..8487a7300
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33107.table
@@ -0,0 +1,15 @@
+1 1 NON-NOMINAL SCAN DUE TO GAP
+2 2 NON-NOMINAL WARM TARGET TEMPERATURE
+3 3 NON-NOMINAL ALONG-TRACK AVERAGING OF WARM TARGET TEMPERATURES
+4 4 NON-NOMINAL INSTRUMENT TEMPERATURE
+5 5 NON-NOMINAL ALONG-TRACK AVERAGING OF INSTRUMENT TEMPERATURES
+6 6 NON-NOMINAL ROTATING REFLECTOR TEMPERATURE
+7 7 NON-NOMINAL ALONG-TRACK AVERAGING OF ROTATING REFLECTOR TEMPERATURES
+8 8 NON-NOMINAL ANTENNA SCAN ANGLE EARTH VIEW
+9 9 NON-NOMINAL ANTENNA SCAN ANGLE COLD VIEW
+10 10 NON-NOMINAL ANTENNA SCAN ANGLE WARM VIEW
+11 11 NON-NOMINAL GEOLOCATION
+12 12 NON-NOMINAL LSM AND DEM ASSIGNMENT
+13 13 ONGOING SATELLITE MANOEUVRE
+14 14 REDUNDANT 50GHZ REC AND PRT SET IN USE
+15 15 RESERVED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33108.table b/definitions/bufr/tables/0/wmo/43/codetables/33108.table
new file mode 100644
index 000000000..70f883e37
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33108.table
@@ -0,0 +1,12 @@
+1 1 NON-NOMINAL CONDITION
+2 2 SCAN NOT PROCESSED
+3 3 GEOLOCATION NOT SUCCESSFUL
+4 4 ORBIT NOT INITIALIZED WITH NAVATT
+5 5 ATTITUDE NOT INITIALIZED WITH NAVATT
+6 6 PREDICTED ORBIT FILE INGEST ERROR
+7 7 MANOEUVRE
+8 8 IERS BULLETIN A INGEST ERROR
+9 9 TIME CORRELATION AND EOP INITIALIZED WITH PREDICTED ORBIT FILE
+10 10 FULL ACCURACY OF NAVATT INITIALIZED ATTITUDE NOT REACHED
+11 11 POINTING MODE NOT YSM
+12 12 NAVATT INGEST ERROR
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33109.table b/definitions/bufr/tables/0/wmo/43/codetables/33109.table
new file mode 100644
index 000000000..467f6c0ae
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33109.table
@@ -0,0 +1,6 @@
+1 1 MISSING INPUT PRODUCT(S)
+2 2 DATA GAP(S)
+3 3 CORRUPTED INPUT PRODUCT(S)
+4 4 INSTRUMENT ANOMALY
+5 5 MISSING OR DEGRADED AUXILIARY DATA
+6 6 DEGRADED DUE TO MANOEUVRE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33110.table b/definitions/bufr/tables/0/wmo/43/codetables/33110.table
new file mode 100644
index 000000000..ac33f50c9
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33110.table
@@ -0,0 +1,8 @@
+1 1 CHANNEL IS OFF
+2 2 NON-NOMINAL MEAN WARM VIEW COUNT
+3 3 NON-NOMINAL ALONG-TRACK AVERAGING OF WARM VIEW COUNTS
+4 4 NON-NOMINAL MEAN COLD VIEW COUNT
+5 5 NON-NOMINAL ALONG-TRACK AVERAGING OF COLD VIEW COUNTS
+6 6 NON-NOMINAL CALIBRATION COEFFICIENTS
+7 7 MOON INTRUSION IN SOME OF THE COLD VIEW FOVS
+8 8 NON-NOMINAL PROCESSING OR EXCESSIVE VALUE FOR NEDT (COLD OR WARM)
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33111.table b/definitions/bufr/tables/0/wmo/43/codetables/33111.table
new file mode 100644
index 000000000..bbaa5b5ed
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33111.table
@@ -0,0 +1,31 @@
+1 1 PREDICTED ORBIT FILE USED
+2 2 MANOEUVRE TAKING PLACE
+3 3 RESERVED
+4 4 SATELLITE IS NOT IN YAW STEERING MODE
+5 5 TRANSPONDER SIGNAL IS PRESENT
+6 6 NOISE ESTIMATE IS POOR
+7 7 NOISE ESTIMATE IS VERY POOR
+8 8 NOISE OUTLIER IS PRESENT
+9 9 ANCILLARY DATA IS POOR
+10 10 ANCILLARY DATA IS VERY POOR
+11 11 CHARACTERIZATION TABLE LIMITS EXCEEDED
+12 12 POWER-GAIN ESTIMATE IS POOR
+13 13 POWER-GAIN ESTIMATE IS VERY POOR
+14 14 POWER-GAIN OUT OF LIMITS
+15 15 WAVEGUIDE LOSS ESTIMATE IS POOR
+16 16 WAVEGUIDE LOSS ESTIMATE IS VERY POOR
+17 17 WAVEGUIDE TABLE LIMITS EXCEEDED
+18 18 ECHO IS OUT OF ADC RANGE
+19 19 RESERVED
+20 20 MISSING NORMALIZATION TABLES
+21 21 NUMBER OF SAMPLES IN WINDOW IS LOW
+22 22 NUMBER OF SAMPLES IN WINDOW IS VERY LOW
+23 23 NEGATIVE BACKSCATTER IN RESAMPLED DATA
+24 24 POSSIBLE INTERFERENCE FROM SOLAR ARRAY
+25 25 RESERVED
+26 26 RESERVED
+27 27 RESERVED
+28 28 LAND
+29 29 WATER
+30 30 ASCENDING PASS
+31 31 DESCENDING PASS
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33113.table b/definitions/bufr/tables/0/wmo/43/codetables/33113.table
new file mode 100644
index 000000000..a8f4ce101
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33113.table
@@ -0,0 +1,11 @@
+1 1 GENERAL QUALITY (0 IF BITS 2 TO 11 ARE ALL 0, 1 OTHERWISE)
+2 2 SOUNDER RADIOMETRIC
+3 3 SOUNDER SPECTRAL
+4 4 IMAGER GEOMETRIC
+5 5 IMAGER CLASSIFICATION
+6 6 IMAGER RADIOMETRIC
+7 7 GENERAL SOUNDER
+8 8 PRESENCE OF MATHEMATICAL ERRORS
+9 9 TM DATA MISSING
+10 10 TM DATA CORRUPT
+11 11 TM INTEGRITY INSTRUMENT
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33114.table b/definitions/bufr/tables/0/wmo/43/codetables/33114.table
new file mode 100644
index 000000000..576d09d85
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33114.table
@@ -0,0 +1,16 @@
+1 1 TEMPERATURE PROFILE
+2 2 WATER VAPOUR PROFILE
+3 3 OZONE PROFILE
+4 4 SURFACE SKIN TEMPERATURE
+5 5 SURFACE AIR TEMPERATURE
+6 6 SURFACE AIR DEW POINT TEMPERATURE
+7 7 SURFACE PRESSURE
+8 8 SURFACE SKIN TEMPERATURE ERROR ESTIMATE (QUALITY INDICATOR)
+9 9 SURFACE AIR TEMPERATURE ERROR ESTIMATE (QUALITY INDICATOR)
+10 10 SURFACE AIR DEW POINT TEMPERATURE ERROR ESTIMATE (QUALITY INDICATOR)
+11 11 SURFACE PRESSURE ERROR ESTIMATE (QUALITY INDICATOR)
+12 12 SURFACE EMISSIVITY COARSE INFRARED SPECTRUM
+13 13 SURFACE EMISSIVITY MICROWAVE SPECTRUM
+14 14 CO2 PROFILE
+15 15 CH4 PROFILE
+16 16 N2O PROFILE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33115.table b/definitions/bufr/tables/0/wmo/43/codetables/33115.table
new file mode 100644
index 000000000..911a3c2e7
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33115.table
@@ -0,0 +1,6 @@
+0 0 GOOD
+1 1 CLOUDY NADIR
+2 2 CLOUDY OBLIQUE
+3 3 GLINT NADIR
+4 4 GLINT OBLIQUE
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33116.table b/definitions/bufr/tables/0/wmo/43/codetables/33116.table
new file mode 100644
index 000000000..576d09d85
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33116.table
@@ -0,0 +1,16 @@
+1 1 TEMPERATURE PROFILE
+2 2 WATER VAPOUR PROFILE
+3 3 OZONE PROFILE
+4 4 SURFACE SKIN TEMPERATURE
+5 5 SURFACE AIR TEMPERATURE
+6 6 SURFACE AIR DEW POINT TEMPERATURE
+7 7 SURFACE PRESSURE
+8 8 SURFACE SKIN TEMPERATURE ERROR ESTIMATE (QUALITY INDICATOR)
+9 9 SURFACE AIR TEMPERATURE ERROR ESTIMATE (QUALITY INDICATOR)
+10 10 SURFACE AIR DEW POINT TEMPERATURE ERROR ESTIMATE (QUALITY INDICATOR)
+11 11 SURFACE PRESSURE ERROR ESTIMATE (QUALITY INDICATOR)
+12 12 SURFACE EMISSIVITY COARSE INFRARED SPECTRUM
+13 13 SURFACE EMISSIVITY MICROWAVE SPECTRUM
+14 14 CO2 PROFILE
+15 15 CH4 PROFILE
+16 16 N2O PROFILE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/33117.table b/definitions/bufr/tables/0/wmo/43/codetables/33117.table
new file mode 100644
index 000000000..576d09d85
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/33117.table
@@ -0,0 +1,16 @@
+1 1 TEMPERATURE PROFILE
+2 2 WATER VAPOUR PROFILE
+3 3 OZONE PROFILE
+4 4 SURFACE SKIN TEMPERATURE
+5 5 SURFACE AIR TEMPERATURE
+6 6 SURFACE AIR DEW POINT TEMPERATURE
+7 7 SURFACE PRESSURE
+8 8 SURFACE SKIN TEMPERATURE ERROR ESTIMATE (QUALITY INDICATOR)
+9 9 SURFACE AIR TEMPERATURE ERROR ESTIMATE (QUALITY INDICATOR)
+10 10 SURFACE AIR DEW POINT TEMPERATURE ERROR ESTIMATE (QUALITY INDICATOR)
+11 11 SURFACE PRESSURE ERROR ESTIMATE (QUALITY INDICATOR)
+12 12 SURFACE EMISSIVITY COARSE INFRARED SPECTRUM
+13 13 SURFACE EMISSIVITY MICROWAVE SPECTRUM
+14 14 CO2 PROFILE
+15 15 CH4 PROFILE
+16 16 N2O PROFILE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/35000.table b/definitions/bufr/tables/0/wmo/43/codetables/35000.table
new file mode 100644
index 000000000..8c57023e3
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/35000.table
@@ -0,0 +1 @@
+1023 1023 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/35001.table b/definitions/bufr/tables/0/wmo/43/codetables/35001.table
new file mode 100644
index 000000000..bba0c812e
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/35001.table
@@ -0,0 +1,4 @@
+0 0 REAL TIME
+1 1 NEAR-REAL TIME
+2 2 NON-REAL TIME
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/35030.table b/definitions/bufr/tables/0/wmo/43/codetables/35030.table
new file mode 100644
index 000000000..5b83f8b81
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/35030.table
@@ -0,0 +1,10 @@
+0 0 NO DISCREPANCIES
+1 1 NON-COMPLIANCE WITH STANDARD AND RECOMMENDED PRACTICES AND PROCEDURES INCLUDING THOSE OF MONITORING
+2 2 CATALOGUES OF METEOROLOGICAL BULLETINS NOT UPDATED IN A TIMELY MANNER
+3 3 INCORRECT ROUTING DIRECTORIES
+4 4 LACK OF FLEXIBILITY IN THE ROUTING ARRANGEMENTS
+5 5 DEFICIENCIES IN THE OPERATION OF GTS CENTRES AND CIRCUITS
+6 6 LOSS OF DATA OR DELAYS IN RELAYING DATA ON THE GTS
+7 7 ROUTING OF DATA DIFFERENT FROM THE ROUTING PROVIDED IN THE PLAN
+8 8 VARIOUS MALPRACTICES
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/35031.table b/definitions/bufr/tables/0/wmo/43/codetables/35031.table
new file mode 100644
index 000000000..bdd705ddd
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/35031.table
@@ -0,0 +1,20 @@
+1 1 SUFFICIENT AND ALL OF ACCEPTABLE QUALITY
+2 2 SUFFICIENT BUT PARTLY OF ACCEPTABLE QUALITY
+3 3 INSUFFICIENT BUT ALL OF ACCEPTABLE QUALITY
+4 4 INSUFFICIENT AND OF UNACCEPTABLE QUALITY
+5 5 SOME MESSAGES NOT COMPLETE
+6 6 SUSPECT OR WRONGLY CODED GROUPS COULD NOT BE INTERPRETED CONFIDENTLY
+7 7 GROSS CODING ERRORS
+8 8 TRANSMISSION SEQUENTIAL ORDER NOT OBSERVED
+9 9 REPORT COMPLETELY GARBLED AND THUS DISCARDED
+10 10 DEFICIENCIES IDENTIFIED AND RECTIFIED
+11 11 DEFICIENCIES IDENTIFIED BUT NOT RECTIFIED
+12 12 DEFICIENCIES NOT IDENTIFIED
+13 13 MEASURING ERRORS
+14 14 MUTUAL INCONSISTENCY
+15 15 TEMPORAL INCONSISTENCY
+16 16 FORECAST ERROR
+17 17 BIAS
+18 18 IMPROVE SYSTEM OF QUALITY CONTROL
+19 19 EXPAND TRAINING PROGRAMMES
+127 127 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/35032.table b/definitions/bufr/tables/0/wmo/43/codetables/35032.table
new file mode 100644
index 000000000..7f53a05f9
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/35032.table
@@ -0,0 +1,10 @@
+1 1 DATA GROUPS MISSING DUE TO RADIO FADING
+2 2 DATA GROUPS MISSING DUE TO OUTAGE OF CENTRE
+3 3 DATA GROUPS MISSING DUE TO OUTAGE OF CIRCUIT
+4 4 NON-IMPLEMENTATION OR MAINTENANCE OF REQUIRED RBSN DENSITY
+5 5 SHORTAGE OF QUALIFIED STAFF TO MAN STATIONS
+6 6 LACK OF CONSUMABLES
+7 7 INSTRUMENT FAILURE
+8 8 NON-ADHERENCE TO TELECOMMUNICATION PROCEDURES
+9 9 SOME OBSERVING PROGRAMMES CEASED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/35033.table b/definitions/bufr/tables/0/wmo/43/codetables/35033.table
new file mode 100644
index 000000000..86e9592ef
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/35033.table
@@ -0,0 +1,12 @@
+1 1 NO DEFICIENCY
+2 2 OBSERVATIONS NOT MADE REGULARLY
+3 3 OBSERVATIONS NOT MADE AT RIGHT TIME
+4 4 OBSERVATIONS MADE BUT NOT DISSEMINATED
+5 5 OBSERVATIONS MADE AND SENT TO INCORRECT USERS
+6 6 COLLECTION NOT RECEIVED
+7 7 COLLECTION TRANSMITTED LATE
+8 8 COLLECTION NOT TRANSMITTED
+9 9 DIFFICULTIES IN HF PROPAGATION AND SELECTION OF SUITABLE FREQUENCY
+10 10 DIFFICULTIES IN MAINTENANCE OF COMMUNICATION EQUIPMENT AT REMOTE STATIONS
+11 11 NO ALTERNATIVE ARRANGEMENT FOR ROUTING METEOROLOGICAL OBSERVATION
+123 123 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/35034.table b/definitions/bufr/tables/0/wmo/43/codetables/35034.table
new file mode 100644
index 000000000..7297664cf
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/35034.table
@@ -0,0 +1,7 @@
+1 1 SLIGHT IMPROVEMENT
+2 2 SIGNIFICANT IMPROVEMENT
+3 3 MOST SIGNIFICANT IMPROVEMENT
+4 4 STEADY
+5 5 DECREASING
+6 6 EFFORTS REQUIRED TO IMPROVE NIGHT-TIME OBSERVATIONS
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/35035.table b/definitions/bufr/tables/0/wmo/43/codetables/35035.table
new file mode 100644
index 000000000..0fce6ddb7
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/35035.table
@@ -0,0 +1,20 @@
+0 0 RESERVED
+1 1 BALLOON BURST
+2 2 BALLOON FORCED DOWN BY ICING
+3 3 LEAKING OR FLOATING BALLOON
+4 4 WEAK OR FADING SIGNAL
+5 5 BATTERY FAILURE
+6 6 GROUND EQUIPMENT FAILURE
+7 7 SIGNAL INTERFERENCE
+8 8 RADIOSONDE FAILURE
+9 9 EXCESSIVE MISSING DATA FRAMES
+10 10 RESERVED
+11 11 EXCESSIVE MISSING TEMPERATURE
+12 12 EXCESSIVE MISSING PRESSURE
+13 13 USER TERMINATED
+14 14 SUDDEN LOSS OF SIGNAL
+15 15 TRACKING LOST
+16 16 INCREASING PRESSURE
+17 17 INVALID AND/OR MISSED DATA TIME LIMITS EXCEEDED
+30 30 OTHER
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40005.table b/definitions/bufr/tables/0/wmo/43/codetables/40005.table
new file mode 100644
index 000000000..045a4f1b1
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40005.table
@@ -0,0 +1,5 @@
+1 1 SOIL MOISTURE BETWEEN -20% AND 0%
+2 2 SOIL MOISTURE BETWEEN 100% AND 120%
+3 3 CORRECTION OF WET BACKSCATTER REFERENCE
+4 4 CORRECTION OF DRY BACKSCATTER REFERENCE
+5 5 CORRECTION OF VOLUME SCATTERING IN SAND
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40006.table b/definitions/bufr/tables/0/wmo/43/codetables/40006.table
new file mode 100644
index 000000000..d53382eff
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40006.table
@@ -0,0 +1,8 @@
+1 1 NOT SOIL
+2 2 SENSITIVITY TO SOIL MOISTURE BELOW LIMIT
+3 3 AZIMUTHAL NOISE ABOVE LIMIT
+4 4 BACKSCATTER FORE-AFT BEAM OUT OF RANGE
+5 5 SLOPE MID-FORE BEAM OUT OF RANGE
+6 6 SLOPE MID-AFT BEAM OUT OF RANGE
+7 7 SOIL MOISTURE BELOW -20%
+8 8 SOIL MOISTURE ABOVE 120%
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40011.table b/definitions/bufr/tables/0/wmo/43/codetables/40011.table
new file mode 100644
index 000000000..ddc7e8672
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40011.table
@@ -0,0 +1,4 @@
+1 1 MEAN SEA-SURFACE (MSS) INTERPOLATION FLAG
+2 2 OCEAN TIDE SOLUTION 1 INTERPOLATION FLAG (0 = 4 POINTS OVER OCEAN, 1 = LESS THAN 4 POINTS)
+3 3 OCEAN TIDE SOLUTION 2 INTERPOLATION FLAG (0 = 4 POINTS OVER OCEAN, 1 = LESS THAN 4 POINTS)
+4 4 METEOROLOGICAL DATA INTERPOLATION FLAG (0 = 4 POINTS OVER OCEAN, 1 = LESS THAN 4 POINTS)
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40012.table b/definitions/bufr/tables/0/wmo/43/codetables/40012.table
new file mode 100644
index 000000000..d8ce14d86
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40012.table
@@ -0,0 +1,3 @@
+1 1 18.7 GHZ BRIGHTNESS TEMPERATURE
+2 2 23.8 GHZ BRIGHTNESS TEMPERATURE
+3 3 34 GHZ BRIGHTNESS TEMPERATURE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40013.table b/definitions/bufr/tables/0/wmo/43/codetables/40013.table
new file mode 100644
index 000000000..766e93f79
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40013.table
@@ -0,0 +1,5 @@
+0 0 INTERPOLATION WITH NO GAP BETWEEN JMR DATA
+1 1 INTERPOLATION WITH GAPS BETWEEN JMR DATA
+2 2 EXTRAPOLATION OF JMR DATA
+3 3 FAILURE OF EXTRAPOLATION AND INTERPOLATION
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40020.table b/definitions/bufr/tables/0/wmo/43/codetables/40020.table
new file mode 100644
index 000000000..fa1d1f5c5
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40020.table
@@ -0,0 +1,16 @@
+1 1 NZPD AND COMPLEX CALIBRATION ERROR
+2 2 BAND 3 AFFECTED BY SPIKE
+3 3 BAND 3 AFFECTED BY SATURATION
+4 4 BAND 2 AFFECTED BY SPIKE
+5 5 BAND 1 AFFECTED BY SPIKE
+6 6 OVERFLOW/UNDER FLOW
+7 7 ON-BOARD PROCESSING ERROR
+8 8 SPECTRAL CALIBRATION ERROR
+9 9 RADIOMETRIC CALIBRATION ERROR
+10 10 MISSING AVHRR DATA
+11 11 MISSING IIS DATA
+12 12 MISSING SOUNDER DATA
+13 13 GQISFLAGQUAL SUMMARY FLAG FOR ALL BANDS
+14 14 ON-GROUND PROCESSING ERROR
+15 15 INTER-CALIBRATION ERROR IASI/AVHRR
+16 16 SPARE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40023.table b/definitions/bufr/tables/0/wmo/43/codetables/40023.table
new file mode 100644
index 000000000..2e4cbfb69
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40023.table
@@ -0,0 +1,4 @@
+1 1 BAND SEQUENCE (0 = 3KU_1C_3KU, 1 = 2KU_1C_2KU)
+2 2 C BAND FREQUENCY (0 = 320 MHZ, 1 = 100 MHZ)
+3 3 C BAND STATUS (0 = ON, 1 = OFF)
+4 4 KU BAND STATUS (0 = ON, 1 = OFF)
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40024.table b/definitions/bufr/tables/0/wmo/43/codetables/40024.table
new file mode 100644
index 000000000..c8421e5af
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40024.table
@@ -0,0 +1,5 @@
+0 0 2 MAPS AVAILABLE (6 HOURS APART)
+1 1 2 MAPS AVAILABLE (> 6 HOURS APART)
+2 2 1 MAP AVAILABLE; DATA EXTRAPOLATED
+3 3 NO MAPS USED
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40025.table b/definitions/bufr/tables/0/wmo/43/codetables/40025.table
new file mode 100644
index 000000000..741430292
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40025.table
@@ -0,0 +1,4 @@
+0 0 GOOD
+1 1 BAD
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40028.table b/definitions/bufr/tables/0/wmo/43/codetables/40028.table
new file mode 100644
index 000000000..e094f29dc
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40028.table
@@ -0,0 +1,16 @@
+0 0 GOOD DATA
+1 1 POSSIBLE SUN GLINT
+2 2 POSSIBLE RADIO-FREQUENCY INTERFERENCE
+3 3 DEGRADED GEOLOCATION DATA
+4 4 DATA CORRECTED FOR WARM LOAD INTRUSION
+5 5 SCAN BLANKING ON
+6 6 DATA IS MISSING FROM FILE OR UNREADABLE
+7 7 UNPHYSICAL BRIGHTNESS TEMPERATURE
+8 8 ERROR IN GEOLOCATION DATA
+9 9 DATA MISSING IN ONE CHANNEL
+10 10 DATA MISSING IN MULTIPLE CHANNELS
+11 11 LAT/LON VALUES ARE OUT OF RANGE
+12 12 NON-NORMAL STATUS MODES
+13 13 DISTANCE TO CORRESPONDING LOW FREQUENCY PIXEL > 7 KM
+14 14 RESERVED
+15 15 MISSING VALUE (NO QUALITY INFORMATION AVAILABLE)
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40036.table b/definitions/bufr/tables/0/wmo/43/codetables/40036.table
new file mode 100644
index 000000000..1ee4ab203
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40036.table
@@ -0,0 +1,6 @@
+0 0 CLEAR
+1 1 CLOUD
+2 2 AEROSOL
+3 3 ATTENUATED
+4 4 SURFACE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40043.table b/definitions/bufr/tables/0/wmo/43/codetables/40043.table
new file mode 100644
index 000000000..859484624
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40043.table
@@ -0,0 +1,4 @@
+0 0 THE PLATFORM IS NOT UNDERGOING A MANOEUVRE
+1 1 THE PLATFORM IS UNDERGOING A MANOEUVRE, NOMINAL PROCESSING
+2 2 THE PLATFORM IS UNDERGOING A MANOEUVRE, NO PROCESSING
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40045.table b/definitions/bufr/tables/0/wmo/43/codetables/40045.table
new file mode 100644
index 000000000..08b600150
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40045.table
@@ -0,0 +1,4 @@
+1 1 CLOUD PRODUCTS RETRIEVED WITH THE CHI-SQUARED METHOD
+2 2 CLOUD PRODUCTS RETRIEVED WITH THE CO2-SLICING
+3 3 HEIGHT ASSIGNMENT PERFORMED WITH STATISTICAL FIRST GUESS RETRIEVAL
+4 4 HEIGHT ASSIGNMENT PERFORMED WITH NWP FORECASTS
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40046.table b/definitions/bufr/tables/0/wmo/43/codetables/40046.table
new file mode 100644
index 000000000..31077db10
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40046.table
@@ -0,0 +1,5 @@
+0 0 THE IASI IFOV IS CLEAR
+1 1 SMALL CLOUD CONTAMINATION POSSIBLE
+2 2 THE IASI IFOV IS PARTIALLY COVERED BY CLOUDS
+3 3 HIGH OR FULL CLOUD COVERAGE
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40047.table b/definitions/bufr/tables/0/wmo/43/codetables/40047.table
new file mode 100644
index 000000000..f7f29c7b8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40047.table
@@ -0,0 +1,4 @@
+0 0 THE MEASUREMENTS AND SIDE INFORMATION ARE AVAILABLE AND OF GOOD QUALITY FOR L2 PROCESSING
+1 1 THE L1C PRODUCTS ARE OF DEGRADED QUALITY ACCORDING TO L1C FLAGS, NO L2 PROCESSING
+2 2 QUALITY CONTROL INDICATES THAT THE L1C DATA ARE OF DEGRADED QUALITY (NOT INDICATED BY THE IASI L1C FLAGS), NO L2 PROCESSING
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40048.table b/definitions/bufr/tables/0/wmo/43/codetables/40048.table
new file mode 100644
index 000000000..ee5d4fe0f
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40048.table
@@ -0,0 +1,4 @@
+0 0 THE EXPECTED AMSU MEASUREMENTS ARE AVAILABLE, OF GOOD QUALITY AND COLLOCATED WITH IASI FOR PROCESSING
+1 1 AMSU-A DATA ARE AVAILABLE BUT OF DEGRADED QUALITY (ACCORDING TO AMSU L1 FLAGS OR QC TESTS) AND NOT USED FOR PROCESSING
+2 2 NO COINCIDENT (TIME AND SPACE) AMSU MEASUREMENTS AVAILABLE FOR PROCESSING
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40049.table b/definitions/bufr/tables/0/wmo/43/codetables/40049.table
new file mode 100644
index 000000000..19d1fe9d8
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40049.table
@@ -0,0 +1,12 @@
+4 4 IASI CLOUD OPTICAL THICKNESS INDICATES A CLOUD
+5 5 IASI CLOUD OPTICAL THICKNESS COMPUTED
+6 6 AVHRR HETEROGENEITY TEST INDICATES A CLOUD
+7 7 AVHRR HETEROGENEITY TEST EXECUTED
+8 8 IASI-AVHRR ANN CLOUD TEST INDICATES A CLOUD
+9 9 IASI-AVHRR ANN CLOUD TEST EXECUTED
+10 10 AVHRR INTEGRATED CLOUD FRACTION INDICATES A CLOUD
+11 11 AVHRR INTEGRATED CLOUD FRACTION ASSESSED
+12 12 AMSU CLOUD TEST INDICATES A CLOUD
+13 13 AMSU CLOUD TEST EXECUTED
+14 14 IASI WINDOW CLOUD TEST INDICATES A CLOUD
+15 15 IASI WINDOW CLOUD TEST EXECUTED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40050.table b/definitions/bufr/tables/0/wmo/43/codetables/40050.table
new file mode 100644
index 000000000..503ab1443
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40050.table
@@ -0,0 +1,3 @@
+5 5 MHS INCLUDED
+6 6 AMSU INCLUDED
+7 7 IASI INCLUDED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40051.table b/definitions/bufr/tables/0/wmo/43/codetables/40051.table
new file mode 100644
index 000000000..60542bc0f
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40051.table
@@ -0,0 +1,8 @@
+0 0 OPTIMAL ESTIMATION METHODS (OEM) NOT ATTEMPTED
+1 1 OEM ABORTED BECAUSE FIRST GUESS RESIDUALS TOO HIGH
+2 2 THE MINIMIZATION DID NOT CONVERGE, SOUNDING REJECTED
+3 3 THE MINIMIZATION DID NOT CONVERGE, SOUNDING ACCEPTED
+4 4 THE MINIMIZATION CONVERGED BUT SOUNDING REJECTED
+5 5 THE MINIMIZATION CONVERGED, SOUNDING ACCEPTED
+6 6 RESERVED
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40052.table b/definitions/bufr/tables/0/wmo/43/codetables/40052.table
new file mode 100644
index 000000000..1f48809c0
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40052.table
@@ -0,0 +1,4 @@
+4 4 SUPERSATURATION CONDITIONS IN THE OEM RETRIEVAL
+5 5 SUPERADIABATIC CONDITIONS IN THE OEM RETRIEVAL
+6 6 SUPERSATURATION CONDITIONS IN THE FIRST GUESS
+7 7 SUPERADIABATIC CONDITIONS IN THE FIRST GUESS
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40054.table b/definitions/bufr/tables/0/wmo/43/codetables/40054.table
new file mode 100644
index 000000000..a034bc322
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40054.table
@@ -0,0 +1,12 @@
+1 1 AN ERROR HAS BEEN DETECTED
+2 2 MESSAGE FROM L1
+3 3 MESSAGE FROM L2
+4 4 MESSAGE FROM ANCILLARY DATA
+5 5 MESSAGE FROM FITTING PROCEDURE
+6 6 FILE OPENING
+7 7 FILE READING
+8 8 QUALITY FLAG
+9 9 LEVEL 2 FROM LINEAR REGRESSION(F_QUAL), REPORT A PIXEL WHERE L2 ARE NOT FULLY TRUSTED
+10 10 EMPTY FIELD OR DATA
+11 11 MISSING SURFACE PRESSURE VALUE
+12 12 RADIANCE FILTERING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40055.table b/definitions/bufr/tables/0/wmo/43/codetables/40055.table
new file mode 100644
index 000000000..7aa99d433
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40055.table
@@ -0,0 +1,20 @@
+1 1 RADIANCE FILTERING
+2 2 POLAR REGIONS
+3 3 LOCATION IN THE NIGHT
+4 4 NEGATIVE ALTITUDE SURFACE BELOW MEAN SEA LEVEL
+5 5 CLOUD COVERED SCENE
+6 6 SCENE ABOVE THE SEA
+7 7 SCENE ABOVE DESERT
+8 8 SKIN TEMPERATURE
+9 9 SKIN TEMPERATURE DIFFERENTIAL
+10 10 SPECTRAL LINE CONTRAST TOO WEAK
+11 11 MAXIMUM NUMBER OF ITERATIONS EXCEEDED
+12 12 NEGATIVE PARTIAL COLUMNS
+13 13 MATRIX ILL CONDITIONED
+14 14 FIT DIVERGED
+15 15 ERROR IN GNU SCIENTIFIC LIBRARY (GSL) USAGE
+16 16 RESIDUALS BIASED
+17 17 RESIDUALS SLOPED
+18 18 RESIDUALS ROOT MEAN SQUARE (RMS) ERROR IS LARGE
+19 19 WEIRD AVERAGING KERNELS
+20 20 ICE PRESENCE DETECTED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40056.table b/definitions/bufr/tables/0/wmo/43/codetables/40056.table
new file mode 100644
index 000000000..f4a31d340
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40056.table
@@ -0,0 +1,4 @@
+0 0 USE NOT RECOMMENDED
+1 1 USE WITH CAUTION
+2 2 BEST QUALITY
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40057.table b/definitions/bufr/tables/0/wmo/43/codetables/40057.table
new file mode 100644
index 000000000..c8a50e778
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40057.table
@@ -0,0 +1,30 @@
+1 1 AN ERROR HAS BEEN DETECTED
+2 2 MESSAGE FROM L1
+3 3 MESSAGE FROM L2
+4 4 MESSAGE FROM ANCILLARY DATA
+5 5 MESSAGE FROM FITTING PROCEDURE
+6 6 RESERVED
+7 7 BAD L1 OR L2 FLAG RAISED
+8 8 LEVEL 2 NOT FULLY TRUSTED
+9 9 MISSING TEMPERATURE OR HUMIDITY LEVELS IN THE VERTICAL PROFILE
+10 10 MISSING SURFACE PRESSURE VALUE
+11 11 RADIANCE FILTERING
+12 12 POLAR REGIONS
+13 13 LOCATION IN THE NIGHT
+14 14 NEGATIVE ALTITUDE
+15 15 CLOUD COVERED SCENE
+16 16 SCENE ABOVE THE SEA
+17 17 SCENE ABOVE DESERT
+18 18 MISSING SKIN TEMPERATURE
+19 19 RETRIEVED SKIN TEMPERATURE TOO DIFFERENT FROM MODEL
+20 20 SPECTRAL LINE CONTRAST TOO WEAK
+21 21 MAXIMUM NUMBER OF ITERATIONS EXCEEDS
+22 22 NEGATIVE PARTIAL COLUMNS
+23 23 MATRIX ILL CONDITIONED
+24 24 FIT DIVERGED
+25 25 ERROR IN GSL USAGE
+26 26 RESIDUALS BIASED
+27 27 RESIDUALS SLOPED
+28 28 RESIDUALS RMS ERROR IS LARGE
+29 29 WEIRD AVERAGING KERNELS
+30 30 ICE PRESENCE DETECTED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40068.table b/definitions/bufr/tables/0/wmo/43/codetables/40068.table
new file mode 100644
index 000000000..0b1484e0b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40068.table
@@ -0,0 +1,4 @@
+0 0 VALUES CALCULATED WITH IASI L2
+1 1 PRESSURE AND TEMPERATURE PROFILES MISSING IN IASI L2 DATA; MODEL/FORECAST DATA USED INSTEAD
+2 2 BEST QUALITY
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40074.table b/definitions/bufr/tables/0/wmo/43/codetables/40074.table
new file mode 100644
index 000000000..911a95245
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40074.table
@@ -0,0 +1,10 @@
+1 1 INCOMPATIBILITY OF A SCAN ANGLE FOR ELECTROENCEPHALOGRAM
+2 2 CALIBRATION FAILURE (LIMIT OF BLACK BODY TEMPERATURE REACHED, NOT ENOUGH SOURCES FOR INTERFEROMETRY, ETC.)
+3 3 GEOLOCATION EXECUTED TAKING INTO ACCOUNT THE ORIENTATION OF THE SPACECRAFT AND USING THE STAR CATALOGUE
+4 4 HIGH LEVEL OF CRYOGENIC SEDIMENT REACHED, REQUIRING OUTGASSING OF THE RADIATION COOLER. SET WHEN NESR LEVEL OF THE ICE COVER THRESHOLD CROSSED
+5 5 INTERFEROMETRY PACKAGE FLAG
+6 6 GENERAL ACCURACY FLAG
+7 7 NOISE PRESENT DURING THE INTERFEROMETRY
+8 8 OUTGASSING OF THE RADIATION COOLER
+9 9 FLAG PRECEDING THE FIRST 24 HOURS/DAY MARK (SET TO ON AS A RULE)
+10 10 TELEMETRY PACKAGE FLAG
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40077.table b/definitions/bufr/tables/0/wmo/43/codetables/40077.table
new file mode 100644
index 000000000..4c778cdba
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40077.table
@@ -0,0 +1,4 @@
+1 1 SEA SURFACE TEMPERATURE NOT OK
+2 2 SEA SURFACE WIND SPEED NOT OK
+3 3 ATMOSPHERIC WATER VAPOUR CONTENT NOT OK
+4 4 CLOUD LIQUID WATER CONTENT NOT OK
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/40080.table b/definitions/bufr/tables/0/wmo/43/codetables/40080.table
new file mode 100644
index 000000000..b62c5f888
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/40080.table
@@ -0,0 +1,4 @@
+1 1 THIN CIRRUS DETECTION EXECUTED
+2 2 THIN CIRRUS DETECTION INDICATES A CLOUD
+3 3 AEROSOL DUST DETECTION EXECUTED
+4 4 AEROSOL DUST DETECTED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/4059.table b/definitions/bufr/tables/0/wmo/43/codetables/4059.table
new file mode 100644
index 000000000..91fc6f4f9
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/4059.table
@@ -0,0 +1,5 @@
+1 1 0000 UTC
+2 2 0600 UTC
+3 3 1200 UTC
+4 4 1800 UTC
+5 5 OTHER HOURS
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/4080.table b/definitions/bufr/tables/0/wmo/43/codetables/4080.table
new file mode 100644
index 000000000..84caf2108
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/4080.table
@@ -0,0 +1,6 @@
+0 0 SPOT VALUES
+1 1 LESS THAN 15 MINUTES
+2 2 FROM 15 TO 45 MINUTES
+3 3 MORE THAN 45 MINUTES
+9 9 DATA NOT AVAILABLE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/42004.table b/definitions/bufr/tables/0/wmo/43/codetables/42004.table
new file mode 100644
index 000000000..15a91da16
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/42004.table
@@ -0,0 +1,3 @@
+0 0 WAVE DIRECTION RESOLVED
+1 1 180-DEGREE AMBIGUITY NOT RESOLVED
+15 15 MISSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/42017.table b/definitions/bufr/tables/0/wmo/43/codetables/42017.table
new file mode 100644
index 000000000..d2eb790f0
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/42017.table
@@ -0,0 +1,5 @@
+0 0 GOOD
+1 1 MEDIUM
+2 2 LOW
+3 3 POOR
+15 15 MISSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/42018.table b/definitions/bufr/tables/0/wmo/43/codetables/42018.table
new file mode 100644
index 000000000..7999d0aed
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/42018.table
@@ -0,0 +1,6 @@
+0 0 VERY GOOD
+1 1 GOOD
+2 2 MEDIUM
+3 3 LOW
+4 4 POOR
+15 15 MISSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/5069.table b/definitions/bufr/tables/0/wmo/43/codetables/5069.table
new file mode 100644
index 000000000..24c2f5bbb
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/5069.table
@@ -0,0 +1,4 @@
+0 0 MIE
+1 1 RAYLEIGH
+2 2 CROSS POLAR
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8001.table b/definitions/bufr/tables/0/wmo/43/codetables/8001.table
new file mode 100644
index 000000000..6210da3b3
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8001.table
@@ -0,0 +1,6 @@
+1 1 SURFACE
+2 2 STANDARD LEVEL
+3 3 TROPOPAUSE LEVEL
+4 4 MAXIMUM WIND LEVEL
+5 5 SIGNIFICANT LEVEL, TEMPERATURE AND/OR RELATIVE HUMIDITY
+6 6 SIGNIFICANT LEVEL, WIND
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8002.table b/definitions/bufr/tables/0/wmo/43/codetables/8002.table
new file mode 100644
index 000000000..6ab4fd72d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8002.table
@@ -0,0 +1,19 @@
+0 0 OBSERVING RULES FOR BASE OF LOWEST CLOUD AND CLOUD TYPES OF FM 12 SYNOP AND FM 13 SHIP APPLY
+1 1 FIRST NON-CUMULONIMBUS SIGNIFICANT LAYER
+2 2 SECOND NON-CUMULONIMBUS SIGNIFICANT LAYER
+3 3 THIRD NON-CUMULONIMBUS SIGNIFICANT LAYER
+4 4 CUMULONIMBUS LAYER
+5 5 CEILING
+6 6 CLOUDS NOT DETECTED BELOW THE FOLLOWING HEIGHT(S)
+7 7 LOW CLOUD
+8 8 MIDDLE CLOUD
+9 9 HIGH CLOUD
+10 10 CLOUD LAYER WITH BASE BELOW AND TOP ABOVE THE STATION
+11 11 CLOUD LAYER WITH BASE AND TOP BELOW THE STATION LEVEL
+20 20 NO CLOUDS DETECTED BY THE CLOUD DETECTION SYSTEM
+21 21 FIRST INSTRUMENT DETECTED CLOUD LAYER
+22 22 SECOND INSTRUMENT DETECTED CLOUD LAYER
+23 23 THIRD INSTRUMENT DETECTED CLOUD LAYER
+24 24 FOURTH INSTRUMENT DETECTED CLOUD LAYER
+62 62 VALUE NOT APPLICABLE
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8003.table b/definitions/bufr/tables/0/wmo/43/codetables/8003.table
new file mode 100644
index 000000000..373135140
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8003.table
@@ -0,0 +1,12 @@
+0 0 SURFACE
+1 1 BASE OF SATELLITE SOUNDING
+2 2 CLOUD TOP
+3 3 TROPOPAUSE
+4 4 PRECIPITABLE WATER
+5 5 SOUNDING RADIANCES
+6 6 MEAN TEMPERATURES
+7 7 OZONE
+8 8 LOW CLOUD
+9 9 MED CLOUD
+10 10 HIGH CLOUD
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8004.table b/definitions/bufr/tables/0/wmo/43/codetables/8004.table
new file mode 100644
index 000000000..2a8925eeb
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8004.table
@@ -0,0 +1,6 @@
+2 2 UNSTEADY (UNS)
+3 3 LEVEL FLIGHT, ROUTINE OBSERVATION (LVR)
+4 4 LEVEL FLIGHT, HIGHEST WIND ENCOUNTERED (LVW)
+5 5 ASCENDING (ASC)
+6 6 DESCENDING (DES)
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8005.table b/definitions/bufr/tables/0/wmo/43/codetables/8005.table
new file mode 100644
index 000000000..587ea9924
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8005.table
@@ -0,0 +1,7 @@
+0 0 RESERVED
+1 1 STORM CENTRE
+2 2 OUTER LIMIT OR EDGE OF STORM
+3 3 LOCATION OF MAXIMUM WIND
+4 4 LOCATION OF THE STORM IN THE PERTURBED ANALYSIS
+5 5 LOCATION OF THE STORM IN THE ANALYSIS
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8006.table b/definitions/bufr/tables/0/wmo/43/codetables/8006.table
new file mode 100644
index 000000000..9f56c628d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8006.table
@@ -0,0 +1,8 @@
+1 1 SURFACE
+2 2 STANDARD LEVEL
+3 3 TROPOPAUSE LEVEL
+4 4 PROMINENT MAXIMUM LEVEL
+5 5 PROMINENT MINIMUM LEVEL
+6 6 MINIMUM PRESSURE LEVEL
+7 7 RESERVED
+8 8 LEVEL OF UNDETERMINED SIGNIFICANCE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8007.table b/definitions/bufr/tables/0/wmo/43/codetables/8007.table
new file mode 100644
index 000000000..3e4d2cc3c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8007.table
@@ -0,0 +1,5 @@
+0 0 POINT
+1 1 LINE
+2 2 AREA
+3 3 VOLUME
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8008.table b/definitions/bufr/tables/0/wmo/43/codetables/8008.table
new file mode 100644
index 000000000..2714b5aa2
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8008.table
@@ -0,0 +1,8 @@
+1 1 SURFACE
+2 2 STANDARD LEVEL
+3 3 TROPOPAUSE LEVEL
+4 4 LEVEL OF BETA RADIATION MAXIMUM
+5 5 LEVEL OF GAMMA RADIATION MAXIMUM
+6 6 MINIMUM PRESSURE LEVEL
+7 7 RESERVED
+8 8 LEVEL OF UNDETERMINED SIGNIFICANCE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8009.table b/definitions/bufr/tables/0/wmo/43/codetables/8009.table
new file mode 100644
index 000000000..b03398230
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8009.table
@@ -0,0 +1,16 @@
+0 0 LEVEL FLIGHT, ROUTINE OBSERVATION, UNSTEADY
+1 1 LEVEL FLIGHT, HIGHEST WIND ENCOUNTERED, UNSTEADY
+2 2 UNSTEADY (UNS)
+3 3 LEVEL FLIGHT, ROUTINE OBSERVATION (LVR)
+4 4 LEVEL FLIGHT, HIGHEST WIND ENCOUNTERED (LVW)
+5 5 ASCENDING (ASC)
+6 6 DESCENDING (DES)
+7 7 ASCENDING, OBSERVATION INTERVALS SELECTED BY TIME INCREMENTS
+8 8 ASCENDING, OBSERVATION INTERVALS SELECTED BY TIME INCREMENTS, UNSTEADY
+9 9 ASCENDING, OBSERVATION INTERVALS SELECTED BY PRESSURE INCREMENTS
+10 10 ASCENDING, OBSERVATION INTERVALS SELECTED BY PRESSURE INCREMENTS, UNSTEADY
+11 11 DESCENDING, OBSERVATION INTERVALS SELECTED BY TIME INCREMENTS
+12 12 DESCENDING, OBSERVATION INTERVALS SELECTED BY TIME INCREMENTS, UNSTEADY
+13 13 DESCENDING, OBSERVATION INTERVALS SELECTED BY PRESSURE INCREMENTS
+14 14 DESCENDING, OBSERVATION INTERVALS SELECTED BY PRESSURE INCREMENTS, UNSTEADY
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8010.table b/definitions/bufr/tables/0/wmo/43/codetables/8010.table
new file mode 100644
index 000000000..3c5fe71f3
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8010.table
@@ -0,0 +1,14 @@
+0 0 RESERVED
+1 1 BARE SOIL
+2 2 BARE ROCK
+3 3 LAND GRASS COVER
+4 4 WATER (LAKE, SEA)
+5 5 FLOOD WATER UNDERNEATH
+6 6 SNOW
+7 7 ICE
+8 8 RUNWAY OR ROAD
+9 9 SHIP OR PLATFORM DECK IN STEEL
+10 10 SHIP OR PLATFORM DECK IN WOOD
+11 11 SHIP OR PLATFORM DECK PARTLY COVERED WITH RUBBER MAT
+12 12 BUILDING ROOF
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8011.table b/definitions/bufr/tables/0/wmo/43/codetables/8011.table
new file mode 100644
index 000000000..e7a822114
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8011.table
@@ -0,0 +1,27 @@
+0 0 QUASI-STATIONARY FRONT AT THE SURFACE
+1 1 QUASI-STATIONARY FRONT ABOVE THE SURFACE
+2 2 WARM FRONT AT THE SURFACE
+3 3 WARM FRONT ABOVE THE SURFACE
+4 4 COLD FRONT AT THE SURFACE
+5 5 COLD FRONT ABOVE THE SURFACE
+6 6 OCCLUSION
+7 7 INSTABILITY LINE
+8 8 INTERTROPICAL FRONT
+9 9 CONVERGENCE LINE
+10 10 JET STREAM
+11 11 CLOUD CLEAR
+12 12 CLOUD
+13 13 TURBULENCE
+14 14 STORM
+15 15 AIRFRAME ICING
+16 16 PHENOMENON
+17 17 VOLCANO
+18 18 ATMOSPHERICS
+19 19 RESERVED
+20 20 SPECIAL CLOUDS
+21 21 THUNDERSTORM
+22 22 TROPICAL CYCLONE
+23 23 MOUNTAIN WAVE
+24 24 DUSTSTORM
+25 25 SANDSTORM
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8012.table b/definitions/bufr/tables/0/wmo/43/codetables/8012.table
new file mode 100644
index 000000000..769bc0bb7
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8012.table
@@ -0,0 +1,4 @@
+0 0 LAND
+1 1 SEA
+2 2 COAST
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8013.table b/definitions/bufr/tables/0/wmo/43/codetables/8013.table
new file mode 100644
index 000000000..e18d2959b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8013.table
@@ -0,0 +1,4 @@
+0 0 NIGHT
+1 1 DAY
+2 2 TWILIGHT
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8014.table b/definitions/bufr/tables/0/wmo/43/codetables/8014.table
new file mode 100644
index 000000000..e6f2e46b6
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8014.table
@@ -0,0 +1,10 @@
+0 0 10-MINUTE MEAN VALUE - NORMAL VALUE
+1 1 10-MINUTE MEAN VALUE - ABOVE THE UPPER LIMIT FOR ASSESSMENTS OF RVR (P)
+2 2 10-MINUTE MEAN VALUE - BELOW THE LOWER LIMIT FOR ASSESSMENTS OF RVR (M)
+3 3 ONE-MINUTE MINIMUM VALUE - NORMAL VALUE
+4 4 ONE-MINUTE MINIMUM VALUE - ABOVE THE UPPER LIMIT FOR ASSESSMENTS OF RVR (P)
+5 5 ONE-MINUTE MINIMUM VALUE - BELOW THE LOWER LIMIT FOR ASSESSMENTS OF RVR (M)
+6 6 ONE-MINUTE MAXIMUM VALUE - NORMAL VALUE
+7 7 ONE-MINUTE MAXIMUM VALUE - ABOVE THE UPPER LIMIT FOR ASSESSMENTS OF RVR (P)
+8 8 ONE-MINUTE MAXIMUM VALUE - BELOW THE LOWER LIMIT FOR ASSESSMENTS OF RVR (M)
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8015.table b/definitions/bufr/tables/0/wmo/43/codetables/8015.table
new file mode 100644
index 000000000..6830b9591
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8015.table
@@ -0,0 +1,4 @@
+0 0 SINGLE SENSOR
+1 1 PRIMARY SENSOR
+2 2 SECONDARY SENSOR (BACKUP)
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8016.table b/definitions/bufr/tables/0/wmo/43/codetables/8016.table
new file mode 100644
index 000000000..6b8a1fa66
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8016.table
@@ -0,0 +1,5 @@
+0 0 NOSIG
+1 1 BECMG
+2 2 TEMPO
+3 3 FM
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8017.table b/definitions/bufr/tables/0/wmo/43/codetables/8017.table
new file mode 100644
index 000000000..b3156f87e
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8017.table
@@ -0,0 +1,4 @@
+0 0 FM
+1 1 TL
+2 2 AT
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8018.table b/definitions/bufr/tables/0/wmo/43/codetables/8018.table
new file mode 100644
index 000000000..f91e554ea
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8018.table
@@ -0,0 +1,4 @@
+1 1 LAND IS PRESENT
+2 2 SURFACE ICE MAP INDICATES ICE IS PRESENT
+11 11 ICE MAP DATA NOT AVAILABLE
+12 12 ATTENUATION MAP DATA NOT AVAILABLE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8019.table b/definitions/bufr/tables/0/wmo/43/codetables/8019.table
new file mode 100644
index 000000000..4ed413301
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8019.table
@@ -0,0 +1,8 @@
+0 0 RESERVED
+1 1 ATS (AIR TRAFFIC SERVICE) UNIT SERVING FIR (FLIGHT INFORMATION REGION)
+2 2 FIR (FLIGHT INFORMATION REGION)
+3 3 UIR (UPPER FLIGHT INFORMATION REGION)
+4 4 CTA (CONTROL AREA)
+5 5 VAAC (VOLCANIC ASH ADVISORY CENTRE)
+6 6 MWO (METEOROLOGICAL WATCH OFFICE) ISSUING SIGMET
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8021.table b/definitions/bufr/tables/0/wmo/43/codetables/8021.table
new file mode 100644
index 000000000..8fbd35dd4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8021.table
@@ -0,0 +1,32 @@
+0 0 RESERVED
+1 1 TIME SERIES
+2 2 TIME AVERAGED
+3 3 ACCUMULATED
+4 4 FORECAST
+5 5 FORECAST TIME SERIES
+6 6 FORECAST TIME AVERAGED
+7 7 FORECAST ACCUMULATED
+8 8 ENSEMBLE MEAN
+9 9 ENSEMBLE MEAN TIME SERIES
+10 10 ENSEMBLE MEAN TIME AVERAGED
+11 11 ENSEMBLE MEAN ACCUMULATED
+12 12 ENSEMBLE MEAN FORECAST
+13 13 ENSEMBLE MEAN FORECAST TIME SERIES
+14 14 ENSEMBLE MEAN FORECAST TIME AVERAGED
+15 15 ENSEMBLE MEAN FORECAST ACCUMULATED
+16 16 ANALYSIS
+17 17 START OF PHENOMENON
+18 18 RADIOSONDE LAUNCH TIME
+19 19 START OF ORBIT
+20 20 END OF ORBIT
+21 21 TIME OF ASCENDING NODE
+22 22 TIME OF OCCURRENCE OF WIND SHIFT
+23 23 MONITORING PERIOD
+24 24 AGREED TIME LIMIT FOR REPORT RECEPTION
+25 25 NOMINAL REPORTING TIME
+26 26 TIME OF LAST KNOWN POSITION
+27 27 FIRST GUESS
+28 28 START OF SCAN
+29 29 END OF SCAN OR TIME OF ENDING
+30 30 TIME OF OCCURRENCE
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8023.table b/definitions/bufr/tables/0/wmo/43/codetables/8023.table
new file mode 100644
index 000000000..4f78743a5
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8023.table
@@ -0,0 +1,15 @@
+2 2 MAXIMUM VALUE
+3 3 MINIMUM VALUE
+4 4 MEAN VALUE
+5 5 MEDIAN VALUE
+6 6 MODAL VALUE
+7 7 MEAN ABSOLUTE ERROR
+8 8 RESERVED
+9 9 BEST ESTIMATE OF STANDARD DEVIATION (N-1)
+10 10 STANDARD DEVIATION (N)
+11 11 HARMONIC MEAN
+12 12 ROOT-MEAN-SQUARE VECTOR ERROR
+13 13 ROOT-MEAN-SQUARE
+14 14 ROOT-MEAN-SQUARE ERROR
+32 32 VECTOR MEAN
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8024.table b/definitions/bufr/tables/0/wmo/43/codetables/8024.table
new file mode 100644
index 000000000..377858bb1
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8024.table
@@ -0,0 +1,12 @@
+2 2 OBSERVED MINUS MAXIMUM
+3 3 OBSERVED MINUS MINIMUM
+4 4 OBSERVED MINUS MEAN
+5 5 OBSERVED MINUS MEDIAN
+6 6 OBSERVED MINUS MODE
+11 11 OBSERVED MINUS CLIMATOLOGY (ANOMALY)
+12 12 OBSERVED MINUS ANALYSED VALUE
+13 13 OBSERVED MINUS INITIALIZED ANALYSED VALUE
+14 14 OBSERVED MINUS FORECAST VALUE
+21 21 OBSERVED MINUS INTERPOLATED VALUE
+22 22 OBSERVED MINUS HYDROSTATICALLY CALCULATED VALUE
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8025.table b/definitions/bufr/tables/0/wmo/43/codetables/8025.table
new file mode 100644
index 000000000..1d88fa54f
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8025.table
@@ -0,0 +1,5 @@
+0 0 UNIVERSAL TIME COORDINATED (UTC) MINUS LOCAL STANDARD TIME (LST)
+1 1 LOCAL STANDARD TIME
+2 2 UNIVERSAL TIME COORDINATED (UTC) MINUS SATELLITE CLOCK
+5 5 TIME DIFFERENCE FROM EDGE OF PROCESSING SEGMENT
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8026.table b/definitions/bufr/tables/0/wmo/43/codetables/8026.table
new file mode 100644
index 000000000..9bcef7864
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8026.table
@@ -0,0 +1,5 @@
+0 0 AVERAGING KERNEL MATRIX
+1 1 CORRELATION MATRIX (C)
+2 2 LOWER TRIANGULAR CORRELATION MATRIX SQUARE ROOT (L FROM C=LLT)
+3 3 INVERSE OF LOWER TRIANGULAR CORRELATION MATRIX SQUARE ROOT (L-1)
+63 63 MISSING OR UNDEFINED SIGNIFICANCE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8029.table b/definitions/bufr/tables/0/wmo/43/codetables/8029.table
new file mode 100644
index 000000000..ef493dbde
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8029.table
@@ -0,0 +1,24 @@
+0 0 OPEN OCEAN OR SEMI-ENCLOSED SEA
+1 1 ENCLOSED SEA OR LAKE
+2 2 CONTINENTAL ICE
+3 3 LAND
+4 4 LOW INLAND (BELOW SEA LEVEL)
+5 5 MIX OF LAND AND WATER
+6 6 MIX OF LAND AND LOW INLAND
+11 11 RIVER
+12 12 LAKE
+13 13 SEA
+14 14 GLACIER
+15 15 URBAN LAND
+16 16 RURAL LAND
+17 17 SUBURBAN LAND
+18 18 SEA ICE
+19 19 FOREST
+20 20 SHRUBLANDS
+21 21 SAVANNA
+22 22 DESERT
+23 23 GRASSLANDS
+24 24 WETLANDS
+25 25 SNOW/ICE
+26 26 COAST
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8032.table b/definitions/bufr/tables/0/wmo/43/codetables/8032.table
new file mode 100644
index 000000000..712400dd1
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8032.table
@@ -0,0 +1,7 @@
+0 0 ROUTINE OPERATION
+1 1 EVENT TRIGGERED BY STORM SURGE
+2 2 EVENT TRIGGERED BY TSUNAMI
+3 3 EVENT TRIGGERED MANUALLY
+4 4 INSTALLATION TESTING
+5 5 MAINTENANCE TESTING
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8033.table b/definitions/bufr/tables/0/wmo/43/codetables/8033.table
new file mode 100644
index 000000000..1c695372b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8033.table
@@ -0,0 +1,6 @@
+0 0 RESERVED
+1 1 PERCENTAGE CONFIDENCE CALCULATED USING CLOUD FRACTION
+2 2 PERCENTAGE CONFIDENCE CALCULATED USING STANDARD DEVIATION OF TEMPERATURE
+3 3 PERCENTAGE CONFIDENCE CALCULATED USING PROBABILITY OF CLOUD CONTAMINATION
+4 4 PERCENTAGE CONFIDENCE CALCULATED USING NORMALITY OF DISTRIBUTION
+127 127 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8034.table b/definitions/bufr/tables/0/wmo/43/codetables/8034.table
new file mode 100644
index 000000000..879f27400
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8034.table
@@ -0,0 +1,10 @@
+0 0 SECONDARY SAMPLING: AVERAGED
+1 1 SECONDARY SAMPLING: DISCRETE
+2 2 SECONDARY SAMPLING: MIXED
+3 3 NEAR-SURFACE SAMPLING: AVERAGED, PUMPED
+4 4 NEAR-SURFACE SAMPLING: AVERAGED, UNPUMPED
+5 5 NEAR-SURFACE SAMPLING: DISCRETE, PUMPED
+6 6 NEAR-SURFACE SAMPLING: DISCRETE, UNPUMPED
+7 7 NEAR-SURFACE SAMPLING: MIXED, PUMPED
+8 8 NEAR-SURFACE SAMPLING: MIXED, UNPUMPED
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8035.table b/definitions/bufr/tables/0/wmo/43/codetables/8035.table
new file mode 100644
index 000000000..3d641fd15
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8035.table
@@ -0,0 +1,8 @@
+0 0 GLOBAL
+1 1 REGIONAL
+2 2 NATIONAL
+3 3 SPECIAL
+4 4 BILATERAL
+5 5 RESERVED
+6 6 RESERVED
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8036.table b/definitions/bufr/tables/0/wmo/43/codetables/8036.table
new file mode 100644
index 000000000..6436989e6
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8036.table
@@ -0,0 +1,8 @@
+0 0 WMO SECRETARIAT
+1 1 WMO
+2 2 RSMC
+3 3 NMC
+4 4 RTH
+5 5 OBSERVING SITE
+6 6 OTHER
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8037.table b/definitions/bufr/tables/0/wmo/43/codetables/8037.table
new file mode 100644
index 000000000..a5f9be382
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8037.table
@@ -0,0 +1,4 @@
+0 0 MANUFACTURER'S BASELINE CHECK UNIT
+1 1 WEATHER SCREEN
+2 2 GRUAN STANDARD HUMIDITY CHAMBER
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8038.table b/definitions/bufr/tables/0/wmo/43/codetables/8038.table
new file mode 100644
index 000000000..aa4d7b77b
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8038.table
@@ -0,0 +1,3 @@
+0 0 VERIFIED INSTRUMENT READING
+1 1 REFERENCE INSTRUMENT READING
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8039.table b/definitions/bufr/tables/0/wmo/43/codetables/8039.table
new file mode 100644
index 000000000..f4403c63d
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8039.table
@@ -0,0 +1,8 @@
+0 0 ISSUE TIME OF FORECAST
+1 1 TIME OF COMMENCEMENT OF PERIOD OF THE FORECAST
+2 2 TIME OF ENDING OF PERIOD OF THE FORECAST
+3 3 FORECAST TIME OF MAXIMUM TEMPERATURE
+4 4 FORECAST TIME OF MINIMUM TEMPERATURE
+5 5 TIME OF BEGINNING OF THE FORECAST CHANGE
+6 6 TIME OF ENDING OF THE FORECAST CHANGE
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8040.table b/definitions/bufr/tables/0/wmo/43/codetables/8040.table
new file mode 100644
index 000000000..42c5af0e5
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8040.table
@@ -0,0 +1,49 @@
+0 0 HIGH-RESOLUTION DATA SAMPLE
+1 1 WITHIN 20 HPA OF SURFACE
+2 2 PRESSURE LESS THAN 10 HPA (I.E., 9, 8, 7, ETC.) WHEN NO OTHER REASON APPLIES
+3 3 BASE PRESSURE LEVEL FOR STABILITY INDEX
+4 4 BEGIN DOUBTFUL TEMPERATURE, HEIGHT DATA
+5 5 BEGIN MISSING DATA (ALL ELEMENTS)
+6 6 BEGIN MISSING RELATIVE HUMIDITY DATA
+7 7 BEGIN MISSING TEMPERATURE DATA
+8 8 HIGHEST LEVEL REACHED BEFORE BALLOON DESCENT BECAUSE OF ICING OR TURBULENCE
+9 9 END DOUBTFUL TEMPERATURE, HEIGHT DATA
+10 10 END MISSING DATA (ALL ELEMENTS)
+11 11 END MISSING RELATIVE HUMIDITY DATA
+12 12 END MISSING TEMPERATURE DATA
+13 13 ZERO DEGREES CELSIUS CROSSING(S) FOR RADAT
+14 14 STANDARD PRESSURE LEVEL
+15 15 OPERATOR-ADDED LEVEL
+16 16 OPERATOR-DELETED LEVEL
+17 17 BALLOON RE-ASCENDED BEYOND PREVIOUS HIGHEST ASCENT LEVEL
+18 18 SIGNIFICANT RELATIVE HUMIDITY LEVEL
+19 19 RELATIVE HUMIDITY LEVEL SELECTION TERMINATED
+20 20 SURFACE LEVEL
+21 21 SIGNIFICANT TEMPERATURE LEVEL
+22 22 MANDATORY TEMPERATURE LEVEL
+23 23 FLIGHT TERMINATION LEVEL
+24 24 TROPOPAUSE(S)
+25 25 AIRCRAFT REPORT
+26 26 INTERPOLATED (GENERATED) LEVEL
+27 27 MANDATORY WIND LEVEL
+28 28 SIGNIFICANT WIND LEVEL
+29 29 MAXIMUM WIND LEVEL
+30 30 INCREMENTAL WIND LEVEL (FIXED REGIONAL)
+31 31 INCREMENTAL HEIGHT LEVEL (GENERATED)
+32 32 WIND TERMINATION LEVEL
+33 33 PRESSURE 100 TO 110 HPA, WHEN NO OTHER REASON APPLIES
+34 34 FREEZING LEVEL BASE
+35 35 FREEZING LEVEL TOP
+36 36 FLIGHT LEVEL BASE
+37 37 FLIGHT LEVEL TOP
+38 38 TOP OF WIND SOUNDING
+39 39 BOTTOM OF WIND SOUNDING
+40 40 SIGNIFICANT THERMODYNAMIC LEVEL (INVERSION)
+41 41 SIGNIFICANT RELATIVE HUMIDITY LEVEL (ACCORDING TO NCDC CRITERIA)
+42 42 SIGNIFICANT TEMPERATURE LEVEL (ACCORDING TO NCDC)
+43 43 BEGIN MISSING WIND DATA
+44 44 END MISSING WIND DATA
+60 60 LEVEL OF 80-KNOT ISOTACH ABOVE JET
+61 61 LEVEL OF 80-KNOT ISOTACH BELOW JET
+62 62 OTHER
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8041.table b/definitions/bufr/tables/0/wmo/43/codetables/8041.table
new file mode 100644
index 000000000..1f48fbedc
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8041.table
@@ -0,0 +1,15 @@
+0 0 PARENT SITE
+1 1 OBSERVATION SITE
+2 2 BALLOON MANUFACTURE DATE
+3 3 BALLOON LAUNCH POINT
+4 4 SURFACE OBSERVATION
+5 5 SURFACE OBSERVATION DISPLACEMENT FROM LAUNCH POINT
+6 6 FLIGHT LEVEL OBSERVATION
+7 7 FLIGHT LEVEL TERMINATION POINT
+8 8 IFR CEILING AND VISIBILITY
+9 9 MOUNTAIN OBSCURATION
+10 10 STRONG SURFACE WIND
+11 11 FREEZING LEVEL
+12 12 MULTIPLE FREEZING LEVEL
+13 13 INSTRUMENT MANUFACTURE DATE
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8042.table b/definitions/bufr/tables/0/wmo/43/codetables/8042.table
new file mode 100644
index 000000000..c71709a4c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8042.table
@@ -0,0 +1,17 @@
+1 1 SURFACE
+2 2 STANDARD LEVEL
+3 3 TROPOPAUSE LEVEL
+4 4 MAXIMUM WIND LEVEL
+5 5 SIGNIFICANT TEMPERATURE LEVEL
+6 6 SIGNIFICANT HUMIDITY LEVEL
+7 7 SIGNIFICANT WIND LEVEL
+8 8 BEGINNING OF MISSING TEMPERATURE DATA
+9 9 END OF MISSING TEMPERATURE DATA
+10 10 BEGINNING OF MISSING HUMIDITY DATA
+11 11 END OF MISSING HUMIDITY DATA
+12 12 BEGINNING OF MISSING WIND DATA
+13 13 END OF MISSING WIND DATA
+14 14 TOP OF WIND SOUNDING
+15 15 LEVEL DETERMINED BY REGIONAL DECISION
+16 16 FREEZING LEVEL
+17 17 PRESSURE LEVEL ORIGINALLY INDICATED BY HEIGHT AS THE VERTICAL COORDINATE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8043.table b/definitions/bufr/tables/0/wmo/43/codetables/8043.table
new file mode 100644
index 000000000..b6975ed39
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8043.table
@@ -0,0 +1,20 @@
+0 0 OZONE
+1 1 WATER VAPOUR
+2 2 METHANE
+3 3 CARBON DIOXIDE
+4 4 CARBON MONOXIDE
+5 5 NITROGEN DIOXIDE
+6 6 NITROUS OXIDE
+7 7 FORMALDEHYDE
+8 8 SULPHUR DIOXIDE
+9 9 VOLCANIC SULPHUR DIOXIDE
+25 25 PARTICULATE MATTER < 1.0 MICRONS
+26 26 PARTICULATE MATTER < 2.5 MICRONS
+27 27 PARTICULATE MATTER < 10 MICRONS
+28 28 AEROSOLS (GENERIC)
+29 29 SMOKE (GENERIC)
+30 30 CRUSTAL MATERIAL (GENERIC DUST)
+31 31 VOLCANIC ASH
+32 32 CLOUD
+33 33 CLOUD AND AEROSOLS
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8045.table b/definitions/bufr/tables/0/wmo/43/codetables/8045.table
new file mode 100644
index 000000000..18cf53d29
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8045.table
@@ -0,0 +1,5 @@
+0 0 AEROSOLS ALL TYPES
+1 1 DESERT DUST
+2 2 BLACK CARBON
+3 3 SEA SALT
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8046.table b/definitions/bufr/tables/0/wmo/43/codetables/8046.table
new file mode 100644
index 000000000..6bd87c416
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8046.table
@@ -0,0 +1,587 @@
+0 0 OZONE
+1 1 WATER VAPOUR
+2 2 METHANE
+3 3 CARBON DIOXIDE
+4 4 CARBON MONOXIDE
+5 5 NITROGEN DIOXIDE
+6 6 NITROUS OXIDE
+7 7 FORMALDEHYDE
+8 8 SULPHUR DIOXIDE
+9 9 AMMONIA
+10 10 AMMONIUM CATION
+11 11 NITROGEN MONOXIDE
+12 12 ATOMIC OXYGEN
+13 13 NITRATE RADICAL
+14 14 HYDROPEROXYL RADICAL
+15 15 DINITROGEN PENTOXIDE
+16 16 NITROUS ACID
+17 17 NITRIC ACID
+18 18 PEROXYNITRIC ACID
+19 19 HYDROGEN PEROXIDE
+20 20 DIHYDROGEN
+21 21 ATOMIC NITROGEN
+22 22 SULPHATE ANION
+23 23 ATOMIC RADON
+24 24 MERCURY VAPOUR
+25 25 MERCURY(II) CATION
+26 26 ATOMIC CHLORINE
+27 27 CHLORINE MONOXIDE
+28 28 DICHLORINE PEROXIDE
+29 29 HYPOCHLOROUS ACID
+30 30 CHLORINE NITRATE
+31 31 CHLORINE DIOXIDE
+32 32 ATOMIC BROMINE
+33 33 BROMINE MONOXIDE
+34 34 BROMINE CHLORIDE
+35 35 HYDROGEN BROMIDE
+36 36 HYPOBROMOUS ACID
+37 37 BROMINE NITRATE
+38 38 DIOXYGEN
+39 39 NITRYL CHLORIDE
+40 40 SULPHURIC ACID
+41 41 HYDROGEN SULPHIDE
+42 42 SULPHUR TRIOXIDE
+43 43 BROMINE
+44 44 HYDROFLUORIC ACID
+45 45 SULPHUR HEXAFLUORIDE
+46 46 CHLORINE
+10000 10000 HYDROXYL RADICAL
+10001 10001 METHYL PEROXY RADICAL
+10002 10002 METHYL HYDROPEROXIDE
+10004 10004 METHANOL
+10005 10005 FORMIC ACID
+10006 10006 HYDROGEN CYANIDE
+10007 10007 ACETO NITRILE
+10008 10008 ETHANE
+10009 10009 ETHENE (= ETHYLENE)
+10010 10010 ETHYNE (= ACETYLENE)
+10011 10011 ETHANOL
+10012 10012 ACETIC ACID
+10013 10013 PEROXYACETYL NITRATE
+10014 10014 PROPANE
+10015 10015 PROPENE
+10016 10016 BUTANE (ALL ISOMERS)
+10017 10017 ISOPRENE
+10018 10018 ALPHA PINENE
+10019 10019 BETA PINENE
+10020 10020 LIMONENE
+10021 10021 BENZENE
+10022 10022 TOLUENE
+10023 10023 XYLENE
+10024 10024 METHANESULPHONIC ACID
+10025 10025 METHYLGLYOXAL (2-OXOPROPANAL)
+10026 10026 PEROXYACETYL RADICAL
+10027 10027 METHACRYLIC ACID (2-METHYLPROP-2-ENOIC ACID)
+10028 10028 METHACROLEIN (2-METHYLPROP-2-ENAL)
+10029 10029 ACETONE (PROPAN-2-ONE)
+10030 10030 ETHYL DIOXIDANYL RADICAL
+10031 10031 BUTADIENE (BUTA-1,3-DIENE)
+10032 10032 ACETALDEHYDE (ETHANAL)
+10033 10033 GLYCOLALDEHYDE (HYDROXYETHANAL)
+10034 10034 CRESOL (METHYLPHENOL), ALL ISOMERS
+10035 10035 PERACETIC ACID (ETHANEPEROXOIC ACID)
+10036 10036 2-HYDROXYETHYL OXIDANYL RADICAL
+10037 10037 2-HYDROXYETHYL DIOXIDANYL RADICAL
+10038 10038 GLYOXAL (OXALDEHYDE)
+10039 10039 ISOPROPYL DIOXIDANYL RADICAL
+10040 10040 ISOPROPYL HYDROPEROXIDE (2-HYDROPEROXYPROPANE)
+10041 10041 HYDROXYACETONE (1-HYDROXYPROPAN-2-ONE)
+10042 10042 PEROXYACETIC ACID (ETHANEPEROXOIC ACID)
+10043 10043 METHYL VINYL KETONE (BUT-3-EN-2-ONE)
+10044 10044 PHENOXY RADICAL
+10045 10045 METHYL RADICAL
+10046 10046 CARBONYL SULPHIDE (CARBON OXIDE SULPHIDE)
+10047 10047 DIBROMOMETHANE
+10048 10048 METHOXY RADICAL
+10049 10049 TRIBROMOMETHANE
+10050 10050 FORMYL RADICAL (OXOMETHYL RADICAL)
+10051 10051 HYDROXYMETHYL DIOXIDANYL RADICAL
+10052 10052 ETHYL HYDROPEROXIDE
+10053 10053 3-HYDROXYPROPYL DIOXIDANYL RADICAL
+10054 10054 3-HYDROXYPROPYL HYDROPEROXIDE
+10055 10055 METHYL-PEROXY-NITRATE (NITROPEROXY-METHANE)
+10056 10056 2-LAMBDA^1-OXIDANYLOXY-2-METHYLBUT-3-EN-1-OL (4-HYDROXY-3-METHYL-1-BUTENE-3-YLPEROXY RADICAL)
+10057 10057 2-LAMBDA^1-OXIDANYLOXY-3-METHYLBUT-3-EN-1-OL (2-HYDROXY-1-ISOPROPENYLETHYLPEROXY RADICAL)
+10058 10058 (Z)-4-HYDROPEROXY-2-METHYL-2-BUTENAL
+10059 10059 (Z)-4-HYDROPEROXY-3-METHYL-2-BUTENAL
+10500 10500 DIMETHYL SULPHIDE
+10501 10501 DMSO (DIMETHYL SULFOXIDE)
+20001 20001 HYDROGEN CHLORIDE
+20002 20002 CFC-11 (TRICHLOROFLUOROMETHANE)
+20003 20003 CFC-12 (DICHLORODIFLUOROMETHANE)
+20004 20004 CFC-113 (1,1,2-TRICHLORO-1,2,2-TRIFLUOROETHANE)
+20005 20005 CFC-113A (1,1,1-TRICHLORO-2,2,2-TRIFLUOROETHANE)
+20006 20006 CFC-114 (1,2-DICHLORO-1,1,2,2-TETRAFLUOROETHANE)
+20007 20007 CFC-115 (1-CHLORO-1,1,2,2,2-PENTAFLUOROETHANE)
+20008 20008 HCFC-22 (CHLORODIFLUOROMETHANE)
+20009 20009 HCFC-141B (1,1-DICHLORO-1-FLUOROETHANE)
+20010 20010 HCFC-142B (1-CHLORO-1,1-DIFLUOROETHANE)
+20011 20011 HALON-1202 (DIBROMODIFLUOROMETHANE)
+20012 20012 HALON-1211 (BROMOCHLORODIFLUOROMETHANE)
+20013 20013 HALON-1301 (BROMOTRIFLUOROMETHANE)
+20014 20014 HALON-2402 (1,2-DIBROMO-1,1,2,2-TETRAFLUOROETHANE)
+20015 20015 HCC-40 (METHYL CHLORIDE)
+20016 20016 HCC-10 (CARBON TETRACHLORIDE)
+20017 20017 HCC-140A (1,1,1-TRICHLOROETHANE)
+20018 20018 HBC-40B1 (METHYL BROMIDE)
+20019 20019 HCH (HEXACHLOROCYCLOHEXANE) ALL ISOMERS
+20020 20020 ALPHA-HCH (ALPHA-HEXACHLOROCYCLOHEXANE) BOTH ENANTIOMERS
+20021 20021 PCB-153 (2,2',4,4',5,5'-HEXACHLOROBIPHENYL)
+20022 20022 HCFC-141A (1,1-DICHLORO-2-FLUOROETHANE)
+30000 30000 RADIOACTIVE POLLUTANT (TRACER, DEFINED BY ORIGINATING CENTRE)
+30010 30010 TRITIUM (HYDROGEN 3)
+30011 30011 TRITIUM ORGANIC BOUNDED
+30012 30012 TRITIUM INORGANIC
+30013 30013 BERYLLIUM 7
+30014 30014 BERYLLIUM 10
+30015 30015 CARBON 14
+30016 30016 CARBON 14 CO2
+30017 30017 CARBON 14 OTHER GASES
+30018 30018 NITROGEN 13
+30019 30019 NITROGEN 16
+30020 30020 FLUORINE 18
+30021 30021 SODIUM 22
+30022 30022 PHOSPHATE 32
+30023 30023 PHOSPHATE 33
+30024 30024 SULPHUR 35
+30025 30025 CHLORINE 36
+30026 30026 POTASSIUM 40
+30027 30027 ARGON 41
+30028 30028 CALCIUM 41
+30029 30029 CALCIUM 45
+30030 30030 TITANIUM 44
+30031 30031 SCANDIUM 46
+30032 30032 VANADIUM 48
+30033 30033 VANADIUM 49
+30034 30034 CHROME 51
+30035 30035 MANGANESE 52
+30036 30036 MANGANESE 54
+30037 30037 IRON 55
+30038 30038 IRON 59
+30039 30039 COBALT 56
+30040 30040 COBALT 57
+30041 30041 COBALT 58
+30042 30042 COBALT 60
+30043 30043 NICKEL 59
+30044 30044 NICKEL 63
+30045 30045 ZINC 65
+30046 30046 GALLIUM 67
+30047 30047 GALLIUM 68
+30048 30048 GERMANIUM 68
+30049 30049 GERMANIUM 69
+30050 30050 ARSENIC 73
+30051 30051 SELENIUM 75
+30052 30052 SELENIUM 79
+30053 30053 RUBIDIUM 81
+30054 30054 RUBIDIUM 83
+30055 30055 RUBIDIUM 84
+30056 30056 RUBIDIUM 86
+30057 30057 RUBIDIUM 87
+30058 30058 RUBIDIUM 88
+30059 30059 KRYPTON 85
+30060 30060 KRYPTON 85 METASTABLE
+30061 30061 KRYPTON 87
+30062 30062 KRYPTON 88
+30063 30063 KRYPTON 89
+30064 30064 STRONTIUM 85
+30065 30065 STRONTIUM 89
+30066 30066 STRONTIUM 89/90
+30067 30067 STRONTIUM 90
+30068 30068 STRONTIUM 91
+30069 30069 STRONTIUM 92
+30070 30070 YTTRIUM 87
+30071 30071 YTTRIUM 88
+30072 30072 YTTRIUM 90
+30073 30073 YTTRIUM 91
+30074 30074 YTTRIUM 91 METASTABLE
+30075 30075 YTTRIUM 92
+30076 30076 YTTRIUM 93
+30077 30077 ZIRCONIUM 89
+30078 30078 ZIRCONIUM 93
+30079 30079 ZIRCONIUM 95
+30080 30080 ZIRCONIUM 97
+30081 30081 NIOBIUM 93 METASTABLE
+30082 30082 NIOBIUM 94
+30083 30083 NIOBIUM 95
+30084 30084 NIOBIUM 95 METASTABLE
+30085 30085 NIOBIUM 97
+30086 30086 NIOBIUM 97 METASTABLE
+30087 30087 MOLYBDENUM 93
+30088 30088 MOLYBDENUM 99
+30089 30089 TECHNETIUM 95 METASTABLE
+30090 30090 TECHNETIUM 96
+30091 30091 TECHNETIUM 99
+30092 30092 TECHNETIUM 99 METASTABLE
+30093 30093 RHODIUM 99
+30094 30094 RHODIUM 101
+30095 30095 RHODIUM 102 METASTABLE
+30096 30096 RHODIUM 103 METASTABLE
+30097 30097 RHODIUM 105
+30098 30098 RHODIUM 106
+30099 30099 PALLADIUM 100
+30100 30100 PALLADIUM 103
+30101 30101 PALLADIUM 107
+30102 30102 RUTHENIUM 103
+30103 30103 RUTHENIUM 105
+30104 30104 RUTHENIUM 106
+30105 30105 SILVER 108 METASTABLE
+30106 30106 SILVER 110 METASTABLE
+30107 30107 CADMIUM 109
+30108 30108 CADMIUM 113 METASTABLE
+30109 30109 CADMIUM 115 METASTABLE
+30110 30110 INDIUM 114 METASTABLE
+30111 30111 TIN 113
+30112 30112 TIN 119 METASTABLE
+30113 30113 TIN 121 METASTABLE
+30114 30114 TIN 122
+30115 30115 TIN 123
+30116 30116 TIN 126
+30117 30117 ANTIMONY 124
+30118 30118 ANTIMONY 125
+30119 30119 ANTIMONY 126
+30120 30120 ANTIMONY 127
+30121 30121 ANTIMONY 129
+30122 30122 TELLURIUM 123 METASTABLE
+30123 30123 TELLURIUM 125 METASTABLE
+30124 30124 TELLURIUM 127
+30125 30125 TELLURIUM 127 METASTABLE
+30126 30126 TELLURIUM 129
+30127 30127 TELLURIUM 129 METASTABLE
+30128 30128 TELLURIUM 131 METASTABLE
+30129 30129 TELLURIUM 132
+30130 30130 IODINE 123
+30131 30131 IODINE 124
+30132 30132 IODINE 125
+30133 30133 IODINE 126
+30134 30134 IODINE 129
+30135 30135 IODINE 129 ELEMENTARY GASEOUS
+30136 30136 IODINE 129 ORGANIC BOUNDED
+30137 30137 IODINE 131
+30138 30138 IODINE 131 ELEMENTARY GASEOUS
+30139 30139 IODINE 131 ORGANIC BOUNDED
+30140 30140 IODINE 131 GASEOUS ELEMENTARY AND ORGANIC BOUNDED
+30141 30141 IODINE 131 AEROSOL
+30142 30142 IODINE 132
+30143 30143 IODINE 132 ELEMENTARY GASEOUS
+30144 30144 IODINE 132 ORGANIC BOUNDED
+30145 30145 IODINE 132 GASEOUS ELEMENTARY AND ORGANIC BOUNDED
+30146 30146 IODINE 132 AEROSOL
+30147 30147 IODINE 133
+30148 30148 IODINE 133 ELEMENTARY GASEOUS
+30149 30149 IODINE 133 ORGANIC BOUNDED
+30150 30150 IODINE 133 GASEOUS ELEMENTARY AND ORGANIC BOUNDED
+30151 30151 IODINE 133 AEROSOL
+30152 30152 IODINE 134
+30153 30153 IODINE 134 ELEMENTARY GASEOUS
+30154 30154 IODINE 134 ORGANIC BOUNDED
+30155 30155 IODINE 135
+30156 30156 IODINE 135 ELEMENTARY GASEOUS
+30157 30157 IODINE 135 ORGANIC BOUNDED
+30158 30158 IODINE 135 GASEOUS ELEMENTARY AND ORGANIC BOUNDED
+30159 30159 IODINE 135 AEROSOL
+30160 30160 XENON 131 METASTABLE
+30161 30161 XENON 133
+30162 30162 XENON 133 METASTABLE
+30163 30163 XENON 135
+30164 30164 XENON 135 METASTABLE
+30165 30165 XENON 137
+30166 30166 XENON 138
+30167 30167 XENON SUM OF ALL XENON ISOTOPES
+30168 30168 CAESIUM 131
+30169 30169 CAESIUM 134
+30170 30170 CAESIUM 135
+30171 30171 CAESIUM 136
+30172 30172 CAESIUM 137
+30173 30173 BARIUM 133
+30174 30174 BARIUM 137 METASTABLE
+30175 30175 BARIUM 140
+30176 30176 CERIUM 139
+30177 30177 CERIUM 141
+30178 30178 CERIUM 143
+30179 30179 CERIUM 144
+30180 30180 LANTHANUM 140
+30181 30181 LANTHANUM 141
+30182 30182 PRASEODYMIUM 143
+30183 30183 PRASEODYMIUM 144
+30184 30184 PRASEODYMIUM 144 METASTABLE
+30185 30185 SAMARIUM 145
+30186 30186 SAMARIUM 147
+30187 30187 SAMARIUM 151
+30188 30188 NEODYMIUM 147
+30189 30189 PROMETHIUM 146
+30190 30190 PROMETHIUM 147
+30191 30191 PROMETHIUM 151
+30192 30192 EUROPIUM 152
+30193 30193 EUROPIUM 154
+30194 30194 EUROPIUM 155
+30195 30195 GADOLINIUM 153
+30196 30196 TERBIUM 160
+30197 30197 HOLMIUM 166 METASTABLE
+30198 30198 THULIUM 170
+30199 30199 YTTERBIUM 169
+30200 30200 HAFNIUM 175
+30201 30201 HAFNIUM 181
+30202 30202 TANTALUM 179
+30203 30203 TANTALUM 182
+30204 30204 RHENIUM 184
+30205 30205 IRIDIUM 192
+30206 30206 MERCURY 203
+30207 30207 THALLIUM 204
+30208 30208 THALLIUM 207
+30209 30209 THALLIUM 208
+30210 30210 THALLIUM 209
+30211 30211 BISMUTH 205
+30212 30212 BISMUTH 207
+30213 30213 BISMUTH 210
+30214 30214 BISMUTH 211
+30215 30215 BISMUTH 212
+30216 30216 BISMUTH 213
+30217 30217 BISMUTH 214
+30218 30218 POLONIUM 208
+30219 30219 POLONIUM 210
+30220 30220 POLONIUM 212
+30221 30221 POLONIUM 213
+30222 30222 POLONIUM 214
+30223 30223 POLONIUM 215
+30224 30224 POLONIUM 216
+30225 30225 POLONIUM 218
+30226 30226 LEAD 209
+30227 30227 LEAD 210
+30228 30228 LEAD 211
+30229 30229 LEAD 212
+30230 30230 LEAD 214
+30231 30231 ASTATINE 217
+30232 30232 RADON 219
+30233 30233 RADON 220
+30234 30234 RADON 222
+30235 30235 FRANCIUM 221
+30236 30236 FRANCIUM 223
+30237 30237 RADIUM 223
+30238 30238 RADIUM 224
+30239 30239 RADIUM 225
+30240 30240 RADIUM 226
+30241 30241 RADIUM 228
+30242 30242 ACTINIUM 225
+30243 30243 ACTINIUM 227
+30244 30244 ACTINIUM 228
+30245 30245 THORIUM 227
+30246 30246 THORIUM 228
+30247 30247 THORIUM 229
+30248 30248 THORIUM 230
+30249 30249 THORIUM 231
+30250 30250 THORIUM 232
+30251 30251 THORIUM 234
+30252 30252 PROTACTINIUM 231
+30253 30253 PROTACTINIUM 233
+30254 30254 PROTACTINIUM 234 METASTABLE
+30255 30255 URANIUM 232
+30256 30256 URANIUM 233
+30257 30257 URANIUM 234
+30258 30258 URANIUM 235
+30259 30259 URANIUM 236
+30260 30260 URANIUM 237
+30261 30261 URANIUM 238
+30262 30262 PLUTONIUM 236
+30263 30263 PLUTONIUM 238
+30264 30264 PLUTONIUM 239
+30265 30265 PLUTONIUM 240
+30266 30266 PLUTONIUM 241
+30267 30267 PLUTONIUM 242
+30268 30268 PLUTONIUM 244
+30269 30269 NEPTUNIUM 237
+30270 30270 NEPTUNIUM 238
+30271 30271 NEPTUNIUM 239
+30272 30272 AMERICIUM 241
+30273 30273 AMERICIUM 242
+30274 30274 AMERICIUM 242 METASTABLE
+30275 30275 AMERICIUM 243
+30276 30276 CURIUM 242
+30277 30277 CURIUM 243
+30278 30278 CURIUM 244
+30279 30279 CURIUM 245
+30280 30280 CURIUM 246
+30281 30281 CURIUM 247
+30282 30282 CURIUM 248
+30283 30283 CURIUM 243/244
+30284 30284 PLUTONIUM 238/AMERICIUM 241
+30285 30285 PLUTONIUM 239/240
+30286 30286 BERKELIUM 249
+30287 30287 CALIFORNIUM 249
+30288 30288 CALIFORNIUM 250
+30289 30289 CALIFORNIUM 252
+30290 30290 SUM AEROSOL PARTICULATES
+30291 30291 SUM IODINE
+30292 30292 SUM NOBLE GAS
+30293 30293 ACTIVATION GAS
+30294 30294 CS-137 EQUIVALENT
+30295 30295 CARBON-13
+30296 30296 LEAD
+30297 30297 TELLURIUM 131
+30298 30298 NEODYMIUM 137
+30299 30299 PSEUDO RADIONUCLIDE
+30300 30300 SILVER 112
+30301 30301 SILVER 115
+30302 30302 BARIUM 139
+30303 30303 BARIUM 141
+30304 30304 BARIUM 142
+30305 30305 BROMINE 84
+30306 30306 CADMINUM 115
+30307 30307 CADMINUM 117
+30308 30308 CADMINUM 117 METASTABLE
+30309 30309 CERIUM 145
+30310 30310 CERIUM 146
+30311 30311 COBALT 58 METASTABLE
+30312 30312 CEASIUM 138
+30313 30313 CEASIUM 139
+30314 30314 IODINE 130 AEROSOL
+30315 30315 IODINE 130 ELEMENTARY GASEOUS
+30316 30316 IODINE 130 ORGANIC BOUNDED
+30317 30317 IODINE 132 METASTABLE
+30318 30318 IODINE 134 METASTABLE
+30319 30319 INDIUM 115 METASTABLE
+30320 30320 INDIUM 117 METASTABLE
+30321 30321 KRYPTON 83 METASTABLE
+30322 30322 LANTHANUM 142
+30323 30323 LANTHANUM 143
+30324 30324 MANGANESE 56
+30325 30325 MOLYBDENUM 101
+30326 30326 MOLYBDENUM 102
+30327 30327 NEODYMIUM 149
+30328 30328 NEODYMIUM 151
+30329 30329 PALLADIUM 109
+30330 30330 PALLADIUM 112
+30331 30331 PRASEODYMIUM 145
+30332 30332 PRASEODYMIUM 146
+30333 30333 PRASEODYMIUM 147
+30334 30334 RUBIDIUM 89
+30335 30335 RUBIDIUM 90
+30336 30336 RUBIDIUM 90 METASTABLE
+30337 30337 RHODIUM 105 METASTABLE
+30338 30338 RHODIUM 107
+30339 30339 ANTIMONY 128
+30340 30340 ANTIMONY 128 METASTABLE
+30341 30341 ANTIMONY 129 METASTABLE
+30342 30342 ANTIMONY 130
+30343 30343 ANTIMONY 130 METASTABLE
+30344 30344 ANTIMONY 131
+30345 30345 ANTIMONY 132
+30346 30346 ANTIMONY 132 METASTABLE
+30347 30347 ANTIMONY 133
+30348 30348 SELENIUM 83
+30349 30349 TIN 127
+30350 30350 TIN 127 METASTABLE
+30351 30351 TIN 128
+30352 30352 TIN 129 METASTABLE
+30353 30353 TIN 130
+30354 30354 STRONTIUM 93
+30355 30355 TECHNETIUM 101
+30356 30356 TECHNETIUM 102
+30357 30357 TECHNETIUM 104
+30358 30358 TECHNETIUM 105
+30359 30359 TELLURIUM 133
+30360 30360 TELLURIUM 133 METASTABLE
+30361 30361 TELLURIUM 134
+30362 30362 YTTRIUM 93 METASTABLE
+30363 30363 YTTRIUM 94
+30364 30364 YTTRIUM 95
+30365 30365 ZIRCONIUM 96
+40000 40000 SINGLET SIGMA OXYGEN (DIOXYGEN (SIGMA SINGLET))
+40001 40001 SINGLET DELTA OXYGEN (DIOXYGEN (DELTA SINGLET))
+40002 40002 SINGLET EXCITED OXYGEN ATOM
+40003 40003 TRIPLET GROUND STATE OXYGEN ATOM
+60000 60000 HOX RADICAL (OH+HO2)
+60001 60001 TOTAL INORGANIC AND ORGANIC PEROXY RADICALS (HOO* + ROO*)
+60002 60002 PASSIVE OZONE
+60003 60003 NOX EXPRESSED AS NITROGEN
+60004 60004 ALL NITROGEN OXIDES (NOY) EXPRESSED AS NITROGEN
+60005 60005 TOTAL INORGANIC CHLORINE
+60006 60006 TOTAL INORGANIC BROMINE
+60007 60007 TOTAL INORGANIC CHLORINE EXCEPT HCL, CLONO2: CLOX
+60008 60008 TOTAL INORGANIC BROMINE EXCEPT HBR, BRONO2: BROX
+60009 60009 LUMPED ALKANES
+60010 60010 LUMPED ALKENES
+60011 60011 LUMPED AROMATIC COMPOUNDS
+60012 60012 LUMPED TERPENES
+60013 60013 NON-METHANE VOLATILE ORGANIC COMPOUNDS EXPRESSED AS CARBON
+60014 60014 ANTHROPOGENIC NON-METHANE VOLATILE ORGANIC COMPOUNDS EXPRESSED AS CARBON
+60015 60015 BIOGENIC NON-METHANE VOLATILE ORGANIC COMPOUNDS EXPRESSED AS CARBON
+60016 60016 LUMPED OXYGENATED HYDROCARBONS
+60017 60017 NOX EXPRESSED AS NITROGEN DIOXIDE (NO2)
+60018 60018 ORGANIC ALDEHYDES
+60019 60019 ORGANIC PEROXIDES
+60020 60020 ORGANIC NITRATES
+60021 60021 ETHERS
+60022 60022 AMINES
+60023 60023 KETONES
+60024 60024 DICARBONYLS UNSATURATED
+60025 60025 HYDROXY DICARBONYLS UNSATURATED
+60026 60026 HYDROXY KETONES
+60027 60027 OXIDES
+60028 60028 PEROXYACYL NITRATES
+60029 60029 AROMATIC PEROXIDE RADICAL (ARYL DIOXYDANYL RADICALS)
+60030 60030 BIOGENIC SECONDARY ORGANIC COMPOUND
+60031 60031 ANTHROPOGENIC SECONDARY ORGANIC COMPOUND
+60032 60032 ALL HYDROXY-PEROXIDES PRODUCTS OF THE REACTION OF HYDROXY-ISOPRENE ADDUCTS WITH O2
+60033 60033 ANTHROPOGENIC VOLATILE ORGANIC COMPOUNDS
+60034 60034 BIOMASS BURNING VOLATILE ORGANIC COMPOUNDS
+62000 62000 TOTAL AEROSOL
+62001 62001 DUST DRY
+62002 62002 WATER IN AMBIENT
+62003 62003 AMMONIUM DRY
+62004 62004 NITRATE DRY
+62005 62005 NITRIC ACID TRIHYDRATE
+62006 62006 SULPHATE DRY
+62007 62007 MERCURY DRY
+62008 62008 SEA SALT DRY
+62009 62009 BLACK CARBON DRY
+62010 62010 PARTICULATE ORGANIC MATTER DRY
+62011 62011 PRIMARY PARTICULATE ORGANIC MATTER DRY
+62012 62012 SECONDARY PARTICULATE ORGANIC MATTER DRY
+62013 62013 BLACK CARBON HYDROPHILIC DRY
+62014 62014 BLACK CARBON HYDROPHOBIC DRY
+62015 62015 PARTICULATE ORGANIC MATTER HYDROPHILIC DRY
+62016 62016 PARTICULATE ORGANIC MATTER HYDROPHOBIC DRY
+62017 62017 NITRATE HYDROPHILIC DRY
+62018 62018 NITRATE HYDROPHOBIC DRY
+62019 62019 RESERVED
+62020 62020 SMOKE - HIGH ABSORPTION
+62021 62021 SMOKE - LOW ABSORPTION
+62022 62022 AEROSOL - HIGH ABSORPTION
+62023 62023 AEROSOL - LOW ABSORPTION
+62024 62024 RESERVED
+62025 62025 VOLCANIC ASH
+62026 62026 PARTICULATE MATTER (PM)
+62027 62027 RESERVED
+62028 62028 TOTAL AEROSOL HYDROPHILIC
+62029 62029 TOTAL AEROSOL HYDROPHOBIC
+62030 62030 PRIMARY PARTICULATE INORGANIC MATTER DRY
+62031 62031 SECONDARY PARTICULATE INORGANIC MATTER DRY
+62032 62032 BIOGENIC SECONDARY ORGANIC AEROSOL
+62033 62033 ANTHROPOGENIC SECONDARY ORGANIC AEROSOL
+62034 62034 RAIN WATER
+62035 62035 CLOUD WATER
+62036 62036 BROWN CARBON DRY
+62100 62100 ALNUS (ALDER) POLLEN
+62101 62101 BETULA (BIRCH) POLLEN
+62102 62102 CASTANEA (CHESTNUT) POLLEN
+62103 62103 CARPINUS (HORNBEAM) POLLEN
+62104 62104 CORYLUS (HAZEL) POLLEN
+62105 62105 FAGUS (BEECH) POLLEN
+62106 62106 FRAXINUS (ASH) POLLEN
+62107 62107 PINUS (PINE) POLLEN
+62108 62108 PLATANUS (PLANE) POLLEN
+62109 62109 POPULUS (COTTONWOOD, POPLAR) POLLEN
+62110 62110 QUERCUS (OAK) POLLEN
+62111 62111 SALIX (WILLOW) POLLEN
+62112 62112 TAXUS (YEW) POLLEN
+62113 62113 TILIA (LIME, LINDEN) POLLEN
+62114 62114 ULMUS (ELM) POLLEN
+62115 62115 OLEA (OLIVE) POLLEN
+62200 62200 AMBROSIA (RAGWEED, BURR-RAGWEED) POLLEN
+62201 62201 ARTEMISIA (SAGEBRUSH, WORMWOOD, MUGWORT) POLLEN
+62202 62202 BRASSICA (RAPE, BROCCOLI, BRUSSELS SPROUTS, CABBAGE, CAULIFLOWER, COLLARDS, KALE, KOHLRABI, MUSTARD, RUTABAGA) POLLEN
+62203 62203 PLANTAGO (PLANTAIN) POLLEN
+62204 62204 RUMEX (DOCK, SORREL) POLLEN
+62205 62205 URTICA (NETTLE) POLLEN
+62300 62300 POACEAE (GRASS FAMILY) POLLEN
+65535 65535 MISSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8050.table b/definitions/bufr/tables/0/wmo/43/codetables/8050.table
new file mode 100644
index 000000000..4b401f1d2
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8050.table
@@ -0,0 +1,11 @@
+0 0 RESERVED
+1 1 PRESSURE
+2 2 TEMPERATURE
+3 3 EXTREME TEMPERATURE
+4 4 VAPOUR PRESSURE
+5 5 PRECIPITATION
+6 6 SUNSHINE DURATION
+7 7 MAXIMUM TEMPERATURE
+8 8 MINIMUM TEMPERATURE
+9 9 WIND
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8051.table b/definitions/bufr/tables/0/wmo/43/codetables/8051.table
new file mode 100644
index 000000000..5249fe6a2
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8051.table
@@ -0,0 +1,7 @@
+1 1 PRESSURE
+2 2 TEMPERATURE
+3 3 EXTREME TEMPERATURE
+4 4 VAPOUR PRESSURE
+5 5 PRECIPITATION
+6 6 SUNSHINE DURATION
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8052.table b/definitions/bufr/tables/0/wmo/43/codetables/8052.table
new file mode 100644
index 000000000..46dcbbe21
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8052.table
@@ -0,0 +1,26 @@
+0 0 MEAN WIND SPEED OVER A 10-MINUTE PERIOD OBSERVED OR RECORDED EQUAL TO OR MORE THAN 10 M S-1 OR 20 KNOTS
+1 1 MEAN WIND SPEED OVER A 10-MINUTE PERIOD OBSERVED OR RECORDED EQUAL TO OR MORE THAN 20 M S-1 OR 40 KNOTS
+2 2 MEAN WIND SPEED OVER A 10-MINUTE PERIOD OBSERVED OR RECORDED EQUAL TO OR MORE THAN 30 M S-1 OR 60 KNOTS
+3 3 MAXIMUM TEMPERATURE LESS THAN 273.15 K
+4 4 MAXIMUM TEMPERATURE EQUAL TO OR MORE THAN 298.15 K
+5 5 MAXIMUM TEMPERATURE EQUAL TO OR MORE THAN 303.15 K
+6 6 MAXIMUM TEMPERATURE EQUAL TO OR MORE THAN 308.15 K
+7 7 MAXIMUM TEMPERATURE EQUAL TO OR MORE THAN 313.15 K
+8 8 MINIMUM TEMPERATURE LESS THAN 273.15 K
+9 9 MAXIMUM TEMPERATURE EQUAL TO OR MORE THAN 273.15 K
+10 10 PRECIPITATION EQUAL TO OR MORE THAN 1.0 KG M-2
+11 11 PRECIPITATION EQUAL TO OR MORE THAN 5.0 KG M-2
+12 12 PRECIPITATION EQUAL TO OR MORE THAN 10.0 KG M-2
+13 13 PRECIPITATION EQUAL TO OR MORE THAN 50.0 KG M-2
+14 14 PRECIPITATION EQUAL TO OR MORE THAN 100.0 KG M-2
+15 15 PRECIPITATION EQUAL TO OR MORE THAN 150.0 KG M-2
+16 16 SNOW DEPTH MORE THAN 0.00 M
+17 17 SNOW DEPTH MORE THAN 0.01 M
+18 18 SNOW DEPTH MORE THAN 0.10 M
+19 19 SNOW DEPTH MORE THAN 0.50 M
+20 20 HORIZONTAL VISIBILITY LESS THAN 50 M
+21 21 HORIZONTAL VISIBILITY LESS THAN 100 M
+22 22 HORIZONTAL VISIBILITY LESS THAN 1000 M
+23 23 HAIL
+24 24 THUNDERSTORM
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8053.table b/definitions/bufr/tables/0/wmo/43/codetables/8053.table
new file mode 100644
index 000000000..cbc11c9a7
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8053.table
@@ -0,0 +1,4 @@
+0 0 VALUE OCCURRED ON ONLY ONE DAY IN THE MONTH
+1 1 VALUE OCCURRED ON MORE THAN ONE DAY IN THE MONTH
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8054.table b/definitions/bufr/tables/0/wmo/43/codetables/8054.table
new file mode 100644
index 000000000..51b908e08
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8054.table
@@ -0,0 +1,3 @@
+0 0 WIND SPEED OR GUST IS AS REPORTED
+1 1 WIND SPEED IS GREATER THAN THAT REPORTED (P IN METAR/TAF/SPECI)
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8055.table b/definitions/bufr/tables/0/wmo/43/codetables/8055.table
new file mode 100644
index 000000000..868d3fbf4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8055.table
@@ -0,0 +1,3 @@
+0 0 CALCULATE THE AREA AVERAGE OF THE U AND V COMPONENTS AT PRESSURE LEVELS FROM 0 TO 500KM CENTRED ON THE SURFACE VORTEX POSITION
+1 1 CALCULATE THE AREA AVERAGE OF THE U AND V COMPONENTS AT PRESSURE LEVELS FROM 0 TO RADIUS GREATER THAN 500KM CENTRED ON THE SURFACE VORTEX POSITION
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8060.table b/definitions/bufr/tables/0/wmo/43/codetables/8060.table
new file mode 100644
index 000000000..2865fece5
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8060.table
@@ -0,0 +1,8 @@
+0 0 RESERVED
+1 1 RANGE
+2 2 AZIMUTH
+3 3 HORIZONTAL
+4 4 VERTICAL
+5 5 NORTH/SOUTH
+6 6 EAST/WEST
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8065.table b/definitions/bufr/tables/0/wmo/43/codetables/8065.table
new file mode 100644
index 000000000..69b80ea33
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8065.table
@@ -0,0 +1,4 @@
+0 0 NO SUN-GLINT
+1 1 SUN-GLINT
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8066.table b/definitions/bufr/tables/0/wmo/43/codetables/8066.table
new file mode 100644
index 000000000..fcc0252c9
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8066.table
@@ -0,0 +1,4 @@
+0 0 OPAQUE
+1 1 SEMI-TRANSPARENT
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8070.table b/definitions/bufr/tables/0/wmo/43/codetables/8070.table
new file mode 100644
index 000000000..f58061757
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8070.table
@@ -0,0 +1,6 @@
+0 0 RESERVED
+1 1 RESERVED
+2 2 EARTH LOCATED INSTRUMENT COUNTS, CALIBRATION COEFFICIENTS AND HOUSEKEEPING (LEVEL 1B)
+3 3 EARTH LOCATED CALIBRATED RADIANCES (LEVEL 1C)
+4 4 MAPPED TO A COMMON FOOTPRINT, EARTH LOCATED CALIBRATED RADIANCES (LEVEL 1D)
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8071.table b/definitions/bufr/tables/0/wmo/43/codetables/8071.table
new file mode 100644
index 000000000..8890d5739
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8071.table
@@ -0,0 +1,4 @@
+0 0 FIRST GUESS
+1 1 Y VECTOR
+2 2 X VECTOR
+7 7 MISSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8072.table b/definitions/bufr/tables/0/wmo/43/codetables/8072.table
new file mode 100644
index 000000000..033dd5850
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8072.table
@@ -0,0 +1,8 @@
+0 0 MIXED
+1 1 CLEAR
+2 2 CLOUDY
+3 3 PROBABLY CLEAR
+4 4 PROBABLY CLOUDY
+5 5 ASH
+6 6 RESERVED
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8074.table b/definitions/bufr/tables/0/wmo/43/codetables/8074.table
new file mode 100644
index 000000000..5778e6552
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8074.table
@@ -0,0 +1,4 @@
+0 0 OPEN OCEAN OR SEMI-ENCLOSED SEA
+1 1 NON-OCEAN LIKE
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8075.table b/definitions/bufr/tables/0/wmo/43/codetables/8075.table
new file mode 100644
index 000000000..5f5e3a24c
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8075.table
@@ -0,0 +1,4 @@
+0 0 ASCENDING ORBIT
+1 1 DESCENDING ORBIT
+2 2 RESERVED
+3 3 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8076.table b/definitions/bufr/tables/0/wmo/43/codetables/8076.table
new file mode 100644
index 000000000..431496fbc
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8076.table
@@ -0,0 +1,9 @@
+0 0 KU
+1 1 C
+2 2 LONG-WAVE INFRARED
+3 3 MEDIUM-WAVE INFRARED
+4 4 SHORT-WAVE INFRARED
+5 5 M
+6 6 I
+7 7 DAY/NIGHT
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8077.table b/definitions/bufr/tables/0/wmo/43/codetables/8077.table
new file mode 100644
index 000000000..2c7902bd7
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8077.table
@@ -0,0 +1,7 @@
+0 0 LAND
+1 1 SEA
+2 2 COASTAL
+3 3 OPEN OCEAN OR SEMI-ENCLOSED SEA
+4 4 ENCLOSED SEA OR LAKE
+5 5 CONTINENTAL ICE
+127 127 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8079.table b/definitions/bufr/tables/0/wmo/43/codetables/8079.table
new file mode 100644
index 000000000..735a09c37
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8079.table
@@ -0,0 +1,9 @@
+0 0 NORMAL ISSUE
+1 1 CORRECTION TO A PREVIOUSLY ISSUED PRODUCT (COR)
+2 2 AMENDMENT TO A PREVIOUSLY ISSUED PRODUCT (AMD)
+3 3 CORRECTION TO A PREVIOUSLY ISSUED AMENDED PRODUCT (COR AMD)
+4 4 CANCELLATION OF A PREVIOUSLY ISSUED PRODUCT (CNL)
+5 5 NO PRODUCT AVAILABLE (NIL)
+6 6 SPECIAL REPORT (SPECI)
+7 7 CORRECTED SPECIAL REPORT (SPECI COR)
+15 15 MISSING OR NOT APPLICABLE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8080.table b/definitions/bufr/tables/0/wmo/43/codetables/8080.table
new file mode 100644
index 000000000..596dfc676
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8080.table
@@ -0,0 +1,20 @@
+0 0 TOTAL WATER PRESSURE PROFILE
+1 1 TOTAL WATER TEMPERATURE PROFILE
+2 2 TOTAL WATER SALINITY PROFILE
+3 3 TOTAL WATER CONDUCTIVITY PROFILE
+4 4 TOTAL WATER DEPTH
+10 10 WATER PRESSURE AT A LEVEL
+11 11 WATER TEMPERATURE AT A LEVEL
+12 12 SALINITY AT A LEVEL
+13 13 WATER DEPTH AT A LEVEL
+14 14 SEA/WATER CURRENT SPEED AT A LEVEL
+15 15 SEA/WATER CURRENT DIRECTION AT A LEVEL
+16 16 DISSOLVED OXYGEN AT A LEVEL
+20 20 POSITION
+21 21 CHLOROPHYLL-A AT A LEVEL
+22 22 NITRATE AT A LEVEL
+23 23 PH AT A LEVEL
+24 24 BBP700 AT A LEVEL
+25 25 WATER CONDUCTIVITY AT A LEVEL
+26 26 SEA WATER POTENTIAL DENSITY REFERENCED TO SEA SURFACE AT A LEVEL
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8081.table b/definitions/bufr/tables/0/wmo/43/codetables/8081.table
new file mode 100644
index 000000000..75d288732
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8081.table
@@ -0,0 +1,5 @@
+0 0 SENSOR
+1 1 TRANSMITTER
+2 2 RECEIVER
+3 3 OBSERVING PLATFORM
+63 63 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8082.table b/definitions/bufr/tables/0/wmo/43/codetables/8082.table
new file mode 100644
index 000000000..1f24db866
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8082.table
@@ -0,0 +1,3 @@
+0 0 SENSOR HEIGHT IS NOT MODIFIED
+1 1 SENSOR HEIGHT IS MODIFIED TO STANDARD LEVEL
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8083.table b/definitions/bufr/tables/0/wmo/43/codetables/8083.table
new file mode 100644
index 000000000..174ef3428
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8083.table
@@ -0,0 +1,9 @@
+1 1 ADJUSTED TO OR WITH RESPECT TO REPRESENTATIVE HEIGHT OF SENSOR ABOVE LOCAL GROUND (OR DECK OF MARINE PLATFORM)
+2 2 ADJUSTED TO OR WITH RESPECT TO REPRESENTATIVE HEIGHT OF SENSOR ABOVE WATER SURFACE
+3 3 ADJUSTED WITH RESPECT TO STANDARD SURFACE ROUGHNESS
+4 4 ADJUSTED WITH RESPECT TO WIND SPEED
+5 5 ADJUSTED WITH RESPECT TO TEMPERATURE
+6 6 ADJUSTED WITH RESPECT TO PRESSURE
+7 7 ADJUSTED WITH RESPECT TO HUMIDITY
+8 8 ADJUSTED WITH RESPECT TO EVAPORATION
+9 9 ADJUSTED WITH RESPECT TO WETTING LOSSES
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8085.table b/definitions/bufr/tables/0/wmo/43/codetables/8085.table
new file mode 100644
index 000000000..79e1a3d90
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8085.table
@@ -0,0 +1,4 @@
+0 0 FORE BEAM
+1 1 MID BEAM
+2 2 AFT BEAM
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8086.table b/definitions/bufr/tables/0/wmo/43/codetables/8086.table
new file mode 100644
index 000000000..a9ecd0351
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8086.table
@@ -0,0 +1,11 @@
+1 1 MODEL GROUND SURFACE
+2 2 STANDARD LEVEL
+3 3 TROPOPAUSE LEVEL
+4 4 MAXIMUM WIND LEVEL
+5 5 SIGNIFICANT TEMPERATURE LEVEL
+6 6 SIGNIFICANT HUMIDITY LEVEL
+7 7 SIGNIFICANT WIND LEVEL
+8 8 VERTICALLY INTERPOLATED LEVEL (THIS SHOULD BE SET TO 1 FOR POINTS ON THE VERTICAL PROFILE THAT FALL BETWEEN THE MODEL'S NATIVE VERTICAL LEVELS.)
+9 9 VIRTUAL STATION HEIGHT
+10 10 LEVEL OF BEST FIT
+11 11 RESERVED
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8087.table b/definitions/bufr/tables/0/wmo/43/codetables/8087.table
new file mode 100644
index 000000000..d556c98de
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8087.table
@@ -0,0 +1,5 @@
+0 0 UPPER LEFT
+1 1 UPPER RIGHT
+2 2 LOWER RIGHT
+3 3 LOWER LEFT
+7 7 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8088.table b/definitions/bufr/tables/0/wmo/43/codetables/8088.table
new file mode 100644
index 000000000..d6f51be70
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8088.table
@@ -0,0 +1,4 @@
+0 0 TOP VIEW (GEOGRAPHICAL LONGITUDE ON X-AXIS AND LATITUDE ON Y-AXIS)
+1 1 NORTH-SOUTH VIEW (TRANSECT WITH GEOGRAPHICAL LONGITUDE ON X-AXIS AND VERTICAL HEIGHT ON Y-AXIS)
+2 2 EAST-WEST VIEW (TRANSECT WITH GEOGRAPHICAL LATITUDE ON X-AXIS AND VERTICAL HEIGHT ON Y-AXIS)
+63 63 MISSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8091.table b/definitions/bufr/tables/0/wmo/43/codetables/8091.table
new file mode 100644
index 000000000..3a8c44df1
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8091.table
@@ -0,0 +1,11 @@
+0 0 SATELLITE COORDINATES
+1 1 OBSERVATION COORDINATES
+2 2 START OF OBSERVATION
+3 3 END OF OBSERVATION
+4 4 HORIZONTAL CENTRE OF GRAVITY OF THE OBSERVATION
+5 5 VERTICAL CENTRE OF GRAVITY OF THE OBSERVATION
+6 6 TOP OF THE OBSERVATION
+7 7 BOTTOM OF THE OBSERVATION
+8 8 PROJECTION ORIGIN
+9 9 COORDINATES OF TRUE SCALE
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8092.table b/definitions/bufr/tables/0/wmo/43/codetables/8092.table
new file mode 100644
index 000000000..e40754f8e
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8092.table
@@ -0,0 +1,3 @@
+0 0 STANDARD UNCERTAINTY
+1 1 COMBINED STANDARD UNCERTAINTY
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8093.table b/definitions/bufr/tables/0/wmo/43/codetables/8093.table
new file mode 100644
index 000000000..74f5c3a63
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8093.table
@@ -0,0 +1,4 @@
+0 0 TOTAL UNCERTAINTY
+1 1 SYSTEMATIC COMPONENT OF UNCERTAINTY
+2 2 RANDOM COMPONENT OF UNCERTAINTY
+31 31 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8094.table b/definitions/bufr/tables/0/wmo/43/codetables/8094.table
new file mode 100644
index 000000000..e2ead0bc9
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8094.table
@@ -0,0 +1,8 @@
+0 0 AVERAGE OF MAXIMUM AND MINIMUM VALUES: TM = (TX + TN)/2
+1 1 AVERAGE OF THE 8 OBSERVATIONS TAKEN EVERY THREE HOURS
+2 2 AVERAGE OF THE 24 HOURLY OBSERVATIONS
+3 3 WEIGHTED AVERAGE OF 3 OBSERVATIONS: TM = (AT1 +BT2 + CT3)
+4 4 WEIGHTED AVERAGE OF 3 OBSERVATIONS AND ALSO MAXIMUM AND MINIMUM VALUES: TM= (AT1 +BT2 + CT3 +DTX + ETN)
+5 5 AUTOMATIC WEATHER STATION COMPLETE INTEGRATION FROM MINUTE DATA
+6 6 AVERAGE OF THE 4 OBSERVATIONS TAKEN EVERY SIX HOURS
+255 255 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8095.table b/definitions/bufr/tables/0/wmo/43/codetables/8095.table
new file mode 100644
index 000000000..f9d14f75f
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8095.table
@@ -0,0 +1,36 @@
+0 0 RESERVED
+1 1 1A
+2 2 1B
+3 3 1C
+4 4 1D
+5 5 RESERVED
+6 6 2A
+7 7 2B
+8 8 2C
+9 9 2D
+10 10 RESERVED
+11 11 3A
+12 12 3B
+13 13 3C
+14 14 3D
+15 15 RESERVED
+16 16 4A
+17 17 4B
+18 18 4C
+19 19 4D
+20 20 RESERVED
+21 21 5A
+22 22 5B
+23 23 5C
+24 24 5D
+25 25 RESERVED
+26 26 1
+27 27 2
+28 28 3
+29 29 4
+30 30 5
+31 31 A
+32 32 B
+33 33 C
+34 34 D
+255 255 MISSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8096.table b/definitions/bufr/tables/0/wmo/43/codetables/8096.table
new file mode 100644
index 000000000..f9d14f75f
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8096.table
@@ -0,0 +1,36 @@
+0 0 RESERVED
+1 1 1A
+2 2 1B
+3 3 1C
+4 4 1D
+5 5 RESERVED
+6 6 2A
+7 7 2B
+8 8 2C
+9 9 2D
+10 10 RESERVED
+11 11 3A
+12 12 3B
+13 13 3C
+14 14 3D
+15 15 RESERVED
+16 16 4A
+17 17 4B
+18 18 4C
+19 19 4D
+20 20 RESERVED
+21 21 5A
+22 22 5B
+23 23 5C
+24 24 5D
+25 25 RESERVED
+26 26 1
+27 27 2
+28 28 3
+29 29 4
+30 30 5
+31 31 A
+32 32 B
+33 33 C
+34 34 D
+255 255 MISSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8097.table b/definitions/bufr/tables/0/wmo/43/codetables/8097.table
new file mode 100644
index 000000000..1107d7b19
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8097.table
@@ -0,0 +1,4 @@
+0 0 THE AVERAGE OF SIX TEMPERATURE SENSORS PLACED THROUGHOUT THE PAYLOAD
+1 1 AVERAGE OF WF-BAND IFP AND RFE SENSORS FOR CHANNELS 1 TO 8
+2 2 AVERAGE OF G-BAND RFE SENSOR FOR CHANNELS 9 TO 12
+127 127 MISSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8098.table b/definitions/bufr/tables/0/wmo/43/codetables/8098.table
new file mode 100644
index 000000000..63fb59bb9
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8098.table
@@ -0,0 +1,7 @@
+0 0 ON-BOARD CALIBRATION TARGET
+1 1 SPACE VIEW REFLECTOR
+2 2 MAIN REFLECTOR
+3 3 RACETRACK
+4 4 SUN SHIELD
+5 5 ROTATING REFLECTOR
+15 15 MISSING
diff --git a/definitions/bufr/tables/0/wmo/43/codetables/8099.table b/definitions/bufr/tables/0/wmo/43/codetables/8099.table
new file mode 100644
index 000000000..b8c9664c4
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/codetables/8099.table
@@ -0,0 +1,3 @@
+0 0 NADIR
+1 1 OBLIQUE
+15 15 MISSING VALUE
diff --git a/definitions/bufr/tables/0/wmo/43/element.table b/definitions/bufr/tables/0/wmo/43/element.table
new file mode 100644
index 000000000..fb11b6d78
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/element.table
@@ -0,0 +1,1838 @@
+#code|abbreviation|type|name|unit|scale|reference|width|crex_unit|crex_scale|crex_width
+000001|tableAEntry|string|TABLE A: ENTRY|CCITT IA5|0|0|24|Character|0|3
+000002|tableALine1|string|TABLE A: DATA CATEGORY DESCRIPTION, LINE 1|CCITT IA5|0|0|256|Character|0|32
+000003|tableALine2|string|TABLE A: DATA CATEGORY DESCRIPTION, LINE 2|CCITT IA5|0|0|256|Character|0|32
+000004|masterTable|string|BUFR/CREX MASTER TABLE|CCITT IA5|0|0|16|Character|0|2
+000005|editionNumber|string|BUFR/CREX EDITION NUMBER|CCITT IA5|0|0|24|Character|0|3
+000006|bufrMasterTableVersionNumber|string|BUFR MASTER TABLE VERSION NUMBER|CCITT IA5|0|0|16|Character|0|2
+000007|crexMasterTableVersionNumber|string|CREX MASTER TABLE VERSION NUMBER|CCITT IA5|0|0|16|Character|0|2
+000008|bufrLocalTableVersionNumber|string|BUFR LOCAL TABLE VERSION NUMBER|CCITT IA5|0|0|16|Character|0|2
+000010|fDescriptorToBeAddedOrDefined|string|F DESCRIPTOR TO BE ADDED OR DEFINED|CCITT IA5|0|0|8|Character|0|1
+000011|xDescriptorToBeAddedOrDefined|string|X DESCRIPTOR TO BE ADDED OR DEFINED|CCITT IA5|0|0|16|Character|0|2
+000012|yDescriptorToBeAddedOrDefined|string|Y DESCRIPTOR TO BE ADDED OR DEFINED|CCITT IA5|0|0|24|Character|0|3
+000013|elementNameLine1|string|ELEMENT NAME, LINE 1|CCITT IA5|0|0|256|Character|0|32
+000014|elementNameLine2|string|ELEMENT NAME, LINE 2|CCITT IA5|0|0|256|Character|0|32
+000015|unitsName|string|UNITS NAME|CCITT IA5|0|0|192|Character|0|24
+000016|unitsScaleSign|string|UNITS SCALE SIGN|CCITT IA5|0|0|8|Character|0|1
+000017|unitsScale|string|UNITS SCALE|CCITT IA5|0|0|24|Character|0|3
+000018|unitsReferenceSign|string|UNITS REFERENCE SIGN|CCITT IA5|0|0|8|Character|0|1
+000019|unitsReferenceValue|string|UNITS REFERENCE VALUE|CCITT IA5|0|0|80|Character|0|10
+000020|elementDataWidth|string|ELEMENT DATA WIDTH|CCITT IA5|0|0|24|Character|0|3
+000024|codeFigure|string|CODE FIGURE|CCITT IA5|0|0|64|Character|0|8
+000025|codeFigureMeaning|string|CODE FIGURE MEANING|CCITT IA5|0|0|496|Character|0|62
+000026|bitNumber|string|BIT NUMBER|CCITT IA5|0|0|48|Character|0|6
+000027|bitNumberMeaning|string|BIT NUMBER MEANING|CCITT IA5|0|0|496|Character|0|62
+000030|descriptorDefiningSequence|string|DESCRIPTOR DEFINING SEQUENCE|CCITT IA5|0|0|48|Character|0|6
+001001|blockNumber|long|WMO BLOCK NUMBER|Numeric|0|0|7|Numeric|0|2
+001002|stationNumber|long|WMO STATION NUMBER|Numeric|0|0|10|Numeric|0|3
+001003|regionNumber|table|WMO REGION NUMBER/GEOGRAPHICAL AREA|CODE TABLE|0|0|3|CODE TABLE|0|1
+001004|wmoRegionSubArea|long|WMO REGION SUB-AREA|Numeric|0|0|3|Numeric|0|1
+001005|buoyOrPlatformIdentifier|long|BUOY/PLATFORM IDENTIFIER|Numeric|0|0|17|Numeric|0|5
+001006|aircraftFlightNumber|string|AIRCRAFT FLIGHT NUMBER|CCITT IA5|0|0|64|Character|0|8
+001007|satelliteIdentifier|table|SATELLITE IDENTIFIER|CODE TABLE|0|0|10|CODE TABLE|0|4
+001008|aircraftRegistrationNumberOrOtherIdentification|string|AIRCRAFT REGISTRATION NUMBER OR OTHER IDENTIFICATION|CCITT IA5|0|0|64|Character|0|8
+001009|commercialAircraftType|string|TYPE OF COMMERCIAL AIRCRAFT|CCITT IA5|0|0|64|Character|0|8
+001010|stationaryBuoyPlatformIdentifierEGCManBuoys|string|STATIONARY BUOY PLATFORM IDENTIFIER; E.G. C-MAN BUOYS|CCITT IA5|0|0|64|Character|0|8
+001011|shipOrMobileLandStationIdentifier|string|SHIP OR MOBILE LAND STATION IDENTIFIER|CCITT IA5|0|0|72|Character|0|9
+001012|directionOfMotionOfMovingObservingPlatform|long|DIRECTION OF MOTION OF MOVING OBSERVING PLATFORM|deg|0|0|9|deg|0|3
+001013|movingObservingPlatformSpeed|long|SPEED OF MOTION OF MOVING OBSERVING PLATFORM|m/s|0|0|10|m/s|0|3
+001014|platformDriftSpeed|double|PLATFORM DRIFT SPEED (HIGH PRECISION)|m/s|2|0|10|m/s|2|4
+001015|stationOrSiteName|string|STATION OR SITE NAME|CCITT IA5|0|0|160|Character|0|20
+001016|satelliteSubIdentifier|long|SATELLITE SUB-IDENTIFIER|Numeric|0|0|16|Numeric|0|5
+001018|shortStationName|string|SHORT STATION OR SITE NAME|CCITT IA5|0|0|40|Character|0|5
+001019|longStationName|string|LONG STATION OR SITE NAME|CCITT IA5|0|0|256|Character|0|32
+001020|wmoRegionSubArea|long|WMO REGION SUB-AREA|Numeric|0|0|4|Numeric|0|2
+001021|synopticFeatureIdentifier|long|SYNOPTIC FEATURE IDENTIFIER|Numeric|0|0|14|Numeric|0|4
+001022|featureName|string|NAME OF FEATURE|CCITT IA5|0|0|224|Character|0|28
+001023|observationSequenceNumber|long|OBSERVATION SEQUENCE NUMBER|Numeric|0|0|9|Numeric|0|3
+001024|windSpeedSource|table|WIND SPEED SOURCE|CODE TABLE|0|0|5|CODE TABLE|0|2
+001025|stormIdentifier|string|STORM IDENTIFIER|CCITT IA5|0|0|24|Character|0|3
+001026|stormName|string|WMO STORM NAME|CCITT IA5|0|0|64|Character|0|8
+001027|longStormName|string|WMO LONG STORM NAME|CCITT IA5|0|0|80|Character|0|10
+001028|aerosolOpticalDepthSource|table|AEROSOL OPTICAL DEPTH (AOD) SOURCE|CODE TABLE|0|0|5|CODE TABLE|0|2
+001029|ssiSource|table|SSI SOURCE|CODE TABLE|0|0|5|CODE TABLE|0|2
+001030|numericalModelIdentifier|string|NUMERICAL MODEL IDENTIFIER|CCITT IA5|0|0|128|Character|0|16
+001031|centre|table|IDENTIFICATION OF ORIGINATING/GENERATING CENTRE|CODE TABLE|0|0|16|CODE TABLE|0|5
+001032|generatingApplication|table|GENERATING APPLICATION|CODE TABLE defined by originating/generating centre|0|0|8|CODE TABLE|0|3
+001033|centre|table|IDENTIFICATION OF ORIGINATING/GENERATING CENTRE|Common CODE TABLE C-1|0|0|8|Common CODE TABLE C-1|0|3
+001034|subCentre|table|IDENTIFICATION OF ORIGINATING/GENERATING SUB-CENTRE|Common CODE TABLE C-12|0|0|8|Common CODE TABLE C-12|0|3
+001035|centre|table|ORIGINATING CENTRE|Common CODE TABLE C-11|0|0|16|Common CODE TABLE C-11|0|5
+001036|agencyInChargeOfOperatingObservingPlatform|table|AGENCY IN CHARGE OF OPERATING THE OBSERVING PLATFORM|CODE TABLE|0|0|20|CODE TABLE|0|7
+001037|sigmetSequenceIdentifier|string|SIGMET SEQUENCE IDENTIFIER|CCITT IA5|0|0|24|Character|0|3
+001038|sourceOfSeaIceFraction|table|SOURCE OF SEA ICE FRACTION|CODE TABLE|0|0|5|CODE TABLE|0|2
+001039|graphicalAreaForecastSequenceIdentifier|string|GRAPHICAL AREA FORECAST (GFA) SEQUENCE IDENTIFIER|CCITT IA5|0|0|40|Character|0|5
+001040|processingCentreIdCode|string|PROCESSING CENTRE ID CODE|CCITT IA5|0|0|48|Character|0|6
+001041|absolutePlatformVelocityFirstComponent|double|ABSOLUTE PLATFORM VELOCITY - FIRST COMPONENT|m/s|5|-1073741824|31|m/s|5|10
+001042|absolutePlatformVelocitySecondComponent|double|ABSOLUTE PLATFORM VELOCITY - SECOND COMPONENT|m/s|5|-1073741824|31|m/s|5|10
+001043|absolutePlatformVelocityThirdComponent|double|ABSOLUTE PLATFORM VELOCITY - THIRD COMPONENT|m/s|5|-1073741824|31|m/s|5|10
+001044|standardGeneratingApplication|table|STANDARD GENERATING APPLICATION|CODE TABLE|0|0|8|CODE TABLE|0|3
+001050|platformTransmitterIdNumber|long|PLATFORM TRANSMITTER ID NUMBER|Numeric|0|0|17|Numeric|0|6
+001051|platformTransmitterIdNumber|string|PLATFORM TRANSMITTER ID NUMBER|CCITT IA5|0|0|96|Character|0|12
+001052|platformTransmitterId|table|PLATFORM TRANSMITTER ID|CODE TABLE|0|0|3|CODE TABLE|0|1
+001053|tsunameterReportSequenceNumber|long|TSUNAMETER REPORT SEQUENCE NUMBER TRIGGERED BY A TSUNAMI EVENT|Numeric|0|0|7|Numeric|0|2
+001060|aircraftReportingPointBeaconIdentifier|string|AIRCRAFT REPORTING POINT (BEACON IDENTIFIER)|CCITT IA5|0|0|64|Character|0|8
+001062|shortIcaoLocationIndicator|string|SHORT ICAO LOCATION INDICATOR|CCITT IA5|0|0|32|Character|0|4
+001063|icaoLocationIndicator|string|ICAO LOCATION INDICATOR|CCITT IA5|0|0|64|Character|0|8
+001064|runwayDesignator|string|RUNWAY DESIGNATOR|CCITT IA5|0|0|32|Character|0|4
+001065|icaoRegionIdentifier|string|ICAO REGION IDENTIFIER|CCITT IA5|0|0|256|Character|0|32
+001075|tideStationIdentification|string|TIDE STATION IDENTIFICATION|CCITT IA5|0|0|40|Character|0|5
+001079|uniqueIdentifierForProfile|string|UNIQUE IDENTIFIER FOR THE PROFILE|CCITT IA5|0|0|64|Character|0|8
+001080|shipLineNumberAccordingToSoop|string|SHIP LINE NUMBER ACCORDING TO SOOP|CCITT IA5|0|0|32|Character|0|4
+001081|radiosondeSerialNumber|string|RADIOSONDE SERIAL NUMBER|CCITT IA5|0|0|160|Character|0|20
+001082|radiosondeAscensionNumber|long|RADIOSONDE ASCENSION NUMBER|Numeric|0|0|14|Numeric|0|4
+001083|radiosondeReleaseNumber|long|RADIOSONDE RELEASE NUMBER|Numeric|0|0|3|Numeric|0|1
+001085|observingPlatformManufacturerModel|string|OBSERVING PLATFORM MANUFACTURER'S MODEL|CCITT IA5|0|0|160|Character|0|20
+001086|observingPlatformManufacturerSerialNumber|string|OBSERVING PLATFORM MANUFACTURER'S SERIAL NUMBER|CCITT IA5|0|0|256|Character|0|32
+001087|marineObservingPlatformIdentifier|long|WMO MARINE OBSERVING PLATFORM EXTENDED IDENTIFIER|Numeric|0|0|23|Numeric|0|7
+001090|techniqueForMakingUpInitialPerturbations|table|TECHNIQUE FOR MAKING UP INITIAL PERTURBATIONS|CODE TABLE|0|0|8|CODE TABLE|0|3
+001091|ensembleMemberNumber|long|ENSEMBLE MEMBER NUMBER|Numeric|0|0|10|Numeric|0|4
+001092|ensembleForecastType|table|TYPE OF ENSEMBLE FORECAST|CODE TABLE|0|0|8|CODE TABLE|0|3
+001093|balloonLotNumber|string|BALLOON LOT NUMBER|CCITT IA5|0|0|96|Character|0|12
+001094|wbanNumber|long|WBAN NUMBER|Numeric|0|0|17|Numeric|0|5
+001095|observerIdentification|string|OBSERVER IDENTIFICATION|CCITT IA5|0|0|32|Character|0|4
+001096|stationAcquisition|string|STATION ACQUISITION|CCITT IA5|0|0|160|Character|0|20
+001099|uniqueProductDefinition|string|UNIQUE PRODUCT DEFINITION|CCITT IA5|0|0|248|Character|0|31
+001101|stateIdentifier|table|STATE IDENTIFIER|CODE TABLE|0|0|10|CODE TABLE|0|3
+001102|nationalStationNumber|long|NATIONAL STATION NUMBER|Numeric|0|0|30|Numeric|0|9
+001103|imoNumber|long|IMO NUMBER. UNIQUE LLOYD'S REGISTER|Numeric|0|0|24|Numeric|0|7
+001104|stateOrFederalStateIdentifier|string|STATE/FEDERAL STATE IDENTIFIER|CCITT IA5|0|0|32|Character|0|4
+001105|highwayDesignator|string|HIGHWAY DESIGNATOR|CCITT IA5|0|0|40|Character|0|5
+001106|locationAlongHighwayAsIndicatedByPositionMarkers|long|LOCATION ALONG HIGHWAY AS INDICATED BY POSITION MARKERS|m|-2|0|14|m|-2|5
+001110|aircraftTailNumber|string|AIRCRAFT TAIL NUMBER|CCITT IA5|0|0|48|Character|0|6
+001111|originationAirport|string|ORIGINATION AIRPORT|CCITT IA5|0|0|24|Character|0|3
+001112|destinationAirport|string|DESTINATION AIRPORT|CCITT IA5|0|0|24|Character|0|3
+001113|templateVersionNumberDefinedByOriginatingCentre|long|TEMPLATE VERSION NUMBER DEFINED BY ORIGINATING CENTRE|Numeric|1|0|9|Numeric|1|3
+001114|encryptedStationIdentifierBase64Encoding|string|ENCRYPTED SHIP OR MOBILE LAND STATION IDENTIFIER (BASE64 ENCODING)|CCITT IA5|0|0|352|Character|0|44
+001115|identifierOfTheCruiseOrMission|string|IDENTIFIER OF THE CRUISE OR MISSION UNDER WHICH THE DATA WERE COLLECTED|CCITT IA5|0|0|160|Character|0|20
+001124|gridPointIdentifier|long|GRID POINT IDENTIFIER|Numeric|0|0|24|Numeric|0|8
+001125|wigosIdentifierSeries|long|WIGOS IDENTIFIER SERIES|Numeric|0|0|4|Numeric|0|2
+001126|wigosIssuerOfIdentifier|long|WIGOS ISSUER OF IDENTIFIER|Numeric|0|0|16|Numeric|0|5
+001127|wigosIssueNumber|long|WIGOS ISSUE NUMBER|Numeric|0|0|16|Numeric|0|5
+001128|wigosLocalIdentifierCharacter|string|WIGOS LOCAL IDENTIFIER (CHARACTER)|CCITT IA5|0|0|128|Character|0|16
+001130|stormIdentifierLong|string|STORM IDENTIFIER (LONG)|CCITT IA5|0|0|32|NA|0|0
+001144|snapshotIdentifier|long|SNAPSHOT IDENTIFIER|Numeric|0|0|31|Numeric|0|10
+001145|lightSourceIdentifier|long|LIGHT SOURCE IDENTIFIER|Numeric|0|-8|20|Numeric|0|7
+001150|coordinateReferenceSystem|table|COORDINATE REFERENCE SYSTEM|CODE TABLE|0|0|16|CODE TABLE|0|5
+001151|fixedMeanSeaLevelReferenceDatum|table|FIXED MEAN SEA-LEVEL REFERENCE DATUM|CODE TABLE|0|0|12|CODE TABLE|0|4
+001152|semiMajorAxisOfRotationEllipsoid|double|SEMI-MAJOR AXIS OF ROTATION ELLIPSOID|m|2|0|31|m|2|11
+001153|semiMinorAxisOfRotationEllipsoid|double|SEMI-MINOR AXIS OF ROTATION ELLIPSOID|m|2|0|31|m|2|11
+001154|sensorIdentifier|long|SENSOR IDENTIFIER|Numeric|0|0|12|Numeric|0|4
+001155|retrievalIdentifier|table|RETRIEVAL IDENTIFIER|CODE TABLE|0|0|8|CODE TABLE|0|3
+002001|stationType|table|TYPE OF STATION|CODE TABLE|0|0|2|CODE TABLE|0|1
+002002|instrumentationForWindMeasurement|flag|TYPE OF INSTRUMENTATION FOR WIND MEASUREMENT|FLAG TABLE|0|0|4|FLAG TABLE|0|2
+002003|measuringEquipmentType|table|TYPE OF MEASURING EQUIPMENT USED|CODE TABLE|0|0|4|CODE TABLE|0|2
+002004|typeOfInstrumentationForEvaporationMeasurement|table|TYPE OF INSTRUMENTATION FOR EVAPORATION MEASUREMENT OR TYPE OF CROP FOR WHICH EVAPOTRANSPIRATION IS REPORTED|CODE TABLE|0|0|4|CODE TABLE|0|2
+002005|temperatureObservationPrecision|double|PRECISION OF TEMPERATURE OBSERVATION|K|2|0|7|K|2|3
+002006|upperAirRemoteSensingInstrumentType|table|UPPER AIR REMOTE SENSING INSTRUMENT TYPE|CODE TABLE|0|0|6|CODE TABLE|0|0
+002007|sensorForWaterLevelMeasuringInstrumentType|table|TYPE OF SENSOR FOR WATER LEVEL MEASURING INSTRUMENT|CODE TABLE|0|0|6|CODE TABLE|0|2
+002008|typeOfOffshorePlatform|table|TYPE OF OFFSHORE PLATFORM|CODE TABLE|0|0|4|CODE TABLE|0|2
+002009|modisAerosolAlgorithm|table|MODIS AEROSOL ALGORITHM|CODE TABLE|0|0|4|CODE TABLE|0|2
+002011|radiosondeType|table|RADIOSONDE TYPE|CODE TABLE|0|0|8|CODE TABLE|0|3
+002012|radiosondeComputationalMethod|table|RADIOSONDE COMPUTATIONAL METHOD|CODE TABLE|0|0|4|CODE TABLE|0|2
+002013|solarAndInfraredRadiationCorrection|table|SOLAR AND INFRARED RADIATION CORRECTION|CODE TABLE|0|0|4|CODE TABLE|0|2
+002014|trackingTechniqueOrStatusOfSystem|table|TRACKING TECHNIQUE/STATUS OF SYSTEM USED|CODE TABLE|0|0|7|CODE TABLE|0|3
+002015|radiosondeCompleteness|table|RADIOSONDE COMPLETENESS|CODE TABLE|0|0|4|CODE TABLE|0|2
+002016|radiosondeConfiguration|flag|RADIOSONDE CONFIGURATION|FLAG TABLE|0|0|5|FLAG TABLE|0|2
+002017|correctionAlgorithmsForHumidityMeasurements|table|CORRECTION ALGORITHMS FOR HUMIDITY MEASUREMENTS|CODE TABLE|0|0|5|CODE TABLE|0|2
+002019|satelliteInstruments|table|SATELLITE INSTRUMENTS|CODE TABLE|0|0|11|CODE TABLE|0|4
+002020|satelliteClassification|table|SATELLITE CLASSIFICATION|CODE TABLE|0|0|9|CODE TABLE|0|3
+002021|satelliteInstrumentDataUsedInProcessing|flag|SATELLITE INSTRUMENT DATA USED IN PROCESSING|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+002022|satelliteDataProcessingTechnique|flag|SATELLITE DATA-PROCESSING TECHNIQUE USED|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+002023|satelliteDerivedWindComputationMethod|table|SATELLITE-DERIVED WIND COMPUTATION METHOD|CODE TABLE|0|0|4|CODE TABLE|0|2
+002024|meanHumidityComputationalMethod|table|INTEGRATED MEAN HUMIDITY COMPUTATIONAL METHOD|CODE TABLE|0|0|4|CODE TABLE|0|2
+002025|satelliteChannelsUsedInComputation|flag|SATELLITE CHANNEL(S) USED IN COMPUTATION|FLAG TABLE|0|0|25|FLAG TABLE|0|9
+002026|crossTrackResolution|double|CROSS-TRACK RESOLUTION|m|2|0|12|m|2|4
+002027|alongTrackResolution|double|ALONG-TRACK RESOLUTION|m|2|0|12|m|2|4
+002028|segmentSizeAtNadirInXDirection|long|SEGMENT SIZE AT NADIR IN X-DIRECTION|m|0|0|18|m|0|6
+002029|segmentSizeAtNadirInYDirection|long|SEGMENT SIZE AT NADIR IN Y-DIRECTION|m|0|0|18|m|0|6
+002030|methodOfCurrentMeasurement|table|METHOD OF CURRENT MEASUREMENT|CODE TABLE|0|0|3|CODE TABLE|0|1
+002031|durationAndTimeOfCurrentMeasurement|table|DURATION AND TIME OF CURRENT MEASUREMENT|CODE TABLE|0|0|5|CODE TABLE|0|2
+002032|indicatorForDigitization|table|INDICATOR FOR DIGITIZATION|CODE TABLE|0|0|2|CODE TABLE|0|1
+002033|methodOfSalinityOrDepthMeasurement|table|METHOD OF SALINITY/DEPTH MEASUREMENT|CODE TABLE|0|0|3|CODE TABLE|0|1
+002034|drogueType|table|DROGUE TYPE|CODE TABLE|0|0|5|CODE TABLE|0|2
+002035|cableLength|long|CABLE LENGTH|m|0|0|9|m|0|3
+002036|buoyType|table|BUOY TYPE|CODE TABLE|0|0|2|CODE TABLE|0|1
+002037|methodOfTidalObservation|table|METHOD OF TIDAL OBSERVATION|CODE TABLE|0|0|3|CODE TABLE|0|1
+002038|methodOfWaterTemperatureAndOrOrSalinityMeasurement|table|METHOD OF WATER TEMPERATURE AND/OR SALINITY MEASUREMENT|CODE TABLE|0|0|4|CODE TABLE|0|2
+002039|methodOfWetBulbTemperatureMeasurement|table|METHOD OF WET-BULB TEMPERATURE MEASUREMENT|CODE TABLE|0|0|3|CODE TABLE|0|1
+002040|methodOfRemovingVelocityAndMotionOfPlatformFromCurrent|table|METHOD OF REMOVING VELOCITY AND MOTION OF PLATFORM FROM CURRENT|CODE TABLE|0|0|4|CODE TABLE|0|2
+002041|methodForEstimatingReportsRelatedToSynopticFeatures|table|METHOD FOR ESTIMATING REPORTS RELATED TO SYNOPTIC FEATURES|CODE TABLE|0|0|6|CODE TABLE|0|2
+002042|indicatorForSeaSurfaceCurrentSpeed|table|INDICATOR FOR SEA-SURFACE CURRENT SPEED|CODE TABLE|0|0|2|CODE TABLE|0|1
+002044|indicatorForMethodOfCalculatingSpectralWaveData|table|INDICATOR FOR METHOD OF CALCULATING SPECTRAL WAVE DATA|CODE TABLE|0|0|4|CODE TABLE|0|2
+002045|platformType|table|INDICATOR FOR TYPE OF PLATFORM|CODE TABLE|0|0|4|CODE TABLE|0|2
+002046|waveMeasurementInstrumentation|table|WAVE MEASUREMENT INSTRUMENTATION|CODE TABLE|0|0|4|CODE TABLE|0|2
+002047|deepOceanTsunameterType|table|DEEP-OCEAN TSUNAMETER TYPE|CODE TABLE|0|0|7|CODE TABLE|0|2
+002048|satelliteSensorIndicator|table|SATELLITE SENSOR INDICATOR|CODE TABLE|0|0|4|CODE TABLE|0|2
+002049|geostationarySatelliteDataProcessingTechnique|flag|GEOSTATIONARY SATELLITE DATA-PROCESSING TECHNIQUE USED|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+002050|geostationarySounderSatelliteChannels|flag|GEOSTATIONARY SOUNDER SATELLITE CHANNELS USED|FLAG TABLE|0|0|20|FLAG TABLE|0|7
+002051|indicatorToSpecifyObservingMethodForExtremeTemperatures|table|INDICATOR TO SPECIFY OBSERVING METHOD FOR EXTREME TEMPERATURES|CODE TABLE|0|0|4|CODE TABLE|0|2
+002052|geostationaryImagerSatelliteChannels|flag|GEOSTATIONARY IMAGER SATELLITE CHANNELS USED|FLAG TABLE|0|0|6|FLAG TABLE|0|2
+002053|goesBrightnessTemperatureCharacteristics|table|GOES-I/M BRIGHTNESS TEMPERATURE CHARACTERISTICS|CODE TABLE|0|0|4|CODE TABLE|0|2
+002054|goesSoundingsParameter|table|GOES-I/M SOUNDINGS PARAMETER CHARACTERISTICS|CODE TABLE|0|0|4|CODE TABLE|0|2
+002055|geostationarySoundingsStatisticalParameters|table|GEOSTATIONARY SOUNDINGS STATISTICAL PARAMETERS|CODE TABLE|0|0|4|CODE TABLE|0|2
+002056|geostationarySoundingsAccuracyStatistics|table|GEOSTATIONARY SOUNDINGS ACCURACY STATISTICS|CODE TABLE|0|0|4|CODE TABLE|0|2
+002057|originOfFirstGuessInformationForGoesIOrMSoundings|table|ORIGIN OF FIRST-GUESS INFORMATION FOR GOES-I/M SOUNDINGS|CODE TABLE|0|0|4|CODE TABLE|0|2
+002058|validTimesOfFirstGuessInformationForGoesIOrMSoundings|table|VALID TIMES OF FIRST-GUESS INFORMATION FOR GOES-I/M SOUNDINGS|CODE TABLE|0|0|4|CODE TABLE|0|2
+002059|originOfAnalysisInformationForGoesIOrMSoundings|table|ORIGIN OF ANALYSIS INFORMATION FOR GOES-I/M SOUNDINGS|CODE TABLE|0|0|4|CODE TABLE|0|2
+002060|originOfSurfaceInformationForGoesIOrMSoundings|table|ORIGIN OF SURFACE INFORMATION FOR GOES-I/M SOUNDINGS|CODE TABLE|0|0|4|CODE TABLE|0|2
+002061|aircraftNavigationalSystem|table|AIRCRAFT NAVIGATIONAL SYSTEM|CODE TABLE|0|0|3|CODE TABLE|0|1
+002062|aircraftDataRelaySystemType|table|TYPE OF AIRCRAFT DATA RELAY SYSTEM|CODE TABLE|0|0|4|CODE TABLE|0|2
+002063|aircraftRollAngle|double|AIRCRAFT ROLL ANGLE|deg|2|-18000|16|deg|2|5
+002064|aircraftRollAngleQuality|table|AIRCRAFT ROLL ANGLE QUALITY|CODE TABLE|0|0|2|CODE TABLE|0|1
+002065|acarsGroundReceivingStation|string|ACARS GROUND-RECEIVING STATION|CCITT IA5|0|0|40|Character|0|5
+002066|radiosondeGroundReceivingSystem|table|RADIOSONDE GROUND RECEIVING SYSTEM|CODE TABLE|0|0|6|CODE TABLE|0|2
+002067|radiosondeOperatingFrequency|long|RADIOSONDE OPERATING FREQUENCY|Hz|-5|0|15|Hz|-5|5
+002070|originalSpecificationOfLatitudeOrLongitude|table|ORIGINAL SPECIFICATION OF LATITUDE/LONGITUDE|CODE TABLE|0|0|4|CODE TABLE|0|2
+002071|spectrographicWavelength|double|SPECTROGRAPHIC WAVELENGTH|m|13|0|30|m|13|10
+002072|spectrographicWidth|double|SPECTROGRAPHIC WIDTH|m|13|0|30|m|13|10
+002080|balloonManufacturer|table|BALLOON MANUFACTURER|CODE TABLE|0|0|6|CODE TABLE|0|2
+002081|balloonType|table|TYPE OF BALLOON|CODE TABLE|0|0|5|CODE TABLE|0|2
+002082|weightOfBalloon|double|WEIGHT OF BALLOON|kg|3|0|12|kg|3|4
+002083|balloonShelterType|table|TYPE OF BALLOON SHELTER|CODE TABLE|0|0|4|CODE TABLE|0|2
+002084|typeOfGasUsedInBalloon|table|TYPE OF GAS USED IN BALLOON|CODE TABLE|0|0|4|CODE TABLE|0|2
+002085|amountOfGasUsedInBalloon|double|AMOUNT OF GAS USED IN BALLOON|kg|3|0|13|kg|3|4
+002086|balloonFlightTrainLength|double|BALLOON FLIGHT TRAIN LENGTH|m|1|0|10|m|1|4
+002087|parachuteSurfaceArea|double|PARACHUTE SURFACE AREA|m2|4|0|15|m2|4|5
+002088|volumeOfGasUsedInBalloon|double|VOLUME OF GAS USED IN BALLOON|m3|3|0|13|m3|3|4
+002090|instrumentWavelength|double|INSTRUMENT WAVELENGTH|m|9|0|16|m|9|5
+002091|entrySensor4Or20Ma|double|ENTRY SENSOR 4/20 MA|A|4|0|10|A|4|3
+002092|ozoneProfileComputationMethod|table|OZONE PROFILE COMPUTATION METHOD|CODE TABLE|0|0|3|CODE TABLE|0|1
+002095|pressureSensorType|table|TYPE OF PRESSURE SENSOR|CODE TABLE|0|0|5|CODE TABLE|0|2
+002096|temperatureSensorType|table|TYPE OF TEMPERATURE SENSOR|CODE TABLE|0|0|5|CODE TABLE|0|2
+002097|humiditySensorType|table|TYPE OF HUMIDITY SENSOR|CODE TABLE|0|0|5|CODE TABLE|0|2
+002099|polarization|table|POLARIZATION|CODE TABLE|0|0|3|CODE TABLE|0|1
+002100|radarConstant|double|RADAR CONSTANT|dB|1|0|12|dB|1|4
+002101|antennaType|table|TYPE OF ANTENNA|CODE TABLE|0|0|4|CODE TABLE|0|2
+002102|antennaHeightAboveTowerBase|long|ANTENNA HEIGHT ABOVE TOWER BASE|m|0|0|8|m|0|3
+002103|radome|flag|RADOME|FLAG TABLE|0|0|2|FLAG TABLE|0|1
+002104|antennaPolarization|table|ANTENNA POLARIZATION|CODE TABLE|0|0|4|CODE TABLE|0|2
+002105|maximumAntennaGain|long|MAXIMUM ANTENNA GAIN|dB|0|0|6|dB|0|2
+002106|3DbBeamwidth|double|3-DB BEAMWIDTH|deg|1|0|6|deg|1|2
+002107|sidelobeSuppression|long|SIDELOBE SUPPRESSION|dB|0|0|6|dB|0|2
+002108|crosspolDiscriminationOnAxis|long|CROSSPOL DISCRIMINATION (ON AXIS)|dB|0|0|6|dB|0|2
+002109|antennaSpeedAzimuth|double|ANTENNA SPEED (AZIMUTH)|deg/s|2|0|12|deg/s|2|4
+002110|antennaSpeedElevation|double|ANTENNA SPEED (ELEVATION)|deg/s|2|0|12|deg/s|2|4
+002111|radarIncidenceAngle|double|RADAR INCIDENCE ANGLE|deg|1|0|10|deg|1|4
+002112|radarLookAngle|double|RADAR LOOK ANGLE|deg|1|0|12|deg|1|4
+002113|numberOfAzimuthLooks|long|NUMBER OF AZIMUTH LOOKS|Numeric|0|0|4|Numeric|0|2
+002114|antennaEffectiveSurfaceArea|long|ANTENNA EFFECTIVE SURFACE AREA|m2|0|0|15|m2|0|5
+002115|surfaceObservingEquipmentType|table|TYPE OF SURFACE OBSERVING EQUIPMENT|CODE TABLE|0|0|5|CODE TABLE|0|2
+002116|percentageOf320MhzBandProcessed|long|PERCENTAGE OF 320 MHZ BAND PROCESSED|%|0|0|7|%|0|3
+002117|percentageOf80MhzBandProcessed|long|PERCENTAGE OF 80 MHZ BAND PROCESSED|%|0|0|7|%|0|3
+002118|percentageOf20MhzBandProcessed|long|PERCENTAGE OF 20 MHZ BAND PROCESSED|%|0|0|7|%|0|3
+002119|ra2InstrumentOperations|table|RA-2 INSTRUMENT OPERATIONS|CODE TABLE|0|0|3|CODE TABLE|0|1
+002120|oceanWaveFrequency|double|OCEAN WAVE FREQUENCY|Hz|3|0|10|Hz|3|4
+002121|meanFrequency|long|MEAN FREQUENCY|Hz|-8|0|7|Hz|-8|3
+002122|frequencyAgilityRange|long|FREQUENCY AGILITY RANGE|Hz|-6|-128|8|Hz|-6|3
+002123|peakPower|long|PEAK POWER|W|-4|0|7|W|-4|3
+002124|averagePower|long|AVERAGE POWER|W|-1|0|7|W|-1|3
+002125|pulseRepetitionFrequency|long|PULSE REPETITION FREQUENCY|Hz|-1|0|8|Hz|-1|3
+002126|pulseWidth|double|PULSE WIDTH|s|7|0|6|s|7|2
+002127|receiverIntermediateFrequency|long|RECEIVER INTERMEDIATE FREQUENCY|Hz|-6|0|7|Hz|-6|3
+002128|intermediateFrequencyBandwidth|long|INTERMEDIATE FREQUENCY BANDWIDTH|Hz|-5|0|6|Hz|-5|2
+002129|minimumDetectableSignal|long|MINIMUM DETECTABLE SIGNAL|dB|0|-150|5|dB|0|3
+002130|dynamicRange|long|DYNAMIC RANGE|dB|0|0|7|dB|0|3
+002131|sensitivityTimeControl|flag|SENSITIVITY TIME CONTROL (STC)|FLAG TABLE|0|0|2|FLAG TABLE|0|1
+002132|azimuthPointingAccuracy|double|AZIMUTH POINTING ACCURACY|deg|2|0|6|deg|2|2
+002133|elevationPointingAccuracy|double|ELEVATION POINTING ACCURACY|deg|2|0|6|deg|2|2
+002134|antennaBeamAzimuth|double|ANTENNA BEAM AZIMUTH|deg|2|0|16|deg|2|5
+002135|antennaElevation|double|ANTENNA ELEVATION|deg|2|-9000|15|deg|2|5
+002136|rangeProcessedByRangeAttenuationCorrection|long|RANGE PROCESSED BY RANGE ATTENUATION CORRECTION|m|-3|0|16|m|-3|5
+002137|radarDualPrfRatio|table|RADAR DUAL PRF RATIO|CODE TABLE|0|0|4|CODE TABLE|0|2
+002138|antennaRotationDirection|table|ANTENNA ROTATION DIRECTION|CODE TABLE|0|0|2|CODE TABLE|0|1
+002139|siralInstrumentConfiguration|table|SIRAL INSTRUMENT CONFIGURATION|CODE TABLE|0|0|2|CODE TABLE|0|1
+002140|satelliteRadarBeamAzimuthAngle|long|SATELLITE RADAR BEAM AZIMUTH ANGLE|deg|0|0|9|deg|0|3
+002141|measurementType|string|MEASUREMENT TYPE|CCITT IA5|0|0|24|Character|0|3
+002142|ozoneInstrument|string|OZONE INSTRUMENT SERIAL NUMBER/IDENTIFICATION|CCITT IA5|0|0|32|Character|0|4
+002143|ozoneInstrumentType|table|OZONE INSTRUMENT TYPE|CODE TABLE|0|0|7|CODE TABLE|0|3
+002144|lightSourceTypeForBrewerSpectrophotometer|table|LIGHT SOURCE TYPE FOR BREWER SPECTROPHOTOMETER|CODE TABLE|0|0|4|CODE TABLE|0|2
+002145|wavelengthSettingForDobsonInstruments|table|WAVELENGTH SETTING FOR DOBSON INSTRUMENTS|CODE TABLE|0|0|4|CODE TABLE|0|2
+002146|sourceConditionsForDobsonInstruments|table|SOURCE CONDITIONS FOR DOBSON INSTRUMENTS|CODE TABLE|0|0|4|CODE TABLE|0|2
+002147|methodOfTransmissionToCollectionCentre|table|METHOD OF TRANSMISSION TO COLLECTION CENTRE|CODE TABLE|0|0|6|CODE TABLE|0|2
+002148|dataCollectionLocationSystem|table|DATA COLLECTION AND/OR LOCATION SYSTEM|CODE TABLE|0|0|5|CODE TABLE|0|2
+002149|dataBuoyType|table|TYPE OF DATA BUOY|CODE TABLE|0|0|6|CODE TABLE|0|2
+002150|tovsOrAtovsOrAvhrrInstrumentationChannelNumber|table|TOVS/ATOVS/AVHRR INSTRUMENTATION CHANNEL NUMBER|CODE TABLE|0|0|6|CODE TABLE|0|2
+002151|radiometerIdentifier|table|RADIOMETER IDENTIFIER|CODE TABLE|0|0|11|CODE TABLE|0|4
+002152|satelliteInstrumentUsedInDataProcessing|flag|SATELLITE INSTRUMENT USED IN DATA PROCESSING|FLAG TABLE|0|0|31|FLAG TABLE|0|10
+002153|satelliteChannelCentreFrequency|long|SATELLITE CHANNEL CENTRE FREQUENCY|Hz|-8|0|26|Hz|-8|8
+002154|satelliteChannelBandWidth|long|SATELLITE CHANNEL BAND WIDTH|Hz|-8|0|26|Hz|-8|8
+002155|satelliteChannelWavelength|double|SATELLITE CHANNEL WAVELENGTH|m|9|0|16|m|9|5
+002156|percentageOfValidKuOceanRetrackerMeasurements|long|PERCENTAGE OF VALID KU OCEAN RETRACKER MEASUREMENTS|%|0|0|7|%|0|3
+002157|percentageOfValidSOceanRetrackerMeasurements|long|PERCENTAGE OF VALID S OCEAN RETRACKER MEASUREMENTS|%|0|0|7|%|0|3
+002158|ra2Instrument|flag|RA-2 INSTRUMENT|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+002159|mwrInstrument|flag|MWR INSTRUMENT|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+002160|radarWaveLength|table|WAVELENGTH OF THE RADAR|CODE TABLE|0|0|4|CODE TABLE|0|2
+002161|windProcessingMethod|flag|WIND PROCESSING METHOD|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+002162|extendedHeightAssignmentMethod|table|EXTENDED HEIGHT ASSIGNMENT METHOD|CODE TABLE|0|0|6|CODE TABLE|0|2
+002163|heightAssignmentMethod|table|HEIGHT ASSIGNMENT METHOD|CODE TABLE|0|0|4|CODE TABLE|0|2
+002164|tracerCorrelationMethod|table|TRACER CORRELATION METHOD|CODE TABLE|0|0|3|CODE TABLE|0|1
+002165|radianceTypeFlags|flag|RADIANCE TYPE FLAGS|FLAG TABLE|0|0|15|FLAG TABLE|0|5
+002166|radianceType|table|RADIANCE TYPE|CODE TABLE|0|0|4|CODE TABLE|0|2
+002167|radianceComputationalMethod|table|RADIANCE COMPUTATIONAL METHOD|CODE TABLE|0|0|4|CODE TABLE|0|2
+002168|hydrostaticPressureOfLowerEndOfCableThermistorString|long|HYDROSTATIC PRESSURE OF LOWER END OF CABLE (THERMISTOR STRING)|Pa|-3|0|16|kPa|0|5
+002169|anemometerType|table|ANEMOMETER TYPE|CODE TABLE|0|0|4|CODE TABLE|0|2
+002170|aircraftHumiditySensors|table|AIRCRAFT HUMIDITY SENSORS|CODE TABLE|0|0|6|CODE TABLE|0|2
+002171|instrumentSerialNumberForWaterTemperatureProfile|string|INSTRUMENT SERIAL NUMBER FOR WATER TEMPERATURE PROFILE MEASUREMENT|CCITT IA5|0|0|64|Character|0|8
+002172|productTypeForRetrievedAtmosphericGases|table|PRODUCT TYPE FOR RETRIEVED ATMOSPHERIC GASES|CODE TABLE|0|0|8|CODE TABLE|0|3
+002173|squareOfOffNadirAngle|double|SQUARE OF THE OFF-NADIR ANGLE|deg2|4|0|10|deg2|4|4
+002174|meanAcrossTrackPixelNumber|long|MEAN ACROSS TRACK PIXEL NUMBER|Numeric|0|0|9|Numeric|0|3
+002175|methodOfPrecipitationMeasurement|table|METHOD OF PRECIPITATION MEASUREMENT|CODE TABLE|0|0|4|CODE TABLE|0|2
+002176|methodOfStateOfGroundMeasurement|table|METHOD OF STATE OF GROUND MEASUREMENT|CODE TABLE|0|0|4|CODE TABLE|0|2
+002177|methodOfSnowDepthMeasurement|table|METHOD OF SNOW DEPTH MEASUREMENT|CODE TABLE|0|0|4|CODE TABLE|0|2
+002178|methodOfLiquidContentMeasurementOfPrecipitation|table|METHOD OF LIQUID CONTENT MEASUREMENT OF PRECIPITATION|CODE TABLE|0|0|4|CODE TABLE|0|2
+002179|skyConditionAlgorithmType|table|TYPE OF SKY CONDITION ALGORITHM|CODE TABLE|0|0|4|CODE TABLE|0|2
+002180|mainPresentWeatherDetectingSystem|table|MAIN PRESENT WEATHER DETECTING SYSTEM|CODE TABLE|0|0|4|CODE TABLE|0|2
+002181|supplementaryPresentWeatherSensor|flag|SUPPLEMENTARY PRESENT WEATHER SENSOR|FLAG TABLE|0|0|21|FLAG TABLE|0|7
+002182|visibilityMeasurementSystem|table|VISIBILITY MEASUREMENT SYSTEM|CODE TABLE|0|0|4|CODE TABLE|0|2
+002183|cloudDetectionSystem|table|CLOUD DETECTION SYSTEM|CODE TABLE|0|0|4|CODE TABLE|0|2
+002184|lightningDetectionSensorType|table|TYPE OF LIGHTNING DETECTION SENSOR|CODE TABLE|0|0|4|CODE TABLE|0|2
+002185|methodOfEvaporationMeasurement|table|METHOD OF EVAPORATION MEASUREMENT|CODE TABLE|0|0|4|CODE TABLE|0|2
+002186|capabilityToDetectPrecipitationPhenomena|flag|CAPABILITY TO DETECT PRECIPITATION PHENOMENA|FLAG TABLE|0|0|30|FLAG TABLE|0|10
+002187|capabilityToDetectOtherWeatherPhenomena|flag|CAPABILITY TO DETECT OTHER WEATHER PHENOMENA|FLAG TABLE|0|0|18|FLAG TABLE|0|6
+002188|capabilityToDetectObscuration|flag|CAPABILITY TO DETECT OBSCURATION|FLAG TABLE|0|0|21|FLAG TABLE|0|7
+002189|capabilityToDiscriminateLightningStrikes|flag|CAPABILITY TO DISCRIMINATE LIGHTNING STRIKES|FLAG TABLE|0|0|12|FLAG TABLE|0|4
+002190|lagrangianDrifterSubmergenceTimeSubmerged|long|LAGRANGIAN DRIFTER SUBMERGENCE (% TIME SUBMERGED)|%|0|0|7|%|0|3
+002191|geopotentialHeightCalculation|table|GEOPOTENTIAL HEIGHT CALCULATION|CODE TABLE|0|0|4|CODE TABLE|0|2
+003001|surfaceStationType|table|SURFACE STATION TYPE|CODE TABLE|0|0|5|CODE TABLE|0|2
+003003|thermometerOrHygrometerHousing|table|THERMOMETER/HYGROMETER HOUSING|CODE TABLE|0|0|4|CODE TABLE|0|2
+003004|typeOfScreenOrShelterOrRadiationShield|table|TYPE OF SCREEN/SHELTER/RADIATION SHIELD|CODE TABLE|0|0|4|CODE TABLE|0|2
+003005|horizontalWidthOfScreenOrShieldX|double|HORIZONTAL WIDTH OF SCREEN OR SHIELD (X)|m|3|0|16|m|3|5
+003006|horizontalDepthOfScreenOrShieldY|double|HORIZONTAL DEPTH OF SCREEN OR SHIELD (Y)|m|3|0|16|m|3|5
+003007|verticalHeightOfScreenOrShieldZ|double|VERTICAL HEIGHT OF SCREEN OR SHIELD (Z)|m|3|0|16|m|3|5
+003008|artificiallyVentilatedScreenOrShield|table|ARTIFICIALLY VENTILATED SCREEN OR SHIELD|CODE TABLE|0|0|3|CODE TABLE|0|1
+003009|amountOfForcedVentilationAtTimeOfReading|double|AMOUNT OF FORCED VENTILATION AT TIME OF READING|m/s|1|0|9|m/s|1|3
+003010|methodOfSeaOrWaterCurrentMeasurement|table|METHOD OF SEA/WATER CURRENT MEASUREMENT|CODE TABLE|0|0|4|CODE TABLE|0|2
+003011|methodOfDepthCalculation|table|METHOD OF DEPTH CALCULATION|CODE TABLE|0|0|2|CODE TABLE|0|1
+003012|instrumentTypeOrSensorForDissolvedOxygenMeasurement|table|INSTRUMENT TYPE/SENSOR FOR DISSOLVED OXYGEN MEASUREMENT|CODE TABLE|0|0|4|CODE TABLE|0|2
+003016|positionOfRoadSensors|table|POSITION OF ROAD SENSORS|CODE TABLE|0|0|4|CODE TABLE|0|2
+003017|extendedTypeOfStation|flag|EXTENDED TYPE OF STATION|FLAG TABLE|0|0|6|FLAG TABLE|0|2
+003018|typeOfRoad|table|TYPE OF ROAD|CODE TABLE|0|0|5|CODE TABLE|0|2
+003019|typeOfConstruction|table|TYPE OF CONSTRUCTION|CODE TABLE|0|0|4|CODE TABLE|0|2
+003020|materialForThermometerOrHygrometerHousing|table|MATERIAL FOR THERMOMETER/HYGROMETER HOUSING|CODE TABLE|0|0|3|CODE TABLE|0|1
+003021|hygrometerHeating|table|HYGROMETER HEATING|CODE TABLE|0|0|2|CODE TABLE|0|1
+003022|instrumentOwner|table|INSTRUMENT OWNER|CODE TABLE|0|0|3|CODE TABLE|0|1
+003023|configurationOfLouversForThermometerOrHygrometerScreen|table|CONFIGURATION OF LOUVERS FOR THERMOMETER/HYGROMETER SCREEN|CODE TABLE|0|0|3|CODE TABLE|0|1
+003024|psychrometricCoefficient|double|PSYCHROMETRIC COEFFICIENT|K-1|6|0|10|K-1|6|3
+003025|crossTrackEstimationAreaSize|long|CROSS-TRACK ESTIMATION AREA SIZE|m|0|5000|16|m|0|5
+003026|alongTrackEstimationAreaSize|long|ALONG-TRACK ESTIMATION AREA SIZE|m|0|5000|16|m|0|5
+003027|typeOfFlightRig|table|TYPE OF FLIGHT RIG|CODE TABLE|0|0|4|CODE TABLE|0|2
+003028|methodOfSnowWaterEquivalentMeasurement|table|METHOD OF SNOW WATER EQUIVALENT MEASUREMENT|CODE TABLE|0|0|6|CODE TABLE|0|2
+003029|swath|table|SWATH|CODE TABLE|0|0|3|CODE TABLE|0|1
+003030|antennaStatus|table|ANTENNA STATUS|CODE TABLE|0|0|3|CODE TABLE|0|1
+003031|channelBandwidthFullWidthHalfMaximum|double|CHANNEL BANDWIDTH, FULL WIDTH HALF MAXIMUM (FWHM)|m|11|0|16|m|11|13
+003032|channelCentreFrequency|long|CHANNEL CENTRE FREQUENCY|Hz|-6|0|26|Hz|-6|10
+003033|channelBandWidth|long|CHANNEL BAND WIDTH|Hz|-6|0|26|Hz|-6|10
+003034|channelWavelength|double|CHANNEL WAVELENGTH|m|9|0|16|m|9|5
+004001|year|long|YEAR|a|0|0|12|a|0|4
+004002|month|long|MONTH|mon|0|0|4|mon|0|2
+004003|day|long|DAY|d|0|0|6|d|0|2
+004004|hour|long|HOUR|h|0|0|5|h|0|2
+004005|minute|long|MINUTE|min|0|0|6|min|0|2
+004006|second|long|SECOND|s|0|0|6|s|0|2
+004007|secondsWithinAMinuteMicrosecond|double|SECONDS WITHIN A MINUTE (MICROSECOND ACCURACY)|s|6|0|26|s|6|8
+004011|timeIncrement|long|TIME INCREMENT|a|0|-1024|11|a|0|4
+004012|timeIncrement|long|TIME INCREMENT|mon|0|-1024|11|mon|0|4
+004013|timeIncrement|long|TIME INCREMENT|d|0|-1024|11|d|0|4
+004014|timeIncrement|long|TIME INCREMENT|h|0|-1024|11|h|0|4
+004015|timeIncrement|long|TIME INCREMENT|min|0|-2048|12|min|0|4
+004016|timeIncrement|long|TIME INCREMENT|s|0|-4096|13|s|0|4
+004017|referenceTimePeriodForAccumulatedOrExtremeData|long|REFERENCE TIME PERIOD FOR ACCUMULATED OR EXTREME DATA|min|0|-1440|12|min|0|4
+004021|timePeriod|long|TIME PERIOD OR DISPLACEMENT|a|0|-1024|11|a|0|4
+004022|timePeriod|long|TIME PERIOD OR DISPLACEMENT|mon|0|-1024|11|mon|0|4
+004023|timePeriod|long|TIME PERIOD OR DISPLACEMENT|d|0|-1024|11|d|0|4
+004024|timePeriod|long|TIME PERIOD OR DISPLACEMENT|h|0|-2048|12|h|0|4
+004025|timePeriod|long|TIME PERIOD OR DISPLACEMENT|min|0|-2048|12|min|0|4
+004026|timePeriod|long|TIME PERIOD OR DISPLACEMENT|s|0|-4096|13|s|0|4
+004031|durationOfTimeRelatingToFollowingValue|long|DURATION OF TIME RELATING TO FOLLOWING VALUE|h|0|0|8|h|0|3
+004032|durationOfTimeRelatingToFollowingValue|long|DURATION OF TIME RELATING TO FOLLOWING VALUE|min|0|0|6|min|0|2
+004041|timeDifferenceUtcLmt|long|TIME DIFFERENCE, UTC - LMT|min|0|-1440|12|min|0|4
+004043|dayOfYear|long|DAY OF THE YEAR|d|0|0|9|d|0|3
+004051|principalTimeOfDailyReadingOfMaximumTemperature|long|PRINCIPAL TIME OF DAILY READING OF MAXIMUM TEMPERATURE|h|0|0|5|h|0|2
+004052|principalTimeOfDailyReadingOfMinimumTemperature|long|PRINCIPAL TIME OF DAILY READING OF MINIMUM TEMPERATURE|h|0|0|5|h|0|2
+004053|numberOfDaysWithPrecipitationEqualToOrMoreThan1Mm|long|NUMBER OF DAYS WITH PRECIPITATION EQUAL TO OR MORE THAN 1 MM|Numeric|0|0|6|Numeric|0|2
+004059|timesOfObservationUsedToComputeReportedMeanValues|flag|TIMES OF OBSERVATION USED TO COMPUTE THE REPORTED MEAN VALUES|FLAG TABLE|0|0|6|FLAG TABLE|0|2
+004065|timeIncrement|long|SHORT TIME INCREMENT|min|0|-128|8|min|0|2
+004066|timeIncrement|long|SHORT TIME INCREMENT|s|0|-128|8|s|0|2
+004073|timePeriod|long|SHORT TIME PERIOD OR DISPLACEMENT|d|0|-128|8|d|0|2
+004074|timePeriod|long|SHORT TIME PERIOD OR DISPLACEMENT|h|0|-128|8|h|0|2
+004075|timePeriod|long|SHORT TIME PERIOD OR DISPLACEMENT|min|0|-128|8|min|0|2
+004080|averagingPeriodForFollowingValue|table|AVERAGING PERIOD FOR FOLLOWING VALUE|CODE TABLE|0|0|4|CODE TABLE|0|2
+004086|timePeriod|long|LONG TIME PERIOD OR DISPLACEMENT|s|0|-8192|15|s|0|5
+005001|latitude|double|LATITUDE (HIGH ACCURACY)|deg|5|-9000000|25|deg|5|7
+005002|latitude|double|LATITUDE (COARSE ACCURACY)|deg|2|-9000|15|deg|2|4
+005011|latitudeIncrement|double|LATITUDE INCREMENT (HIGH ACCURACY)|deg|5|-9000000|25|deg|5|7
+005012|latitudeIncrement|double|LATITUDE INCREMENT (COARSE ACCURACY)|deg|2|-9000|15|deg|2|4
+005015|latitudeDisplacement|double|LATITUDE DISPLACEMENT (HIGH ACCURACY)|deg|5|-9000000|25|deg|5|7
+005016|latitudeDisplacement|double|LATITUDE DISPLACEMENT (COARSE ACCURACY)|deg|2|-9000|15|deg|2|4
+005021|bearingOrAzimuth|double|BEARING OR AZIMUTH|deg|2|0|16|deg|2|5
+005022|solarAzimuth|double|SOLAR AZIMUTH|deg|2|0|16|deg|2|5
+005023|sunToSatelliteAzimuthDifference|double|SUN TO SATELLITE AZIMUTH DIFFERENCE|deg|1|-1800|12|deg|1|4
+005030|directionSpectral|long|DIRECTION (SPECTRAL)|deg|0|0|12|deg|0|4
+005031|rowNumber|long|ROW NUMBER|Numeric|0|0|12|Numeric|0|4
+005032|yOffset|double|Y OFFSET|m|2|-1073741824|31|m|2|11
+005033|pixelSizeOnHorizontal1|long|PIXEL SIZE ON HORIZONTAL - 1|m|-1|0|16|m|-1|5
+005034|alongTrackRowNumber|long|ALONG TRACK ROW NUMBER|Numeric|0|0|11|Numeric|0|4
+005035|xDimensionMaximumSize|long|MAXIMUM SIZE OF X-DIMENSION|Numeric|0|0|12|Numeric|0|4
+005036|shipTransectNumberAccordingToSoop|long|SHIP TRANSECT NUMBER ACCORDING TO SOOP|Numeric|0|0|7|Numeric|0|2
+005040|orbitNumber|long|ORBIT NUMBER|Numeric|0|0|24|Numeric|0|8
+005041|scanLineNumber|long|SCAN LINE NUMBER|Numeric|0|0|8|Numeric|0|3
+005042|channelNumber|long|CHANNEL NUMBER|Numeric|0|0|6|Numeric|0|2
+005043|fieldOfViewNumber|long|FIELD OF VIEW NUMBER|Numeric|0|0|8|Numeric|0|3
+005044|satelliteCycleNumber|long|SATELLITE CYCLE NUMBER|Numeric|0|0|11|Numeric|0|4
+005045|fieldOfRegardNumber|long|FIELD OF REGARD NUMBER|Numeric|0|0|8|Numeric|0|3
+005052|channelNumberIncrement|long|CHANNEL NUMBER INCREMENT|Numeric|0|0|5|Numeric|0|2
+005053|fieldOfViewNumberIncrement|long|FIELD OF VIEW NUMBER INCREMENT|Numeric|0|0|5|Numeric|0|2
+005060|yAngularPositionFromCentreOfGravity|double|Y ANGULAR POSITION FROM CENTRE OF GRAVITY|deg|6|-8000000|24|deg|6|8
+005061|zAngularPositionFromCentreOfGravity|double|Z ANGULAR POSITION FROM CENTRE OF GRAVITY|deg|6|-8000000|24|deg|6|8
+005063|spacecraftRoll|double|SPACECRAFT ROLL|deg|2|0|16|deg|2|5
+005064|spacecraftPitch|double|SPACECRAFT PITCH|deg|2|0|16|deg|2|5
+005066|spacecraftYaw|double|SPACECRAFT YAW|deg|2|0|16|deg|2|5
+005067|numberOfScanLines|long|NUMBER OF SCAN LINES|Numeric|0|0|8|Numeric|0|3
+005068|profileNumber|long|PROFILE NUMBER|Numeric|0|0|16|Numeric|0|5
+005069|receiverChannel|table|RECEIVER CHANNEL|CODE TABLE|0|0|2|CODE TABLE|0|1
+005070|observationIdentifier|long|OBSERVATION IDENTIFIER|Numeric|0|0|30|Numeric|0|10
+005071|stripmapIdentifier|long|STRIPMAP IDENTIFIER|Numeric|0|0|16|Numeric|0|5
+005072|numberOfSpectraInRangeDirection|long|NUMBER OF SPECTRA IN RANGE DIRECTION|Numeric|0|0|8|Numeric|0|3
+005073|numberOfSpectraInAzimuthalDirection|long|NUMBER OF SPECTRA IN AZIMUTHAL DIRECTION|Numeric|0|0|8|Numeric|0|3
+005074|indexInRangeDirection|long|INDEX IN RANGE DIRECTION|Numeric|0|0|8|Numeric|0|3
+005075|indexInAzimuthalDirection|long|INDEX IN AZIMUTHAL DIRECTION|Numeric|0|0|8|Numeric|0|3
+005076|solarAzimuthInInstrumentReferenceFrame|double|SOLAR AZIMUTH IN INSTRUMENT REFERENCE FRAME|deg|2|0|16|deg|2|6
+005077|subSatellitePointLatitude|double|SUB-SATELLITE POINT LATITUDE|deg|4|-900000|21|deg|4|7
+005078|hornNumber|long|HORN NUMBER|Numeric|0|0|4|Numeric|0|2
+005079|bandNumber|long|BAND NUMBER|Numeric|0|0|6|Numeric|0|2
+005080|resolutionRadius|long|RESOLUTION RADIUS|m|-3|0|6|m|-3|2
+006001|longitude|double|LONGITUDE (HIGH ACCURACY)|deg|5|-18000000|26|deg|5|8
+006002|longitude|double|LONGITUDE (COARSE ACCURACY)|deg|2|-18000|16|deg|2|5
+006011|longitudeIncrement|double|LONGITUDE INCREMENT (HIGH ACCURACY)|deg|5|-18000000|26|deg|5|8
+006012|longitudeIncrement|double|LONGITUDE INCREMENT (COARSE ACCURACY)|deg|2|-18000|16|deg|2|5
+006015|longitudeDisplacement|double|LONGITUDE DISPLACEMENT (HIGH ACCURACY)|deg|5|-18000000|26|deg|5|8
+006016|longitudeDisplacement|double|LONGITUDE DISPLACEMENT (COARSE ACCURACY)|deg|2|-18000|16|deg|2|5
+006021|distance|long|DISTANCE|m|-1|0|13|m|-1|4
+006029|waveNumber|double|WAVE NUMBER|/m|1|0|22|/m|1|7
+006030|waveNumberSpectral|double|WAVE NUMBER (SPECTRAL)|rad/m|5|0|13|rad/m|5|4
+006031|columnNumber|long|COLUMN NUMBER|Numeric|0|0|12|Numeric|0|4
+006032|xOffset|double|X OFFSET|m|2|-1073741824|31|m|2|11
+006033|pixelSizeOnHorizontal2|long|PIXEL SIZE ON HORIZONTAL - 2|m|-1|0|16|m|-1|5
+006034|crossTrackCellNumber|long|CROSS-TRACK CELL NUMBER|Numeric|0|0|7|Numeric|0|3
+006035|yDimensionMaximumSize|long|MAXIMUM SIZE OF Y-DIMENSION|Numeric|0|0|12|Numeric|0|4
+006040|radiusOfConfidence|long|RADIUS OF CONFIDENCE|m|0|0|13|m|0|4
+006041|earthScanSampleNumber|long|EARTH SCAN SAMPLE NUMBER|Numeric|0|0|11|Numeric|0|4
+006042|spaceOrMoonScanSampleNumber|long|SPACE/MOON SCAN SAMPLE NUMBER|Numeric|0|0|6|Numeric|0|2
+006043|subSatellitePointLongitude|double|SUB-SATELLITE POINT LONGITUDE|deg|4|-1800000|22|deg|4|8
+007001|heightOfStation|long|HEIGHT OF STATION|m|0|-400|15|m|0|5
+007002|height|long|HEIGHT OR ALTITUDE|m|-1|-40|16|m|-1|5
+007003|geopotential|long|GEOPOTENTIAL|m2 s-2|-1|-400|17|m2 s-2|-1|6
+007004|pressure|long|PRESSURE|Pa|-1|0|14|Pa|-1|5
+007005|heightIncrement|long|HEIGHT INCREMENT|m|0|-400|12|m|0|4
+007006|heightAboveStation|long|HEIGHT ABOVE STATION|m|0|0|15|m|0|5
+007007|height|long|HEIGHT|m|0|-1000|17|m|0|6
+007008|geopotential|long|GEOPOTENTIAL|m2 s-2|0|-10000|20|m2 s-2|0|7
+007009|geopotentialHeight|long|GEOPOTENTIAL HEIGHT|gpm|0|-1000|17|gpm|0|5
+007010|flightLevel|long|FLIGHT LEVEL|m|0|-1024|16|ft|-1|5
+007012|gridPointAltitude|double|GRID POINT ALTITUDE|m|2|-50000|20|m|2|7
+007021|elevation|double|ELEVATION|deg|2|-9000|15|deg|2|5
+007022|solarElevation|double|SOLAR ELEVATION|deg|2|-9000|15|deg|2|5
+007024|satelliteZenithAngle|double|SATELLITE ZENITH ANGLE|deg|2|-9000|15|deg|2|5
+007025|solarZenithAngle|double|SOLAR ZENITH ANGLE|deg|2|-9000|15|deg|2|5
+007026|satelliteZenithAngle|double|SATELLITE ZENITH ANGLE|deg|4|-900000|21|deg|4|7
+007030|heightOfStationGroundAboveMeanSeaLevel|double|HEIGHT OF STATION GROUND ABOVE MEAN SEA LEVEL|m|1|-4000|17|m|1|5
+007031|heightOfBarometerAboveMeanSeaLevel|double|HEIGHT OF BAROMETER ABOVE MEAN SEA LEVEL|m|1|-4000|17|m|1|5
+007032|heightOfSensorAboveLocalGroundOrDeckOfMarinePlatform|double|HEIGHT OF SENSOR ABOVE LOCAL GROUND (OR DECK OF MARINE PLATFORM)|m|2|0|16|m|2|5
+007033|heightOfSensorAboveWaterSurface|double|HEIGHT OF SENSOR ABOVE WATER SURFACE|m|1|0|12|m|1|4
+007035|zDimensionMaximumSize|long|MAXIMUM SIZE OF Z-DIMENSION|Numeric|0|0|12|Numeric|0|4
+007036|levelIndexOfZ|long|LEVEL INDEX OF Z|Numeric|0|0|12|Numeric|0|4
+007040|impactParameter|double|IMPACT PARAMETER|m|1|62000000|22|m|1|8
+007061|depthBelowLandSurface|double|DEPTH BELOW LAND SURFACE|m|2|0|14|m|2|5
+007062|depthBelowWaterSurface|double|DEPTH BELOW SEA/WATER SURFACE|m|1|0|17|m|1|6
+007063|depthBelowWaterSurface|double|DEPTH BELOW SEA/WATER SURFACE (CM)|m|2|0|20|m|2|7
+007064|representativeHeightOfSensorAboveStation|long|REPRESENTATIVE HEIGHT OF SENSOR ABOVE STATION|m|0|0|4|m|0|2
+007065|waterPressure|long|WATER PRESSURE|Pa|-3|0|17|Pa|-3|6
+007070|drogueDepth|long|DROGUE DEPTH|m|0|0|10|m|0|4
+007071|height|double|HEIGHT (HIGH RESOLUTION)|m|3|-10000000|26|m|3|8
+007072|scanAngle|double|SCAN ANGLE|deg|2|-9000|15|deg|2|6
+007073|angleBetweenMoonAndSpaceView|double|ANGLE BETWEEN MOON AND SPACE VIEW|deg|2|0|15|deg|2|5
+007074|solarElevationAngleInInstrumentReferenceFrame|double|SOLAR ELEVATION ANGLE IN INSTRUMENT REFERENCE FRAME|deg|2|-9000|15|deg|2|5
+007075|scatteringAngle|long|SCATTERING ANGLE|deg|0|0|8|deg|0|3
+007076|relativeAzimuthAngle|long|RELATIVE AZIMUTH ANGLE|deg|0|0|8|deg|0|3
+008001|verticalSoundingSignificance|flag|VERTICAL SOUNDING SIGNIFICANCE|FLAG TABLE|0|0|7|FLAG TABLE|0|3
+008002|verticalSignificanceSurfaceObservations|table|VERTICAL SIGNIFICANCE (SURFACE OBSERVATIONS)|CODE TABLE|0|0|6|CODE TABLE|0|2
+008003|verticalSignificanceSatelliteObservations|table|VERTICAL SIGNIFICANCE (SATELLITE OBSERVATIONS)|CODE TABLE|0|0|6|CODE TABLE|0|2
+008004|phaseOfAircraftFlight|table|PHASE OF AIRCRAFT FLIGHT|CODE TABLE|0|0|3|CODE TABLE|0|1
+008005|meteorologicalAttributeSignificance|table|METEOROLOGICAL ATTRIBUTE SIGNIFICANCE|CODE TABLE|0|0|4|CODE TABLE|0|2
+008006|ozoneVerticalSoundingSignificance|flag|OZONE VERTICAL SOUNDING SIGNIFICANCE|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+008007|dimensionalSignificance|table|DIMENSIONAL SIGNIFICANCE|CODE TABLE|0|0|4|CODE TABLE|0|2
+008008|radiationVerticalSoundingSignificance|flag|RADIATION VERTICAL SOUNDING SIGNIFICANCE|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+008009|detailedPhaseOfFlight|table|DETAILED PHASE OF FLIGHT|CODE TABLE|0|0|4|CODE TABLE|0|2
+008010|surfaceQualifierForTemperatureData|table|SURFACE QUALIFIER (TEMPERATURE DATA)|CODE TABLE|0|0|5|CODE TABLE|0|2
+008011|meteorologicalFeature|table|METEOROLOGICAL FEATURE|CODE TABLE|0|0|6|CODE TABLE|0|2
+008012|landOrSeaQualifier|table|LAND/SEA QUALIFIER|CODE TABLE|0|0|2|CODE TABLE|0|1
+008013|dayOrNightQualifier|table|DAY/NIGHT QUALIFIER|CODE TABLE|0|0|2|CODE TABLE|0|1
+008014|qualifierForRunwayVisualRange|table|QUALIFIER FOR RUNWAY VISUAL RANGE|CODE TABLE|0|0|4|CODE TABLE|0|2
+008015|significantQualifierForSensor|table|SIGNIFICANT QUALIFIER FOR SENSOR|CODE TABLE|0|0|3|CODE TABLE|0|1
+008016|changeQualifierOfATrendTypeForecastOrAnAerodromeForecast|table|CHANGE QUALIFIER OF A TREND-TYPE FORECAST OR AN AERODROME FORECAST|CODE TABLE|0|0|3|CODE TABLE|0|1
+008017|qualifierOfTimeWhenForecastChangeExpected|table|QUALIFIER OF THE TIME WHEN THE FORECAST CHANGE IS EXPECTED|CODE TABLE|0|0|2|CODE TABLE|0|1
+008018|seawindsLandOrIceSurfaceType|flag|SEAWINDS LAND/ICE SURFACE TYPE|FLAG TABLE|0|0|17|FLAG TABLE|0|6
+008019|qualifierForFollowingCentreIdentifier|table|QUALIFIER FOR FOLLOWING CENTRE IDENTIFIER|CODE TABLE|0|0|4|CODE TABLE|0|2
+008020|totalNumberOfMissingEntitiesWithRespectToAccumulationOrAverage|long|TOTAL NUMBER OF MISSING ENTITIES (WITH RESPECT TO ACCUMULATION OR AVERAGE)|Numeric|0|0|16|Numeric|0|5
+008021|timeSignificance|table|TIME SIGNIFICANCE|CODE TABLE|0|0|5|CODE TABLE|0|2
+008022|totalNumberWithRespectToAccumulationOrAverage|long|TOTAL NUMBER (WITH RESPECT TO ACCUMULATION OR AVERAGE)|Numeric|0|0|16|Numeric|0|5
+008023|firstOrderStatistics|table|FIRST-ORDER STATISTICS|CODE TABLE|0|0|6|CODE TABLE|0|2
+008024|differenceStatistics|table|DIFFERENCE STATISTICS|CODE TABLE|0|0|6|CODE TABLE|0|2
+008025|timeDifferenceQualifier|table|TIME DIFFERENCE QUALIFIER|CODE TABLE|0|0|4|CODE TABLE|0|2
+008026|matrixSignificance|table|MATRIX SIGNIFICANCE|CODE TABLE|0|0|6|CODE TABLE|0|2
+008029|surfaceType|table|SURFACE TYPE|CODE TABLE|0|0|8|CODE TABLE|0|3
+008030|manualOnCodesVolumeI1SectionCCodeTableFromWhichDataAreDerived|long|MANUAL ON CODES (VOLUME I.1, SECTION C) CODE TABLE FROM WHICH DATA ARE DERIVED|Numeric|0|0|13|Numeric|0|4
+008031|dataCategoryCrexTableA|long|DATA CATEGORY - CREX TABLE A|Numeric|0|0|8|Numeric|0|3
+008032|statusOfOperation|table|STATUS OF OPERATION|CODE TABLE|0|0|4|CODE TABLE|0|2
+008033|methodOfDerivationOfPercentageConfidence|table|METHOD OF DERIVATION OF PERCENTAGE CONFIDENCE|CODE TABLE|0|0|7|CODE TABLE|0|3
+008034|temperatureOrSalinityMeasurementQualifier|table|TEMPERATURE/SALINITY MEASUREMENT QUALIFIER|CODE TABLE|0|0|4|CODE TABLE|0|2
+008035|monitoringExerciseType|table|TYPE OF MONITORING EXERCISE|CODE TABLE|0|0|3|CODE TABLE|0|1
+008036|typeOfCentreOrStationPerformingMonitoring|table|TYPE OF CENTRE OR STATION PERFORMING MONITORING|CODE TABLE|0|0|3|CODE TABLE|0|1
+008037|baselineCheckSignificance|table|BASELINE CHECK SIGNIFICANCE|CODE TABLE|0|0|5|CODE TABLE|0|2
+008038|instrumentDataSignificance|table|INSTRUMENT DATA SIGNIFICANCE|CODE TABLE|0|0|8|CODE TABLE|0|3
+008039|timeSignificanceAviationForecast|table|TIME SIGNIFICANCE (AVIATION FORECAST)|CODE TABLE|0|0|6|CODE TABLE|0|2
+008040|flightLevelSignificance|table|FLIGHT LEVEL SIGNIFICANCE|CODE TABLE|0|0|6|CODE TABLE|0|2
+008041|dataSignificance|table|DATA SIGNIFICANCE|CODE TABLE|0|0|5|CODE TABLE|0|2
+008042|extendedVerticalSoundingSignificance|flag|EXTENDED VERTICAL SOUNDING SIGNIFICANCE|FLAG TABLE|0|0|18|FLAG TABLE|0|6
+008043|atmosphericChemical|table|ATMOSPHERIC CHEMICAL OR PHYSICAL CONSTITUENT TYPE|CODE TABLE|0|0|8|CODE TABLE|0|3
+008044|casRegistryNumber|string|CAS REGISTRY NUMBER|CCITT IA5|0|0|88|Character|0|11
+008045|characterOfParticulateMatter|table|CHARACTER OF PARTICULATE MATTER|CODE TABLE|0|0|8|Character|0|2
+008046|atmosphericChemical|table|ATMOSPHERIC CHEMICAL OR PHYSICAL CONSTITUENT TYPE|Common CODE TABLE C-14|0|0|16|Common CODE TABLE C-14|0|5
+008049|numberOfObservations|long|NUMBER OF OBSERVATIONS|Numeric|0|0|8|Numeric|0|3
+008050|qualifierForNumberOfMissingValuesInCalculationOfStatistic|table|QUALIFIER FOR NUMBER OF MISSING VALUES IN CALCULATION OF STATISTIC|CODE TABLE|0|0|4|CODE TABLE|0|2
+008051|qualifierForNumberOfMissingValuesInCalculationOfStatistic|table|QUALIFIER FOR NUMBER OF MISSING VALUES IN CALCULATION OF STATISTIC|CODE TABLE|0|0|3|CODE TABLE|0|1
+008052|conditionForWhichNumberOfDaysOfOccurrenceFollows|table|CONDITION FOR WHICH NUMBER OF DAYS OF OCCURRENCE FOLLOWS|CODE TABLE|0|0|5|CODE TABLE|0|2
+008053|dayOfOccurrenceQualifier|table|DAY OF OCCURRENCE QUALIFIER|CODE TABLE|0|0|2|CODE TABLE|0|1
+008054|qualifierForWindSpeedOrWindGusts|table|QUALIFIER FOR WIND SPEED OR WIND GUSTS|CODE TABLE|0|0|3|CODE TABLE|0|1
+008055|methodUsedToCalculateTheAverageWindComponentsAfterRemovingVortex|table|METHOD USED TO CALCULATE THE AVERAGE WIND COMPONENTS AFTER REMOVING VORTEX|CODE TABLE|0|0|4|NA|0|0
+008060|sampleScanningModeSignificance|table|SAMPLE SCANNING MODE SIGNIFICANCE|CODE TABLE|0|0|4|CODE TABLE|0|2
+008065|sunGlintIndicator|table|SUN-GLINT INDICATOR|CODE TABLE|0|0|2|CODE TABLE|0|1
+008066|semiTransparencyIndicator|table|SEMI-TRANSPARENCY INDICATOR|CODE TABLE|0|0|2|CODE TABLE|0|1
+008070|verticalSoundingProductQualifier|table|VERTICAL SOUNDING PRODUCT QUALIFIER|CODE TABLE|0|0|4|CODE TABLE|0|2
+008071|typeOfCostEstimation|table|TYPE OF COST ESTIMATION|CODE TABLE|0|0|3|CODE TABLE|0|1
+008072|pixelType|table|PIXEL(S) TYPE|CODE TABLE|0|0|3|CODE TABLE|0|1
+008074|altimeterEchoType|table|ALTIMETER ECHO TYPE|CODE TABLE|0|0|2|CODE TABLE|0|1
+008075|orbitQualifier|table|ASCENDING/DESCENDING ORBIT QUALIFIER|CODE TABLE|0|0|2|CODE TABLE|0|1
+008076|band|table|TYPE OF BAND|CODE TABLE|0|0|6|CODE TABLE|0|2
+008077|radiometerSensedSurfaceType|table|RADIOMETER SENSED SURFACE TYPE|CODE TABLE|0|0|7|CODE TABLE|0|3
+008079|productStatus|table|PRODUCT STATUS|CODE TABLE|0|0|4|CODE TABLE|0|2
+008080|qualifierForGtsppQualityFlag|table|QUALIFIER FOR GTSPP QUALITY FLAG|CODE TABLE|0|0|6|CODE TABLE|0|2
+008081|equipmentType|table|TYPE OF EQUIPMENT|CODE TABLE|0|0|6|CODE TABLE|0|2
+008082|modificationOfSensorHeightToAnotherValue|table|MODIFICATION OF SENSOR HEIGHT TO ANOTHER VALUE|CODE TABLE|0|0|3|CODE TABLE|0|1
+008083|nominalValueIndicator|flag|NOMINAL VALUE INDICATOR|FLAG TABLE|0|0|15|FLAG TABLE|0|5
+008085|beamIdentifier|table|BEAM IDENTIFIER|CODE TABLE|0|0|3|CODE TABLE|0|1
+008086|verticalSignificanceForNwp|flag|VERTICAL SIGNIFICANCE FOR NWP|FLAG TABLE|0|0|12|FLAG TABLE|0|4
+008087|cornerPositionOfObservation|table|CORNER POSITION OF OBSERVATION|CODE TABLE|0|0|3|CODE TABLE|0|1
+008088|mapSignificance|table|MAP SIGNIFICANCE|CODE TABLE|0|0|6|CODE TABLE|0|2
+008090|decimalScaleOfFollowingSignificands|long|DECIMAL SCALE OF FOLLOWING SIGNIFICANDS|Numeric|0|-127|8|Numeric|0|3
+008091|coordinatesSignificance|table|COORDINATES SIGNIFICANCE|CODE TABLE|0|0|8|CODE TABLE|0|3
+008092|measurementUncertaintyExpression|table|MEASUREMENT UNCERTAINTY EXPRESSION|CODE TABLE|0|0|5|CODE TABLE|0|2
+008093|measurementUncertaintySignificance|table|MEASUREMENT UNCERTAINTY SIGNIFICANCE|CODE TABLE|0|0|5|CODE TABLE|0|2
+008094|methodUsedToCalculateTheAverageDailyTemperature|table|METHOD USED TO CALCULATE THE AVERAGE DAILY TEMPERATURE|CODE TABLE|0|0|8|CODE TABLE|0|3
+008095|sitingAndMeasurementQualityClassificationForTemperature|table|SITING AND MEASUREMENT QUALITY CLASSIFICATION FOR TEMPERATURE|CODE TABLE|0|0|8|CODE TABLE|0|3
+008096|sitingAndMeasurementQualityClassificationForPrecipitation|table|SITING AND MEASUREMENT QUALITY CLASSIFICATION FOR PRECIPITATION|CODE TABLE|0|0|8|CODE TABLE|0|3
+008097|methodUsedToCalculateTheAverageInstrumentTemperature|table|METHOD USED TO CALCULATE THE AVERAGE INSTRUMENT TEMPERATURE|CODE TABLE|0|0|7|CODE TABLE|0|3
+008098|sourceOfTemperatureMeasurement|table|SOURCE OF TEMPERATURE MEASUREMENT|CODE TABLE|0|0|4|CODE TABLE|0|2
+008099|sensingDirection|table|SENSING DIRECTION|CODE TABLE|0|0|4|CODE TABLE|0|2
+010001|heightOfLandSurface|long|HEIGHT OF LAND SURFACE|m|0|-400|15|m|0|5
+010002|nonCoordinateHeight|long|HEIGHT|m|-1|-40|16|m|-1|5
+010003|nonCoordinateGeopotential|long|GEOPOTENTIAL|m2 s-2|-1|-400|17|m2 s-2|-1|6
+010004|nonCoordinatePressure|long|PRESSURE|Pa|-1|0|14|Pa|-1|5
+010007|nonCoordinateHeight|long|HEIGHT|m|0|-1000|17|m|0|6
+010008|nonCoordinateGeopotential|long|GEOPOTENTIAL|m2 s-2|0|-10000|20|m2 s-2|0|7
+010009|nonCoordinateGeopotentialHeight|long|GEOPOTENTIAL HEIGHT|gpm|0|-1000|17|gpm|0|5
+010010|minimumPressureReducedToMeanSeaLevel|long|MINIMUM PRESSURE REDUCED TO MEAN SEA LEVEL|Pa|-1|0|14|Pa|-1|5
+010011|maximumPressureReducedToMeanSeaLevel|long|MAXIMUM PRESSURE REDUCED TO MEAN SEA LEVEL|Pa|-1|0|14|Pa|-1|5
+010031|DistanceFromEarthCentreInDirectionOfNorthPole|double|IN DIRECTION OF THE NORTH POLE, DISTANCE FROM THE EARTH'S CENTRE|m|2|-1073741824|31|m|2|10
+010032|satelliteDistanceToEarthCentre|double|SATELLITE DISTANCE TO EARTH'S CENTRE|m|1|0|27|m|2|9
+010033|altitudePlatformToEllipsoid|double|ALTITUDE (PLATFORM TO ELLIPSOID)|m|1|0|27|m|2|9
+010034|earthRadius|double|EARTH'S RADIUS|m|1|0|27|m|2|9
+010035|earthLocalRadiusOfCurvature|double|EARTH'S LOCAL RADIUS OF CURVATURE|m|1|62000000|22|m|1|8
+010036|geoidUndulation|double|GEOID UNDULATION|m|2|-15000|15|m|2|6
+010038|maximumHeightOfDeckCargoAboveSummerLoadLine|long|MAXIMUM HEIGHT OF DECK CARGO ABOVE SUMMER LOAD LINE|m|0|0|6|m|0|2
+010039|departureOfReferenceLevelSummerMaximumLoadLineFromActualSeaLevel|long|DEPARTURE OF REFERENCE LEVEL (SUMMER MAXIMUM LOAD LINE) FROM ACTUAL SEA LEVEL|m|0|-32|6|m|0|3
+010040|numberOfRetrievedLayers|long|NUMBER OF RETRIEVED LAYERS|Numeric|0|0|10|Numeric|0|4
+010050|standardDeviationAltitude|double|STANDARD DEVIATION ALTITUDE|m|2|0|16|m|2|5
+010051|pressureReducedToMeanSeaLevel|long|PRESSURE REDUCED TO MEAN SEA LEVEL|Pa|-1|0|14|Pa|-1|5
+010052|altimeterSettingQnh|long|ALTIMETER SETTING (QNH)|Pa|-1|0|14|Pa|-1|5
+010053|globalNavigationSatelliteSystemAltitude|long|GLOBAL NAVIGATION SATELLITE SYSTEM ALTITUDE|m|0|-1000|17|m|0|5
+010060|pressureChange|long|PRESSURE CHANGE|Pa|-1|-1024|11|Pa|-1|4
+010061|3HourPressureChange|long|3-HOUR PRESSURE CHANGE|Pa|-1|-500|10|Pa|-1|4
+010062|24HourPressureChange|long|24-HOUR PRESSURE CHANGE|Pa|-1|-1000|11|Pa|-1|4
+010063|characteristicOfPressureTendency|table|CHARACTERISTIC OF PRESSURE TENDENCY|CODE TABLE|0|0|4|CODE TABLE|0|2
+010064|sigmetCruisingLevel|table|SIGMET CRUISING LEVEL|CODE TABLE|0|0|3|CODE TABLE|0|1
+010070|indicatedAircraftAltitude|long|INDICATED AIRCRAFT ALTITUDE|m|0|-400|16|m|0|5
+010071|verticalResolution|long|VERTICAL RESOLUTION|m|0|0|14|m|0|5
+010073|heightOfPlume|double|HEIGHT OF PLUME|m|2|0|21|m|2|7
+010079|offNadirAngleOfTheSatelliteFromPlatformData|double|OFF-NADIR ANGLE OF THE SATELLITE FROM PLATFORM DATA|deg|4|0|16|deg|4|5
+010080|viewingZenithAngle|double|VIEWING ZENITH ANGLE|deg|2|-9000|15|deg|2|5
+010081|cogAltitudeAboveReferenceEllipsoid|double|ALTITUDE OF COG ABOVE REFERENCE ELLIPSOID|m|3|0|31|m|3|10
+010082|instantaneousAltitudeRate|double|INSTANTANEOUS ALTITUDE RATE|m/s|3|-65536|17|m/s|3|6
+010083|squaredOffNadirAngleOfSatelliteFromPlatformData|double|SQUARED OFF-NADIR ANGLE OF THE SATELLITE FROM PLATFORM DATA|deg2|2|0|16|deg2|2|5
+010084|squaredOffNadirAngleOfSatelliteFromWaveformData|double|SQUARED OFF-NADIR ANGLE OF THE SATELLITE FROM WAVEFORM DATA|deg2|2|0|16|deg2|2|5
+010085|meanSeaSurfaceHeight|double|MEAN SEA-SURFACE HEIGHT|m|3|-131072|18|m|3|6
+010086|geoidHeight|double|GEOID'S HEIGHT|m|3|-131072|18|m|3|6
+010087|oceanDepthOrLandElevation|double|OCEAN DEPTH/LAND ELEVATION|m|1|-131072|18|m|1|6
+010088|totalGeocentricOceanTideHeightSolution1|double|TOTAL GEOCENTRIC OCEAN TIDE HEIGHT (SOLUTION 1)|m|3|-32768|16|m|3|5
+010089|totalGeocentricOceanTideHeightSolution2|double|TOTAL GEOCENTRIC OCEAN TIDE HEIGHT (SOLUTION 2)|m|3|-32768|16|m|3|5
+010090|longPeriodTideHeight|double|LONG PERIOD TIDE HEIGHT|m|3|-32768|16|m|3|5
+010091|tidalLoadingHeight|double|TIDAL LOADING HEIGHT|m|3|-32768|16|m|3|5
+010092|solidEarthTideHeight|double|SOLID EARTH TIDE HEIGHT|m|3|-32768|16|m|3|5
+010093|geocentricPoleTideHeight|double|GEOCENTRIC POLE TIDE HEIGHT|m|3|-32768|16|m|3|5
+010095|heightOfAtmosphere|long|HEIGHT OF ATMOSPHERE USED|m|0|0|16|m|0|5
+010096|meanDynamicTopography|double|MEAN DYNAMIC TOPOGRAPHY|m|3|-131072|18|m|3|6
+010097|meanSeaSurfaceHeightFromAltimeterOnly|double|MEAN SEA-SURFACE HEIGHT FROM ALTIMETER ONLY|m|3|-131072|18|m|3|6
+010098|loadingTideHeightGeocentricOceanTideSolution1|double|LOADING TIDE HEIGHT GEOCENTRIC OCEAN TIDE SOLUTION 1|m|4|-2000|12|m|4|4
+010099|loadingTideHeightGeocentricOceanTideSolution2|double|LOADING TIDE HEIGHT GEOCENTRIC OCEAN TIDE SOLUTION 2|m|4|-2000|12|m|4|4
+010100|nonEquilibriumLongPeriodTideHeight|double|NON-EQUILIBRIUM LONG PERIOD TIDE HEIGHT|m|4|-2000|12|m|4|4
+010101|squaredOffNadirAngleOfSatelliteFromWaveformData|double|SQUARED OFF-NADIR ANGLE OF THE SATELLITE FROM WAVEFORM DATA|deg2|2|-32768|16|deg2|2|5
+010102|seaSurfaceHeightAnomaly|double|SEA-SURFACE HEIGHT ANOMALY|m|3|-32768|16|m|3|5
+010103|meanDynamicTopographyAccuracy|double|MEAN DYNAMIC TOPOGRAPHY ACCURACY|m|3|-131072|18|m|3|6
+011001|windDirection|long|WIND DIRECTION|deg|0|0|9|deg|0|3
+011002|windSpeed|double|WIND SPEED|m/s|1|0|12|m/s|1|4
+011003|u|double|U-COMPONENT|m/s|1|-4096|13|m/s|1|4
+011004|v|double|V-COMPONENT|m/s|1|-4096|13|m/s|1|4
+011005|w|double|W-COMPONENT|Pa/s|1|-512|10|Pa/s|1|4
+011006|w|double|W-COMPONENT|m/s|2|-4096|13|m/s|2|4
+011007|relativeWindDirectionInDegreesOffBow|long|RELATIVE WIND DIRECTION (IN DEGREES OFF BOW)|deg|0|0|9|deg|0|3
+011008|relativeWindSpeed|double|RELATIVE WIND SPEED|m/s|1|0|12|m/s|1|4
+011010|windDirectionAssociatedWithWindSpeedWhichFollows|long|WIND DIRECTION ASSOCIATED WITH WIND SPEED WHICH FOLLOWS|deg|0|0|9|deg|0|3
+011011|windDirectionAt10M|long|WIND DIRECTION AT 10 M|deg|0|0|9|deg|0|3
+011012|windSpeedAt10M|double|WIND SPEED AT 10 M|m/s|1|0|12|m/s|1|4
+011013|windDirectionAt5M|long|WIND DIRECTION AT 5 M|deg|0|0|9|deg|0|3
+011014|windSpeedAt5M|double|WIND SPEED AT 5 M|m/s|1|0|12|m/s|1|4
+011016|extremeCounterclockwiseWindDirectionOfAVariableWind|long|EXTREME COUNTERCLOCKWISE WIND DIRECTION OF A VARIABLE WIND|deg|0|0|9|deg|0|3
+011017|extremeClockwiseWindDirectionOfAVariableWind|long|EXTREME CLOCKWISE WIND DIRECTION OF A VARIABLE WIND|deg|0|0|9|deg|0|3
+011019|steadinessOfWind|long|STEADINESS OF WIND|%|0|0|7|%|0|3
+011021|relativeVorticity|double|RELATIVE VORTICITY|/s|9|-65536|17|/s|9|6
+011022|divergence|double|DIVERGENCE|/s|9|-65536|17|/s|9|6
+011023|velocityPotential|long|VELOCITY POTENTIAL|m2/s|-2|-65536|17|m2/s|-2|6
+011024|averageUComponentAfterTheVortexRemoval|double|AVERAGE U-COMPONENT AFTER THE VORTEX REMOVAL|m/s|1|-4096|13|m/s|0|0
+011025|averageVComponentAfterTheVortexRemoval|double|AVERAGE V-COMPONENT AFTER THE VORTEX REMOVAL|m/s|1|-4096|13|m/s|0|0
+011030|extendedDegreeOfTurbulence|table|EXTENDED DEGREE OF TURBULENCE|CODE TABLE|0|0|6|CODE TABLE|0|2
+011031|degreeOfTurbulence|table|DEGREE OF TURBULENCE|CODE TABLE|0|0|4|CODE TABLE|0|2
+011032|heightOfBaseOfTurbulence|long|HEIGHT OF BASE OF TURBULENCE|m|-1|-40|16|m|-1|5
+011033|heightOfTopOfTurbulence|long|HEIGHT OF TOP OF TURBULENCE|m|-1|-40|16|m|-1|5
+011034|verticalGustVelocity|double|VERTICAL GUST VELOCITY|m/s|1|-1024|11|m/s|1|4
+011035|verticalGustAcceleration|double|VERTICAL GUST ACCELERATION|m s-2|2|-8192|14|m s-2|2|5
+011036|maximumDerivedEquivalentVerticalGustSpeed|double|MAXIMUM DERIVED EQUIVALENT VERTICAL GUST SPEED|m/s|1|0|10|m/s|1|4
+011037|turbulenceIndex|table|TURBULENCE INDEX|CODE TABLE|0|0|6|CODE TABLE|0|2
+011038|timeOfOccurrenceOfPeakEddyDissipationRate|table|TIME OF OCCURRENCE OF PEAK EDDY DISSIPATION RATE|CODE TABLE|0|0|5|CODE TABLE|0|2
+011039|extendedTimeOfOccurrenceOfPeakEddyDissipationRate|table|EXTENDED TIME OF OCCURRENCE OF PEAK EDDY DISSIPATION RATE|CODE TABLE|0|0|6|CODE TABLE|0|2
+011040|maximumWindSpeedMeanWind|double|MAXIMUM WIND SPEED (MEAN WIND)|m/s|1|0|12|m/s|1|4
+011041|maximumWindGustSpeed|double|MAXIMUM WIND GUST SPEED|m/s|1|0|12|m/s|1|4
+011042|maximumWindSpeed10MinuteMeanWind|double|MAXIMUM WIND SPEED (10-MINUTE MEAN WIND)|m/s|1|0|12|m/s|1|4
+011043|maximumWindGustDirection|long|MAXIMUM WIND GUST DIRECTION|deg|0|0|9|deg|0|3
+011044|meanWindDirectionForSurfaceTo1500M|long|MEAN WIND DIRECTION FOR SURFACE - 1 500 M (5 000 FEET)|deg|0|0|9|deg|0|3
+011045|meanWindSpeedForSurfaceTo1500M|double|MEAN WIND SPEED FOR SURFACE - 1 500 M (5 000 FEET)|m/s|1|0|12|m/s|1|4
+011046|maximumInstantaneousWindSpeed|double|MAXIMUM INSTANTANEOUS WIND SPEED|m/s|1|0|12|m/s|1|4
+011047|maximumInstantaneousWindSpeedOver10Minutes|double|MAXIMUM INSTANTANEOUS WIND SPEED OVER 10 MINUTES|m/s|1|0|12|m/s|1|4
+011049|windDirectionStandardDeviation|long|STANDARD DEVIATION OF WIND DIRECTION|deg|0|0|9|deg|0|3
+011050|standardDeviationOfHorizontalWindSpeed|double|STANDARD DEVIATION OF HORIZONTAL WIND SPEED|m/s|1|0|12|m/s|1|4
+011051|standardDeviationOfVerticalWindSpeed|double|STANDARD DEVIATION OF VERTICAL WIND SPEED|m/s|1|0|8|m/s|1|3
+011052|formalUncertaintyInWindSpeed|double|FORMAL UNCERTAINTY IN WIND SPEED|m/s|2|0|13|m/s|2|5
+011053|formalUncertaintyInWindDirection|double|FORMAL UNCERTAINTY IN WIND DIRECTION|deg|2|0|15|deg|2|5
+011054|meanWindDirectionFor1500To3000M|long|MEAN WIND DIRECTION FOR 1 500 - 3 000 M|deg|0|0|9|deg|0|3
+011055|meanWindSpeedFor1500To3000M|double|MEAN WIND SPEED FOR 1 500 - 3 000 M|m/s|1|0|12|m/s|1|4
+011061|absoluteWindShearIn1KmLayerBelow|double|ABSOLUTE WIND SHEAR IN 1 KM LAYER BELOW|m/s|1|0|12|m/s|1|4
+011062|absoluteWindShearIn1KmLayerAbove|double|ABSOLUTE WIND SHEAR IN 1 KM LAYER ABOVE|m/s|1|0|12|m/s|1|4
+011070|designatorOfRunwayAffectedByWindShearIncludingAll|string|DESIGNATOR OF THE RUNWAY AFFECTED BY WIND SHEAR (INCLUDING ALL)|CCITT IA5|0|0|32|Character|0|4
+011071|turbulentVerticalMomentumFlux|double|TURBULENT VERTICAL MOMENTUM FLUX|m2 s-2|3|-128|14|m2 s-2|3|5
+011072|turbulentVerticalBuoyancyFlux|double|TURBULENT VERTICAL BUOYANCY FLUX|K m s-1|3|-128|11|K m s-1|3|4
+011073|turbulentKineticEnergy|double|TURBULENT KINETIC ENERGY|m2 s-2|2|-1024|13|m2 s-2|2|4
+011074|dissipationEnergy|double|DISSIPATION ENERGY|m2 s-2|2|-1024|10|m2 s-2|2|4
+011075|meanTurbulenceIntensityEddyDissipationRate|double|MEAN TURBULENCE INTENSITY (EDDY DISSIPATION RATE)|m2/3 s-1|2|0|8|m2/3 s-1|2|3
+011076|peakTurbulenceIntensityEddyDissipationRate|double|PEAK TURBULENCE INTENSITY (EDDY DISSIPATION RATE)|m2/3 s-1|2|0|8|m2/3 s-1|2|3
+011077|reportingIntervalOrAveragingTimeForEddyDissipationRate|long|REPORTING INTERVAL OR AVERAGING TIME FOR EDDY DISSIPATION RATE|s|0|0|12|s|0|4
+011081|modelWindDirectionAt10M|double|MODEL WIND DIRECTION AT 10 M|deg|2|0|16|deg|2|5
+011082|modelWindSpeedAt10M|double|MODEL WIND SPEED AT 10 M|m/s|2|0|14|m/s|2|4
+011083|windSpeed|long|WIND SPEED|km/h|0|0|9|km/h|0|3
+011084|windSpeed|long|WIND SPEED|kt|0|0|8|kt|0|3
+011085|maximumWindGustSpeed|long|MAXIMUM WIND GUST SPEED|km/h|0|0|9|km/h|0|3
+011086|maximumWindGustSpeed|long|MAXIMUM WIND GUST SPEED|kt|0|0|8|kt|0|3
+011095|u|double|U-COMPONENT OF THE MODEL WIND VECTOR|m/s|1|-4096|13|m/s|1|4
+011096|v|double|V-COMPONENT OF THE MODEL WIND VECTOR|m/s|1|-4096|13|m/s|1|4
+011097|windSpeedFromAltimeter|double|WIND SPEED FROM ALTIMETER|m/s|2|0|12|m/s|2|4
+011098|windSpeedFromRadiometer|double|WIND SPEED FROM RADIOMETER|m/s|2|0|12|m/s|2|4
+011100|aircraftTrueAirspeed|double|AIRCRAFT TRUE AIRSPEED|m/s|1|0|12|m/s|1|4
+011101|aircraftGroundSpeedUComponent|double|AIRCRAFT GROUND SPEED U-COMPONENT|m/s|1|-4096|13|m/s|1|4
+011102|aircraftGroundSpeedVComponent|double|AIRCRAFT GROUND SPEED V-COMPONENT|m/s|1|-4096|13|m/s|1|4
+011103|aircraftGroundSpeedWComponent|double|AIRCRAFT GROUND SPEED W-COMPONENT|m/s|1|-512|10|m/s|1|3
+011104|aircraftTrueHeading|long|TRUE HEADING OF AIRCRAFT, SHIP OR OTHER MOBILE PLATFORM|deg|0|0|9|deg|0|3
+011105|edrAlgorithmVersion|long|EDR ALGORITHM VERSION|Numeric|0|0|6|Numeric|0|2
+011106|runningMinimumConfidence|long|RUNNING MINIMUM CONFIDENCE|Numeric|1|0|4|Numeric|1|2
+011107|maximumNumberBadInputs|long|MAXIMUM NUMBER BAD INPUTS|Numeric|0|0|5|Numeric|0|2
+011108|peakLocation|long|PEAK LOCATION|Numeric|1|0|4|Numeric|1|2
+011109|numberOfGoodEdr|long|NUMBER OF GOOD EDR|Numeric|0|0|4|Numeric|0|2
+011110|uncertaintyInUComponent|double|UNCERTAINTY IN U-COMPONENT|m/s|1|-4096|13|m/s|1|4
+011111|uncertaintyInVComponent|double|UNCERTAINTY IN V-COMPONENT|m/s|1|-4096|13|m/s|1|4
+011112|uncertaintyInWComponent|double|UNCERTAINTY IN W-COMPONENT|m/s|2|-4096|13|m/s|2|4
+011113|trackingCorrelationOfVector|long|TRACKING CORRELATION OF VECTOR|Numeric|3|-1000|12|Numeric|3|4
+012001|airTemperature|double|TEMPERATURE/AIR TEMPERATURE|K|1|0|12|C|1|3
+012002|wetBulbTemperature|double|WET-BULB TEMPERATURE|K|1|0|12|C|1|3
+012003|dewpointTemperature|double|DEWPOINT TEMPERATURE|K|1|0|12|C|1|3
+012004|airTemperatureAt2M|double|AIR TEMPERATURE AT 2 M|K|1|0|12|C|1|3
+012005|wetBulbTemperatureAt2M|double|WET-BULB TEMPERATURE AT 2 M|K|1|0|12|C|1|3
+012006|dewpointTemperatureAt2M|double|DEWPOINT TEMPERATURE AT 2 M|K|1|0|12|C|1|3
+012007|virtualTemperature|double|VIRTUAL TEMPERATURE|K|1|0|12|C|1|3
+012008|uncertaintyInVirtualTemperature|double|UNCERTAINTY IN VIRTUAL TEMPERATURE|K|1|0|12|C|1|4
+012011|maximumTemperatureAtHeightAndOverPeriodSpecified|double|MAXIMUM TEMPERATURE, AT HEIGHT AND OVER PERIOD SPECIFIED|K|1|0|12|C|1|3
+012012|minimumTemperatureAtHeightAndOverPeriodSpecified|double|MINIMUM TEMPERATURE, AT HEIGHT AND OVER PERIOD SPECIFIED|K|1|0|12|C|1|3
+012013|groundMinimumTemperaturePast12Hours|double|GROUND MINIMUM TEMPERATURE, PAST 12 HOURS|K|1|0|12|C|1|3
+012014|maximumTemperatureAt2MPast12Hours|double|MAXIMUM TEMPERATURE AT 2 M, PAST 12 HOURS|K|1|0|12|C|1|3
+012015|minimumTemperatureAt2MPast12Hours|double|MINIMUM TEMPERATURE AT 2 M, PAST 12 HOURS|K|1|0|12|C|1|3
+012016|maximumTemperatureAt2MPast24Hours|double|MAXIMUM TEMPERATURE AT 2 M, PAST 24 HOURS|K|1|0|12|C|1|3
+012017|minimumTemperatureAt2MPast24Hours|double|MINIMUM TEMPERATURE AT 2 M, PAST 24 HOURS|K|1|0|12|C|1|3
+012021|maximumTemperatureAt2M|double|MAXIMUM TEMPERATURE AT 2 M|K|2|0|16|C|2|4
+012022|minimumTemperatureAt2M|double|MINIMUM TEMPERATURE AT 2 M|K|2|0|16|C|2|4
+012023|temperature|long|TEMPERATURE|C|0|-99|8|C|0|2
+012024|dewpointTemperature|long|DEWPOINT TEMPERATURE|C|0|-99|8|C|0|2
+012030|soilTemperature|double|SOIL TEMPERATURE|K|1|0|12|C|1|3
+012049|temperatureChangeOverSpecifiedPeriod|long|TEMPERATURE CHANGE OVER SPECIFIED PERIOD|K|0|-30|6|C|0|2
+012051|standardDeviationTemperature|double|STANDARD DEVIATION TEMPERATURE|K|1|0|10|C|1|3
+012052|highestDailyMeanTemperature|double|HIGHEST DAILY MEAN TEMPERATURE|K|1|0|12|C|1|3
+012053|lowestDailyMeanTemperature|double|LOWEST DAILY MEAN TEMPERATURE|K|1|0|12|C|1|3
+012060|awsEnclosureInternalTemperature|double|AWS ENCLOSURE INTERNAL TEMPERATURE|K|1|0|12|C|1|3
+012061|skinTemperature|double|SKIN TEMPERATURE|K|1|0|12|C|1|3
+012062|equivalentBlackBodyTemperature|double|EQUIVALENT BLACK BODY TEMPERATURE|K|1|0|12|C|1|3
+012063|brightnessTemperature|double|BRIGHTNESS TEMPERATURE|K|1|0|12|C|1|3
+012064|instrumentTemperature|double|INSTRUMENT TEMPERATURE|K|1|0|12|K|1|4
+012065|standardDeviationBrightnessTemperature|double|STANDARD DEVIATION BRIGHTNESS TEMPERATURE|K|1|0|12|K|1|4
+012066|antennaTemperature|double|ANTENNA TEMPERATURE|K|2|0|16|C|2|5
+012070|warmLoadTemperature|double|WARM LOAD TEMPERATURE|K|2|0|16|K|2|5
+012071|coldestClusterTemperature|double|COLDEST CLUSTER TEMPERATURE|K|1|0|12|K|1|4
+012072|radiance|double|RADIANCE|W m-2 sr-1|6|0|31|W m-2 sr-1|6|9
+012075|spectralRadiance|long|SPECTRAL RADIANCE|W m-3 sr-1|-3|0|16|W m-3 sr-1|-3|5
+012076|radiance|double|RADIANCE|W m-2 sr-1|3|0|16|W m-2 sr-1|3|5
+012080|brightnessTemperatureRealPart|double|BRIGHTNESS TEMPERATURE REAL PART|K|2|-10000|16|K|2|5
+012081|brightnessTemperatureImaginaryPart|double|BRIGHTNESS TEMPERATURE IMAGINARY PART|K|2|-10000|16|K|2|5
+012082|pixelRadiometricAccuracy|double|PIXEL RADIOMETRIC ACCURACY|K|2|0|12|K|2|4
+012083|temperatureDifferenceBetweenObservedAndComputed|double|TEMPERATURE DIFFERENCE BETWEEN OBSERVED AND COMPUTED|K|2|-10000|16|K|2|6
+012101|airTemperature|double|TEMPERATURE/AIR TEMPERATURE|K|2|0|16|C|2|4
+012102|wetBulbTemperature|double|WET-BULB TEMPERATURE|K|2|0|16|C|2|4
+012103|dewpointTemperature|double|DEWPOINT TEMPERATURE|K|2|0|16|C|2|4
+012104|airTemperatureAt2M|double|AIR TEMPERATURE AT 2 M|K|2|0|16|C|2|4
+012105|webBulbTemperatureAt2M|double|WEB-BULB TEMPERATURE AT 2 M|K|2|0|16|C|2|4
+012106|dewpointTemperatureAt2M|double|DEWPOINT TEMPERATURE AT 2 M|K|2|0|16|C|2|4
+012107|virtualTemperature|double|VIRTUAL TEMPERATURE|K|2|0|16|C|2|4
+012111|maximumTemperatureAtHeightAndOverPeriodSpecified|double|MAXIMUM TEMPERATURE, AT HEIGHT AND OVER PERIOD SPECIFIED|K|2|0|16|C|2|4
+012112|minimumTemperatureAtHeightAndOverPeriodSpecified|double|MINIMUM TEMPERATURE, AT HEIGHT AND OVER PERIOD SPECIFIED|K|2|0|16|C|2|4
+012113|groundMinimumTemperaturePast12Hours|double|GROUND MINIMUM TEMPERATURE, PAST 12 HOURS|K|2|0|16|C|2|4
+012114|maximumTemperatureAt2MPast12Hours|double|MAXIMUM TEMPERATURE AT 2 M, PAST 12 HOURS|K|2|0|16|C|2|4
+012115|minimumTemperatureAt2MPast12Hours|double|MINIMUM TEMPERATURE AT 2 M, PAST 12 HOURS|K|2|0|16|C|2|4
+012116|maximumTemperatureAt2MPast24Hours|double|MAXIMUM TEMPERATURE AT 2 M, PAST 24 HOURS|K|2|0|16|C|2|4
+012117|minimumTemperatureAt2MPast24Hours|double|MINIMUM TEMPERATURE AT 2 M, PAST 24 HOURS|K|2|0|16|C|2|4
+012118|maximumTemperatureAtHeightSpecifiedPast24Hours|double|MAXIMUM TEMPERATURE AT HEIGHT SPECIFIED, PAST 24 HOURS|K|2|0|16|C|2|4
+012119|minimumTemperatureAtHeightSpecifiedPast24Hours|double|MINIMUM TEMPERATURE AT HEIGHT SPECIFIED, PAST 24 HOURS|K|2|0|16|C|2|4
+012120|groundTemperature|double|GROUND TEMPERATURE|K|2|0|16|C|2|4
+012121|groundMinimumTemperature|double|GROUND MINIMUM TEMPERATURE|K|2|0|16|C|2|4
+012122|groundMinimumTemperatureOfPrecedingNight|double|GROUND MINIMUM TEMPERATURE OF THE PRECEDING NIGHT|K|2|0|16|C|2|4
+012128|roadSurfaceTemperature|double|ROAD SURFACE TEMPERATURE|K|2|0|16|C|2|5
+012129|roadSubSurfaceTemperature|double|ROAD SUBSURFACE TEMPERATURE|K|2|0|16|C|2|5
+012130|soilTemperature|double|SOIL TEMPERATURE|K|2|0|16|C|2|4
+012131|snowTemperature|double|SNOW TEMPERATURE|K|2|0|16|C|2|4
+012132|iceSurfaceTemperature|double|ICE SURFACE TEMPERATURE|K|2|0|16|C|2|4
+012151|dailyMeanTemperatureStandardDeviation|double|STANDARD DEVIATION OF DAILY MEAN TEMPERATURE|K|2|0|12|C|2|4
+012152|highestDailyMeanTemperature|double|HIGHEST DAILY MEAN TEMPERATURE|K|2|0|16|C|2|4
+012153|lowestDailyMeanTemperature|double|LOWEST DAILY MEAN TEMPERATURE|K|2|0|16|C|2|4
+012158|noiseEquivalentDeltaTemperatureWhileViewingColdTarget|double|NOISE-EQUIVALENT DELTA TEMPERATURE WHILE VIEWING COLD TARGET|K|2|0|12|C|2|4
+012159|noiseEquivalentDeltaTemperatureWhileViewingWarmTarget|double|NOISE-EQUIVALENT DELTA TEMPERATURE WHILE VIEWING WARM TARGET|K|2|0|12|C|2|4
+012161|skinTemperature|double|SKIN TEMPERATURE|K|2|0|16|C|2|4
+012162|equivalentBlackBodyTemperature|double|EQUIVALENT BLACK BODY TEMPERATURE|K|2|0|16|C|2|4
+012163|brightnessTemperature|double|BRIGHTNESS TEMPERATURE|K|2|0|16|C|2|4
+012164|instrumentTemperature|double|INSTRUMENT TEMPERATURE|K|2|0|16|K|2|5
+012165|directSunBrightnessTemperature|long|DIRECT SUN BRIGHTNESS TEMPERATURE|K|0|0|23|K|0|7
+012166|snapshotAccuracy|double|SNAPSHOT ACCURACY|K|1|-4000|13|K|1|4
+012167|radiometricAccuracyPurePolarization|double|RADIOMETRIC ACCURACY (PURE POLARIZATION)|K|1|0|9|K|1|3
+012168|radiometricAccuracyCrossPolarization|double|RADIOMETRIC ACCURACY (CROSS POLARIZATION)|K|1|0|9|K|1|3
+012169|brightnessTemperatureDifference|double|BRIGHTNESS TEMPERATURE DIFFERENCE|K|3|-100000|18|K|3|6
+012171|coldestClusterTemperature|double|COLDEST CLUSTER TEMPERATURE|K|2|0|16|K|2|5
+012180|averaged12MicronBtForAllClearPixelsAtNadir|double|AVERAGED 12 MICRON BT FOR ALL CLEAR PIXELS AT NADIR|K|2|0|16|K|2|5
+012181|averaged11MicronBtForAllClearPixelsAtNadir|double|AVERAGED 11 MICRON BT FOR ALL CLEAR PIXELS AT NADIR|K|2|0|16|K|2|5
+012182|averaged37MicronBtForAllClearPixelsAtNadir|double|AVERAGED 3.7 MICRON BT FOR ALL CLEAR PIXELS AT NADIR|K|2|0|16|K|2|5
+012183|averaged12MicronBtForAllClearPixelsForwardView|double|AVERAGED 12 MICRON BT FOR ALL CLEAR PIXELS, FORWARD VIEW|K|2|0|16|K|2|5
+012184|averaged11MicronBtForAllClearPixelsForwardView|double|AVERAGED 11 MICRON BT FOR ALL CLEAR PIXELS, FORWARD VIEW|K|2|0|16|K|2|5
+012185|averaged37MicronBtForAllClearPixelsForwardView|double|AVERAGED 3.7 MICRON BT FOR ALL CLEAR PIXELS, FORWARD VIEW|K|2|0|16|K|2|5
+012186|meanNadirSeaSurfaceTemperature|double|MEAN NADIR SEA-SURFACE TEMPERATURE|K|2|0|16|K|2|5
+012187|meanDualViewSeaSurfaceTemperature|double|MEAN DUAL VIEW SEA-SURFACE TEMPERATURE|K|2|0|16|K|2|5
+012188|interpolated238GhzBrightnessTFromMwr|double|INTERPOLATED 23.8 GHZ BRIGHTNESS T FROM MWR|K|2|0|16|K|2|5
+012189|interpolated365GhzBrightnessTFromMwr|double|INTERPOLATED 36.5 GHZ BRIGHTNESS T FROM MWR|K|2|0|16|K|2|5
+012190|brightnessTemperatureErrorCovariance|double|BRIGHTNESS TEMPERATURE ERROR COVARIANCE|K2|3|-15000|15|K2|3|8
+013001|specificHumidity|double|SPECIFIC HUMIDITY|kg/kg|5|0|14|kg/kg|5|5
+013002|mixingRatio|double|MIXING RATIO|kg/kg|5|0|14|kg/kg|5|5
+013003|relativeHumidity|long|RELATIVE HUMIDITY|%|0|0|7|%|0|3
+013004|vapourPressure|long|VAPOUR PRESSURE|Pa|-1|0|10|Pa|-1|4
+013005|vapourDensity|double|VAPOUR DENSITY|kg m-3|3|0|7|kg m-3|3|3
+013006|mixingHeights|long|MIXING HEIGHTS|m|-1|-40|16|m|-1|5
+013007|minimumRelativeHumidity|long|MINIMUM RELATIVE HUMIDITY|%|0|0|7|%|0|3
+013008|maximumRelativeHumidity|long|MAXIMUM RELATIVE HUMIDITY|%|0|0|7|%|0|3
+013009|relativeHumidity|double|RELATIVE HUMIDITY|%|1|-1000|12|%|1|4
+013011|totalPrecipitationOrTotalWaterEquivalent|double|TOTAL PRECIPITATION/TOTAL WATER EQUIVALENT|kg m-2|1|-1|14|kg m-2|1|5
+013012|depthOfFreshSnow|double|DEPTH OF FRESH SNOW|m|2|-2|12|m|2|4
+013013|totalSnowDepth|double|TOTAL SNOW DEPTH|m|2|-2|16|m|2|5
+013014|rainfallOrWaterEquivalentOfSnowAveragedRate|double|RAINFALL/WATER EQUIVALENT OF SNOW (AVERAGED RATE)|kg m-2 s-1|4|0|12|kg m-2 s-1|4|4
+013015|snowfallAveragedRate|double|SNOWFALL (AVERAGED RATE)|m/s|7|0|12|m/s|7|4
+013016|precipitableWater|long|PRECIPITABLE WATER|kg m-2|0|0|7|kg m-2|0|3
+013019|totalPrecipitationPast1Hour|double|TOTAL PRECIPITATION PAST 1 HOUR|kg m-2|1|-1|14|kg m-2|1|4
+013020|totalPrecipitationPast3Hours|double|TOTAL PRECIPITATION PAST 3 HOURS|kg m-2|1|-1|14|kg m-2|1|5
+013021|totalPrecipitationPast6Hours|double|TOTAL PRECIPITATION PAST 6 HOURS|kg m-2|1|-1|14|kg m-2|1|5
+013022|totalPrecipitationPast12Hours|double|TOTAL PRECIPITATION PAST 12 HOURS|kg m-2|1|-1|14|kg m-2|1|5
+013023|totalPrecipitationPast24Hours|double|TOTAL PRECIPITATION PAST 24 HOURS|kg m-2|1|-1|14|kg m-2|1|5
+013031|evapotranspiration|long|EVAPOTRANSPIRATION|kg m-2|0|0|7|kg m-2|0|3
+013032|evaporation|double|EVAPORATION/EVAPOTRANSPIRATION|kg m-2|1|0|8|kg m-2|1|3
+013033|evaporation|double|EVAPORATION/EVAPOTRANSPIRATION|kg m-2|1|0|10|kg m-2|1|4
+013038|superadiabaticIndicator|table|SUPERADIABATIC INDICATOR|CODE TABLE|0|0|2|CODE TABLE|0|1
+013039|terrainTypeIceOrSnow|table|TERRAIN TYPE (ICE/SNOW)|CODE TABLE|0|0|3|CODE TABLE|0|1
+013040|surfaceFlag|table|SURFACE FLAG|CODE TABLE|0|0|4|CODE TABLE|0|2
+013041|pasquillGiffordStabilityCategory|table|PASQUILL-GIFFORD STABILITY CATEGORY|CODE TABLE|0|0|4|CODE TABLE|0|2
+013042|parcelLiftedIndexTo500Hpa|long|PARCEL LIFTED INDEX (TO 500 HPA)|K|0|-20|6|K|0|2
+013043|bestLiftedIndexTo500Hpa|long|BEST LIFTED INDEX (TO 500 HPA)|K|0|-20|6|K|0|2
+013044|kIndex|long|K INDEX|K|0|-30|8|K|0|3
+013045|koIndex|long|KO INDEX|K|0|-30|8|K|0|3
+013046|maximumBuoyancy|long|MAXIMUM BUOYANCY|K|0|-30|8|K|0|3
+013047|modifiedShowalterStabilityIndex|long|MODIFIED SHOWALTER STABILITY INDEX|K|0|-60|6|C|0|2
+013048|waterFraction|double|WATER FRACTION|%|1|0|10|%|1|4
+013051|frequencyGroupPrecipitation|table|FREQUENCY GROUP, PRECIPITATION|CODE TABLE|0|0|4|CODE TABLE|0|2
+013052|highestDailyAmountOfPrecipitation|double|HIGHEST DAILY AMOUNT OF PRECIPITATION|kg m-2|1|-1|14|kg m-2|1|5
+013055|intensityOfPrecipitation|double|INTENSITY OF PRECIPITATION|kg m-2 s-1|4|0|8|mm/h|1|4
+013056|characterAndIntensityOfPrecipitation|table|CHARACTER AND INTENSITY OF PRECIPITATION|CODE TABLE|0|0|4|CODE TABLE|0|2
+013057|timeOfBeginningOrEndOfPrecipitation|table|TIME OF BEGINNING OR END OF PRECIPITATION|CODE TABLE|0|0|4|CODE TABLE|0|2
+013058|sizeOfPrecipitatingElement|double|SIZE OF PRECIPITATING ELEMENT|m|4|0|7|mm|1|3
+013059|numberOfFlashesThunderstorm|long|NUMBER OF FLASHES (THUNDERSTORM)|Numeric|0|0|7|Numeric|0|3
+013060|totalAccumulatedPrecipitation|double|TOTAL ACCUMULATED PRECIPITATION|kg m-2|1|-1|17|kg m-2|1|5
+013071|upstreamWaterLevel|double|UPSTREAM WATER LEVEL|m|2|0|14|m|2|4
+013072|downstreamWaterLevel|double|DOWNSTREAM WATER LEVEL|m|2|0|14|m|2|4
+013073|maximumWaterLevel|double|MAXIMUM WATER LEVEL|m|2|0|14|m|2|4
+013074|groundWaterLevel|double|GROUND WATER LEVEL|m|2|0|18|m|2|6
+013080|waterPh|double|WATER PH|pH unit|1|0|10|pH unit|1|3
+013081|waterConductivity|double|WATER CONDUCTIVITY|S/m|3|0|14|S/m|3|4
+013082|waterTemperature|double|WATER TEMPERATURE|K|1|0|12|K|1|4
+013083|dissolvedOxygen|double|DISSOLVED OXYGEN|kg m-3|6|0|15|kg m-3|6|5
+013084|turbidity|long|TURBIDITY|lm|0|0|14|lm|0|4
+013085|oxidationReductionPotential|double|OXIDATION REDUCTION POTENTIAL (ORP)|V|3|0|14|V|3|4
+013090|radiometerWaterVapourContent|double|RADIOMETER WATER VAPOUR CONTENT|kg m-2|1|0|10|kg m-2|1|4
+013091|radiometerLiquidContent|double|RADIOMETER LIQUID CONTENT|kg m-2|2|0|8|kg m-2|2|3
+013093|cloudOpticalThickness|long|CLOUD OPTICAL THICKNESS|Numeric|0|0|8|Numeric|0|3
+013094|log10OfCloudOpticalThickness|long|LOG10 OF CLOUD OPTICAL THICKNESS|Numeric|3|-2000|14|Numeric|3|5
+013095|totalColumnWaterVapour|double|TOTAL COLUMN WATER VAPOUR|kg m-2|4|0|19|kg m-2|4|6
+013096|mwrWaterVapourContent|double|MWR WATER VAPOUR CONTENT|kg m-2|2|0|14|kg m-2|2|5
+013097|mwrLiquidWaterContent|double|MWR LIQUID WATER CONTENT|kg m-2|2|0|14|kg m-2|2|5
+013098|integratedWaterVapourDensity|double|INTEGRATED WATER VAPOUR DENSITY|kg m-2|8|0|30|kg m-2|8|10
+013099|log10OfIntegratedCloudParticleDensity|double|LOG10 OF INTEGRATED CLOUD PARTICLE DENSITY|log (m-2)|1|0|7|log (m-2)|1|3
+013100|log10OfIntegratedCloudParticleArea|double|LOG10 OF INTEGRATED CLOUD PARTICLE AREA|log (m2 m-2)|1|-70|7|log (m2 m-2)|1|2
+013101|log10OfIntegratedCloudParticleVolume|double|LOG10 OF INTEGRATED CLOUD PARTICLE VOLUME|log (m3 m-2)|1|-140|7|log (m3 m-2)|1|3
+013109|iceOrLiquidWaterPath|double|ICE/LIQUID WATER PATH|kg m-2|3|0|10|kg m-2|3|4
+013110|massMixingRatio|long|MASS MIXING RATIO|%|0|0|7|%|0|3
+013111|soilMoisture|long|SOIL MOISTURE|g/kg|0|0|10|g/kg|0|4
+013112|objectWetnessDuration|long|OBJECT WETNESS DURATION|s|0|0|17|s|0|5
+013114|rateOfIceAccretion|double|RATE OF ICE ACCRETION|kg m-2 h-1|1|0|11|kg m-2 h-1|1|4
+013115|iceThickness|double|ICE THICKNESS|m|2|0|19|m|2|6
+013116|waterFilmThickness|double|WATER FILM THICKNESS|m|4|0|10|m|3|2
+013117|snowDensityLiquidWaterContent|long|SNOW DENSITY (LIQUID WATER CONTENT)|kg m-3|0|0|10|kg m-3|0|3
+013118|freshSnowDepth|double|DEPTH OF FRESH SNOW (HIGH ACCURACY)|m|3|-2|14|m|3|5
+013155|precipitationIntensityHighAccuracy|double|INTENSITY OF PRECIPITATION (HIGH ACCURACY)|kg m-2 s-1|5|-1|16|mm/h|2|5
+013160|radiometerLiquidContent|double|RADIOMETER LIQUID CONTENT|kg m-2|2|-350|10|kg m-2|2|3
+013162|cloudLiquidWater|double|CLOUD LIQUID WATER|kg m-2|2|0|8|kg m-2|2|3
+013163|snowWaterEquivalent|long|SNOW WATER EQUIVALENT|kg m-2|0|0|16|kg m-2|0|5
+013164|seaIceFreeboard|double|SEA ICE FREEBOARD|m|3|-131072|18|m|3|6
+013165|capeConvectiveAvailablePotentialEnergy|long|CAPE (CONVECTIVE AVAILABLE POTENTIAL ENERGY)|J/kg|0|0|14|J/kg|0|5
+013166|totalTotalsIndex|double|TOTAL TOTALS INDEX|K|1|0|10|C|0|5
+013167|sIndexStt|double|S INDEX (STT)|K|1|-1000|11|C|0|6
+013168|fogThreatIndex|double|FOG THREAT INDEX|K|1|-100|8|C|0|5
+013169|mdpiMicroburstDayPotentialIndex|double|MDPI (MICROBURST DAY POTENTIAL INDEX)|K/K|1|-100|8|K/K|0|5
+013170|tqIndex|double|TQ INDEX|K|1|-1000|11|C|0|6
+013171|cinConvectiveInhibition|long|CIN (CONVECTIVE INHIBITION)|J/kg|0|-1000|10|J/kg|0|5
+014001|longWaveRadiationIntegratedOver24Hours|long|LONG-WAVE RADIATION, INTEGRATED OVER 24 HOURS|J m-2|-3|-65536|17|J m-2|-3|5
+014002|longWaveRadiationIntegratedOverPeriodSpecified|long|LONG-WAVE RADIATION, INTEGRATED OVER PERIOD SPECIFIED|J m-2|-3|-65536|17|J m-2|-3|5
+014003|shortWaveRadiationIntegratedOver24Hours|long|SHORT-WAVE RADIATION, INTEGRATED OVER 24 HOURS|J m-2|-3|-65536|17|J m-2|-3|5
+014004|shortWaveRadiationIntegratedOverPeriodSpecified|long|SHORT-WAVE RADIATION, INTEGRATED OVER PERIOD SPECIFIED|J m-2|-3|-65536|17|J m-2|-3|5
+014011|netLongWaveRadiationIntegratedOver24Hours|long|NET LONG-WAVE RADIATION, INTEGRATED OVER 24 HOURS|J m-2|-3|-65536|17|J m-2|-3|5
+014012|netLongWaveRadiationIntegratedOverPeriodSpecified|long|NET LONG-WAVE RADIATION, INTEGRATED OVER PERIOD SPECIFIED|J m-2|-3|-65536|17|J m-2|-3|5
+014013|netShortWaveRadiation24Hours|long|NET SHORT-WAVE RADIATION, INTEGRATED OVER 24 HOURS|J m-2|-3|-65536|17|J m-2|-3|5
+014014|netShortWaveRadiationIntegratedOverPeriodSpecified|long|NET SHORT-WAVE RADIATION, INTEGRATED OVER PERIOD SPECIFIED|J m-2|-3|-65536|17|J m-2|-3|5
+014015|netRadiationIntegratedOver24Hours|long|NET RADIATION, INTEGRATED OVER 24 HOURS|J m-2|-4|-16384|15|J m-2|-4|5
+014016|netRadiationIntegratedOverPeriodSpecified|long|NET RADIATION, INTEGRATED OVER PERIOD SPECIFIED|J m-2|-4|-16384|15|J m-2|-4|5
+014017|instantaneousLongWaveRadiation|long|INSTANTANEOUS LONG-WAVE RADIATION|W m-2|0|-512|10|W m-2|0|4
+014018|instantaneousShortWaveRadiation|long|INSTANTANEOUS SHORT-WAVE RADIATION|W m-2|0|-2048|12|W m-2|0|4
+014019|surfaceAlbedo|long|SURFACE ALBEDO|%|0|0|7|%|0|3
+014020|globalSolarRadiation24Hours|long|GLOBAL SOLAR RADIATION, INTEGRATED OVER 24 HOURS|J m-2|-4|0|15|J m-2|-4|5
+014021|globalSolarRadiationIntegratedOverPeriodSpecified|long|GLOBAL SOLAR RADIATION, INTEGRATED OVER PERIOD SPECIFIED|J m-2|-4|0|15|J m-2|-4|5
+014022|diffuseSolarRadiationIntegratedOver24Hours|long|DIFFUSE SOLAR RADIATION, INTEGRATED OVER 24 HOURS|J m-2|-4|0|15|J m-2|-4|5
+014023|diffuseSolarRadiationIntegratedOverPeriodSpecified|long|DIFFUSE SOLAR RADIATION, INTEGRATED OVER PERIOD SPECIFIED|J m-2|-4|0|15|J m-2|-4|5
+014024|directSolarRadiationIntegratedOver24Hours|long|DIRECT SOLAR RADIATION, INTEGRATED OVER 24 HOURS|J m-2|-4|0|15|J m-2|-4|5
+014025|directSolarRadiationIntegratedOverPeriodSpecified|long|DIRECT SOLAR RADIATION, INTEGRATED OVER PERIOD SPECIFIED|J m-2|-4|0|15|J m-2|-4|5
+014026|cloudTopAlbedo|long|ALBEDO AT THE TOP OF CLOUDS|%|0|0|7|%|0|3
+014027|albedo|long|ALBEDO|%|0|0|7|%|0|3
+014028|globalSolarRadiationIntegratedOverPeriodSpecified|long|GLOBAL SOLAR RADIATION (HIGH ACCURACY), INTEGRATED OVER PERIOD SPECIFIED|J m-2|-2|0|20|J m-2|-2|6
+014029|diffuseSolarRadiationIntegratedOverPeriodSpecified|long|DIFFUSE SOLAR RADIATION (HIGH ACCURACY), INTEGRATED OVER PERIOD SPECIFIED|J m-2|-2|0|20|J m-2|-2|6
+014030|directSolarRadiationIntegratedOverPeriodSpecified|long|DIRECT SOLAR RADIATION (HIGH ACCURACY), INTEGRATED OVER PERIOD SPECIFIED|J m-2|-2|0|20|J m-2|-2|6
+014031|totalSunshine|long|TOTAL SUNSHINE|min|0|0|11|min|0|4
+014032|totalSunshine|long|TOTAL SUNSHINE|h|0|0|10|h|0|4
+014033|totalSunshine|long|TOTAL SUNSHINE|%|0|0|9|%|0|3
+014034|sunshineOverPeriodSpecified|long|SUNSHINE OVER PERIOD SPECIFIED|min|0|0|11|min|0|4
+014035|solarRadiationFlux|double|SOLAR RADIATION FLUX|W m-2|1|0|14|W m-2|1|5
+014042|bidirectionalReflectance|long|BIDIRECTIONAL REFLECTANCE|%|0|0|7|%|0|3
+014043|channelRadiance|double|CHANNEL RADIANCE|W m-2 sr-1 um-1|4|0|23|W m-2 sr-1 um-1|4|7
+014044|channelRadiance|double|CHANNEL RADIANCE|W m-2 sr-1 cm|7|-100000|22|W m-2 sr-1 cm|7|7
+014045|channelRadiance|long|CHANNEL RADIANCE|W m-2 sr-1 cm|0|0|11|W m-2 sr-1 cm|0|4
+014046|scaledRadiance|long|SCALED RADIANCE|W m-2 sr-1 m|0|-5000|16|W m-2 sr-1 m|0|5
+014047|scaledMeanAvhrrRadiance|long|SCALED MEAN AVHRR RADIANCE|W m-2 sr-1 m|0|0|31|W m-2 sr-1 m|0|10
+014048|scaledStandardDeviationAvhrrRadiance|long|SCALED STANDARD DEVIATION AVHRR RADIANCE|W m-2 sr-1 m|0|0|31|W m-2 sr-1 m|0|10
+014049|noiseEquivalentDeltaRadiance|double|NOISE EQUIVALENT DELTA RADIANCE|W m-2 sr-1 cm|7|0|22|W m-2 sr-1 cm|0|0
+014050|emissivity|double|EMISSIVITY|%|1|0|10|%|1|4
+014051|directSolarRadiationIntegratedOverLastHour|long|DIRECT SOLAR RADIATION INTEGRATED OVER LAST HOUR|J m-2|-3|0|14|J m-2|-3|4
+014052|globalUpwardSolarRadiationIntegratedOverPeriodSpecified|long|GLOBAL UPWARD SOLAR RADIATION, INTEGRATED OVER PERIOD SPECIFIED|J m-2|-2|-1048574|20|J m-2|-2|7
+014053|netRadiationIntegratedOverPeriodSpecified|long|NET RADIATION (HIGH ACCURACY), INTEGRATED OVER PERIOD SPECIFIED|J m-2|-2|-1048574|21|J m-2|-2|7
+014054|photosyntheticallyActiveRadiationIntegratedOverPeriodSpecified|long|PHOTOSYNTHETICALLY ACTIVE RADIATION, INTEGRATED OVER PERIOD SPECIFIED|J m-2|-3|0|16|J m-2|-3|5
+014055|solarActivityIndex|long|SOLAR ACTIVITY INDEX|Numeric|0|-32768|16|Numeric|0|5
+014056|backgroundLuminance|long|BACKGROUND LUMINANCE|cd m-2|0|0|18|cd m-2|0|6
+014057|soilHeatFlux|long|SOIL HEAT FLUX|J m-2|-2|-1048574|21|J m-2|-2|7
+014058|correctedCrossPoleBackscatter|double|CORRECTED CROSS-POLE BACKSCATTER|dB|2|-5000|13|dB|2|5
+014072|globalUvIrradiation|long|GLOBAL UV IRRADIATION|J m-2|0|-4000000|23|J m-2|0|7
+015001|totalOzone|long|TOTAL OZONE|DU|0|0|10|DU|0|4
+015002|airMassSlantPathAt22Km|long|AIR MASS (SLANT PATH AT 22 KM)|Numeric|2|0|10|Numeric|2|3
+015003|measuredOzonePartialPressureSounding|double|MEASURED OZONE PARTIAL PRESSURE (SOUNDING)|Pa|4|0|9|nbar|0|3
+015004|ozoneSoundingCorrectionFactor|long|OZONE SOUNDING CORRECTION FACTOR (CF)|Numeric|3|0|11|Numeric|3|4
+015005|ozoneP|long|OZONE P|DU|0|0|10|DU|0|3
+015006|log10OfNumberDensityOfAtmosphere|double|LOG10 OF NUMBER DENSITY OF ATMOSPHERE|log (m-3)|5|1800000|20|log (m-3)|5|7
+015007|estimatedAmountOfChemicalConstituent|double|ESTIMATED AMOUNT OF CHEMICAL CONSTITUENT|DU|2|0|16|DU|2|6
+015008|significandOfVolumetricMixingRatio|long|SIGNIFICAND OF VOLUMETRIC MIXING RATIO|Numeric|0|0|10|Numeric|0|4
+015009|log10OfNumberDensityOfOzone|double|LOG10 OF NUMBER DENSITY OF OZONE|log (m-3)|5|1200000|20|log (m-3)|5|7
+015011|log10IntegratedElectronDensity|double|LOG10 OF INTEGRATED ELECTRON DENSITY|log (m-2)|3|14000|13|log (m-2)|3|4
+015012|totalElectronCountPerSquareMetre|long|TOTAL ELECTRON COUNT PER SQUARE METRE|m-2|-16|0|6|m-2|-16|2
+015015|maxImageSpectralComponentBeforeNormalization|long|MAXIMUM IMAGE SPECTRAL COMPONENT BEFORE NORMALIZATION|Numeric|0|0|31|Numeric|0|10
+015020|integratedOzoneDensity|double|INTEGRATED OZONE DENSITY|kg m-2|8|0|21|kg m-2|8|7
+015021|integratedMassDensity|double|INTEGRATED MASS DENSITY|kg m-2|11|0|31|kg m-2|11|10
+015022|extendedIntegratedMassDensity|double|EXTENDED INTEGRATED MASS DENSITY|kg m-2|1|-100000000|31|kg m-2|1|10
+015024|opticalDepth|long|OPTICAL DEPTH|Numeric|4|0|24|Numeric|4|8
+015025|pollutantType|table|TYPE OF POLLUTANT|CODE TABLE|0|0|4|CODE TABLE|0|2
+015026|moleFractionOfPollutant|double|CONCENTRATION OF POLLUTANT (MOL MOL-1)|mol/mol|9|0|9|mol/mol|9|3
+015027|massConcentrationOfPollutant|double|CONCENTRATION OF POLLUTANT (KG M-3)|kg m-3|9|0|10|kg m-3|9|4
+015028|moleFractionOfAtmosphericConstituentOrPollutantInDryAir|double|MOLE FRACTION OF ATMOSPHERIC CONSTITUENT/POLLUTANT IN DRY AIR|0/00|5|0|16|0/00|5|5
+015029|extinctionCoefficient|double|EXTINCTION COEFFICIENT|/m|9|0|30|/m|9|10
+015030|aerosolContaminationIndex|long|AEROSOL CONTAMINATION INDEX|Numeric|2|-1000|12|Numeric|2|4
+015031|atmosphericPathDelayInSatelliteSignal|double|ATMOSPHERIC PATH DELAY IN SATELLITE SIGNAL|m|4|10000|15|m|4|5
+015032|estimatedErrorInAtmosphericPathDelay|double|ESTIMATED ERROR IN ATMOSPHERIC PATH DELAY|m|4|0|10|m|4|4
+015033|differenceInPathDelaysForLimbViewsAtExtremesOfScan|double|DIFFERENCE IN PATH DELAYS FOR LIMB VIEWS AT EXTREMES OF SCAN|m|5|-10000|15|m|5|5
+015034|estimatedErrorInPathDelayDifference|double|ESTIMATED ERROR IN PATH DELAY DIFFERENCE|m|5|0|14|m|5|5
+015035|componentOfZenithPathDelayDueToWaterVapour|double|COMPONENT OF ZENITH PATH DELAY DUE TO WATER VAPOUR|m|4|0|14|m|4|5
+015036|atmosphericRefractivity|double|ATMOSPHERIC REFRACTIVITY|N units|3|0|19|N units|3|6
+015037|bendingAngle|double|BENDING ANGLE|rad|8|-100000|23|rad|8|7
+015038|pathDelayDueToNeutralAtmosphere|double|PATH DELAY DUE TO NEUTRAL ATMOSPHERE|m|4|0|20|m|4|11
+015039|estimatedErrorInNeutralAtmospherePathDelay|double|ESTIMATED ERROR IN NEUTRAL ATMOSPHERE PATH DELAY|m|4|0|14|m|4|9
+015041|sulphurDioxideIndex|long|SULPHUR DIOXIDE INDEX|Numeric|2|-1200|14|Numeric|2|4
+015042|reflectance|double|REFLECTANCE|%|2|0|14|%|2|5
+015043|numberOfAveragingKernelLayers|long|NUMBER OF AVERAGING KERNEL LAYERS|Numeric|0|0|10|Numeric|0|0
+015044|averagingKernelValue|long|AVERAGING KERNEL VALUE|Numeric|6|-5000000|31|Numeric|0|0
+015045|sulphurDioxide|double|SULPHUR DIOXIDE|DU|2|-2000|15|DU|2|5
+015046|volcanoContaminationIndex|long|VOLCANO CONTAMINATION INDEX|Numeric|2|-1000|11|Numeric|2|4
+015049|aerosolAngstromWavelengthExponent|long|AEROSOL ANGSTROM WAVELENGTH EXPONENT|Numeric|3|-2000|14|Numeric|3|5
+015051|meteorologicalOpticalRange|long|METEOROLOGICAL OPTICAL RANGE|m|0|0|18|m|0|6
+015052|log10OfNumberDensityOfAerosolParticlesWithDiameterGreaterThan5Nm|double|LOG10 OF NUMBER DENSITY OF AEROSOL PARTICLES WITH DIAMETER GREATER THAN 5 NM|log (m-3)|1|60|6|log (m-3)|1|3
+015053|log10OfNumberDensityOfAerosolParticlesWithDiameterGreaterThan14Nm|double|LOG10 OF NUMBER DENSITY OF AEROSOL PARTICLES WITH DIAMETER GREATER THAN 14 NM|log (m-3)|2|600|9|log (m-3)|2|4
+015054|log10OfNumberDensityOfAerosolParticlesWithDiameterBetween0p25And2p5|double|LOG10 OF NUMBER DENSITY OF AEROSOL PARTICLES WITH DIAMETER BETWEEN 0.25 AND 2.5 UM|log (m-3)|2|550|9|log (m-3)|2|4
+015055|nonVolatileAerosolRatio|long|NON VOLATILE AEROSOL RATIO|Numeric|2|0|7|Numeric|2|3
+015062|aerosolOpticalThickness|long|AEROSOL OPTICAL THICKNESS|Numeric|3|-1000|14|Numeric|3|5
+015063|attenuatedBackscatter|double|ATTENUATED BACKSCATTER|m-1 sr-1|8|0|20|m-1 sr-1|8|7
+015064|uncertaintyInAttenuatedBackscatter|double|UNCERTAINTY IN ATTENUATED BACKSCATTER|m-1 sr-1|8|0|20|m-1 sr-1|8|7
+015065|particleBackscatterCoefficient|double|PARTICLE BACKSCATTER COEFFICIENT|m-1 sr-1|8|0|20|m-1 sr-1|8|7
+015066|uncertaintyInParticleBackscatterCoefficient|double|UNCERTAINTY IN PARTICLE BACKSCATTER COEFFICIENT|m-1 sr-1|8|0|20|m-1 sr-1|8|7
+015067|particleExtinctionCoefficient|double|PARTICLE EXTINCTION COEFFICIENT|/m|8|0|20|/m|8|7
+015068|uncertaintyInParticleExtinctionCoefficient|double|UNCERTAINTY IN PARTICLE EXTINCTION COEFFICIENT|/m|8|0|20|/m|8|7
+015069|particleLidarRatio|double|PARTICLE LIDAR RATIO|sr|2|0|14|sr|2|5
+015070|uncertaintyInLidarRatio|double|UNCERTAINTY IN LIDAR RATIO|sr|2|0|14|sr|2|5
+015071|particleDepolarizationRatio|double|PARTICLE DEPOLARIZATION RATIO|%|2|0|14|%|2|5
+015072|uncertaintyInDepolarizationRatio|double|UNCERTAINTY IN DEPOLARIZATION RATIO|%|2|0|14|%|2|5
+015073|attenuatedBackscatter1|double|ATTENUATED BACKSCATTER|m-1 sr-1|8|-524288|20|m-1 sr-1|8|7
+015074|particleBackscatterCoefficient1|double|PARTICLE BACKSCATTER COEFFICIENT|m-1 sr-1|8|-524288|20|m-1 sr-1|8|7
+015075|particleExtinctionCoefficient1|double|PARTICLE EXTINCTION COEFFICIENT|m|8|-524288|20|/m|8|7
+015076|particleLidarRatio1|double|PARTICLE LIDAR RATIO|sr|1|-2048|13|sr|1|5
+015077|uncertaintyInLidarRatio1|double|UNCERTAINTY IN LIDAR RATIO|sr|1|0|12|sr|1|5
+015078|particleDepolarizationRatio1|double|PARTICLE DEPOLARIZATION RATIO|%|2|-8192|15|%|2|5
+015079|zenithPathDelayDueToNeutralAtmosphere|double|ZENITH PATH DELAY DUE TO NEUTRAL ATMOSPHERE|m|4|0|15|m|4|9
+015080|estimatedErrorInNeutralAtmosphereZenithPathDelay|double|ESTIMATED ERROR IN NEUTRAL ATMOSPHERE ZENITH PATH DELAY|m|4|0|12|m|4|8
+015081|wetPathDelayDueToNeutralAtmosphere|double|WET PATH DELAY DUE TO NEUTRAL ATMOSPHERE|m|4|0|18|m|4|10
+015082|pathIntegratedWaterVapour|double|PATH INTEGRATED WATER VAPOUR|kg m-2|1|0|16|kg m-2|1|10
+015083|gnssDerivedNeutralAtmosphereGradient|double|GNSS DERIVED NEUTRAL ATMOSPHERE GRADIENT|m|5|-8192|14|m|5|9
+015084|gnssLeastSquaresResidual|double|GNSS LEAST SQUARES RESIDUAL|m|4|0|14|m|4|9
+015085|gnssMultiPathDelay|double|GNSS MULTI-PATH DELAY|m|4|0|14|m|4|9
+015086|gnssHydrostaticMappingFunction|long|GNSS HYDROSTATIC MAPPING FUNCTION|Numeric|3|0|16|Numeric|3|10
+015087|gnssWetMappingFunction|long|GNSS WET MAPPING FUNCTION|Numeric|3|0|16|Numeric|3|10
+015088|gnssGradientMappingFunction|long|GNSS GRADIENT MAPPING FUNCTION|Numeric|3|0|16|Numeric|3|10
+015089|zenithPathDelayDueToNeutralHydrostaticAtmosphere|double|ZENITH PATH DELAY DUE TO NEUTRAL HYDROSTATIC ATMOSPHERE|m|4|0|15|m|4|9
+015090|pathDelayDueToNeutralHydrostaticAtmosphere|double|PATH DELAY DUE TO NEUTRAL HYDROSTATIC ATMOSPHERE|m|4|0|20|m|4|11
+019001|synopticFeatureType|table|TYPE OF SYNOPTIC FEATURE|CODE TABLE|0|0|6|CODE TABLE|0|2
+019002|effectiveRadiusOfFeature|long|EFFECTIVE RADIUS OF FEATURE|m|-2|0|12|m|-2|4
+019003|windSpeedThreshold|long|WIND SPEED THRESHOLD|m/s|0|0|8|m/s|0|3
+019004|effectiveRadiusWithRespectToWindSpeedsAboveThreshold|long|EFFECTIVE RADIUS WITH RESPECT TO WIND SPEEDS ABOVE THRESHOLD|m|-2|0|12|m|-2|4
+019005|featureDirectionOfMotion|long|DIRECTION OF MOTION OF FEATURE|deg|0|0|9|deg|0|3
+019006|speedOfMotionOfFeature|double|SPEED OF MOTION OF FEATURE|m/s|2|0|14|m/s|2|5
+019007|effectiveRadiusOfFeature|long|EFFECTIVE RADIUS OF FEATURE|m|-3|0|12|m|-3|4
+019008|verticalExtentOfCirculation|table|VERTICAL EXTENT OF CIRCULATION|CODE TABLE|0|0|3|CODE TABLE|0|1
+019009|effectiveRadiusWithRespectToWindSpeedsAboveThresholdLargeStorms|long|EFFECTIVE RADIUS WITH RESPECT TO WIND SPEEDS ABOVE THRESHOLD (LARGE STORMS)|m|-3|0|12|m|-3|4
+019010|methodForTrackingCentreOfSynopticFeature|table|METHOD FOR TRACKING THE CENTRE OF SYNOPTIC FEATURE|CODE TABLE|0|0|4|CODE TABLE|0|2
+019100|timeIntervalToCalculateMovementOfTropicalCyclone|table|TIME INTERVAL TO CALCULATE THE MOVEMENT OF THE TROPICAL CYCLONE|CODE TABLE|0|0|4|CODE TABLE|0|2
+019101|accuracyOfPositionOfCentreOfTropicalCyclone|table|ACCURACY OF THE POSITION OF THE CENTRE OF THE TROPICAL CYCLONE|CODE TABLE|0|0|4|CODE TABLE|0|2
+019102|shapeAndDefinitionOfEyeOfTropicalCyclone|table|SHAPE AND DEFINITION OF THE EYE OF THE TROPICAL CYCLONE|CODE TABLE|0|0|3|CODE TABLE|0|1
+019103|diameterOfMajorAxisOfEyeOfTropicalCyclone|table|DIAMETER OF MAJOR AXIS OF THE EYE OF THE TROPICAL CYCLONE|CODE TABLE|0|0|4|CODE TABLE|0|2
+019104|changeInCharacterOfEyeDuring30Minutes|table|CHANGE IN CHARACTER OF THE EYE DURING THE 30 MINUTES|CODE TABLE|0|0|4|CODE TABLE|0|2
+019105|distanceBetweenEndOfSpiralBandAndCentre|table|DISTANCE BETWEEN THE END OF SPIRAL BAND AND THE CENTRE|CODE TABLE|0|0|4|CODE TABLE|0|2
+019106|identificationNumberOfTropicalCyclone|long|IDENTIFICATION NUMBER OF TROPICAL CYCLONE|Numeric|0|0|7|Numeric|0|3
+019107|timeIntervalOverWhichMovementOfTropicalCycloneHasBeenCalculated|table|TIME INTERVAL OVER WHICH THE MOVEMENT OF THE TROPICAL CYCLONE HAS BEEN CALCULATED|CODE TABLE|0|0|4|CODE TABLE|0|2
+019108|accuracyOfGeographicalPositionOfTropicalCyclone|table|ACCURACY OF GEOGRAPHICAL POSITION OF THE TROPICAL CYCLONE|CODE TABLE|0|0|3|CODE TABLE|0|1
+019109|meanDiameterOfOvercastCloudOfTropicalCyclone|table|MEAN DIAMETER OF THE OVERCAST CLOUD OF THE TROPICAL CYCLONE|CODE TABLE|0|0|4|CODE TABLE|0|2
+019110|apparent24HourChangeInIntensityOfTropicalCyclone|table|APPARENT 24-HOUR CHANGE IN INTENSITY OF THE TROPICAL CYCLONE|CODE TABLE|0|0|4|CODE TABLE|0|2
+019111|currentIntensityNumberOfTropicalCyclone|long|CURRENT INTENSITY (CI) NUMBER OF THE TROPICAL CYCLONE|Numeric|1|0|7|Numeric|1|3
+019112|dataTropicalNumberOfTropicalCyclone|long|DATA TROPICAL (DT) NUMBER OF THE TROPICAL CYCLONE|Numeric|1|0|7|Numeric|1|3
+019113|cloudPatternTypeOfDtNumber|table|CLOUD PATTERN TYPE OF THE DT-NUMBER|CODE TABLE|0|0|4|CODE TABLE|0|2
+019114|modelExpectedTropicalNumberOfTropicalCyclone|long|MODEL EXPECTED TROPICAL (MET) NUMBER OF THE TROPICAL CYCLONE|Numeric|1|0|7|Numeric|1|3
+019115|trendOfPast24HourChangeDevelopedWeakened|long|TREND OF THE PAST 24-HOUR CHANGE (+: DEVELOPED, -: WEAKENED)|Numeric|1|-30|6|Numeric|1|2
+019116|patternTropicalNumberOfTropicalCyclone|long|PATTERN TROPICAL (PT) NUMBER OF THE TROPICAL CYCLONE|Numeric|1|0|7|Numeric|1|3
+019117|cloudPictureTypeOfPtNumber|table|CLOUD PICTURE TYPE OF THE PT-NUMBER|CODE TABLE|0|0|3|CODE TABLE|0|1
+019118|finalTropicalNumberOfTropicalCyclone|long|FINAL TROPICAL (T) NUMBER OF THE TROPICAL CYCLONE|Numeric|1|0|7|Numeric|1|3
+019119|finalTNumberType|table|TYPE OF THE FINAL T-NUMBER|CODE TABLE|0|0|3|CODE TABLE|0|1
+019150|typhoonInternationalCommonNumberTyphoonCommittee|string|TYPHOON INTERNATIONAL COMMON NUMBER (TYPHOON COMMITTEE)|CCITT IA5|0|0|32|Character|0|4
+020001|horizontalVisibility|long|HORIZONTAL VISIBILITY|m|-1|0|13|m|-1|4
+020002|verticalVisibility|long|VERTICAL VISIBILITY|m|-1|0|7|m|-1|3
+020003|presentWeather|table|PRESENT WEATHER|CODE TABLE|0|0|9|CODE TABLE|0|3
+020004|pastWeather1|table|PAST WEATHER (1)|CODE TABLE|0|0|5|CODE TABLE|0|2
+020005|pastWeather2|table|PAST WEATHER (2)|CODE TABLE|0|0|5|CODE TABLE|0|2
+020006|flightRules|table|FLIGHT RULES|CODE TABLE|0|0|3|CODE TABLE|0|1
+020008|cloudDistributionForAviation|table|CLOUD DISTRIBUTION FOR AVIATION|CODE TABLE|0|0|5|CODE TABLE|0|2
+020009|generalWeatherIndicatorTafOrMetar|table|GENERAL WEATHER INDICATOR (TAF/METAR)|CODE TABLE|0|0|4|CODE TABLE|0|2
+020010|cloudCoverTotal|long|CLOUD COVER (TOTAL)|%|0|0|7|%|0|3
+020011|cloudAmount|table|CLOUD AMOUNT|CODE TABLE|0|0|4|CODE TABLE|0|2
+020012|cloudType|table|CLOUD TYPE|CODE TABLE|0|0|6|CODE TABLE|0|2
+020013|heightOfBaseOfCloud|long|HEIGHT OF BASE OF CLOUD|m|-1|-40|11|m|-1|4
+020014|heightOfTopOfCloud|long|HEIGHT OF TOP OF CLOUD|m|-1|-40|11|m|-1|4
+020015|pressureAtBaseOfCloud|long|PRESSURE AT BASE OF CLOUD|Pa|-1|0|14|Pa|-1|5
+020016|pressureAtTopOfCloud|long|PRESSURE AT TOP OF CLOUD|Pa|-1|0|14|Pa|-1|5
+020017|cloudTopDescription|table|CLOUD TOP DESCRIPTION|CODE TABLE|0|0|4|CODE TABLE|0|2
+020018|tendencyOfRunwayVisualRange|table|TENDENCY OF RUNWAY VISUAL RANGE|CODE TABLE|0|0|2|CODE TABLE|0|1
+020019|significantWeather|string|SIGNIFICANT PRESENT OR FORECAST WEATHER|CCITT IA5|0|0|72|Character|0|9
+020020|significantRecentWeatherPhenomena|string|SIGNIFICANT RECENT WEATHER PHENOMENA|CCITT IA5|0|0|32|Character|0|4
+020021|precipitationType|flag|TYPE OF PRECIPITATION|FLAG TABLE|0|0|30|FLAG TABLE|0|10
+020022|characterOfPrecipitation|table|CHARACTER OF PRECIPITATION|CODE TABLE|0|0|4|CODE TABLE|0|2
+020023|otherWeatherPhenomena|flag|OTHER WEATHER PHENOMENA|FLAG TABLE|0|0|18|FLAG TABLE|0|6
+020024|intensityOfPhenomena|table|INTENSITY OF PHENOMENA|CODE TABLE|0|0|3|CODE TABLE|0|1
+020025|obscuration|flag|OBSCURATION|FLAG TABLE|0|0|21|FLAG TABLE|0|7
+020026|characterOfObscuration|table|CHARACTER OF OBSCURATION|CODE TABLE|0|0|4|CODE TABLE|0|2
+020027|phenomenaOccurrence|flag|PHENOMENA OCCURRENCE|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+020028|expectedChangeInIntensity|table|EXPECTED CHANGE IN INTENSITY|CODE TABLE|0|0|3|CODE TABLE|0|1
+020029|rainFlag|table|RAIN FLAG|CODE TABLE|0|0|2|CODE TABLE|0|1
+020031|iceDepositThickness|double|ICE DEPOSIT (THICKNESS)|m|2|0|7|m|2|3
+020032|rateOfIceAccretionEstimated|table|RATE OF ICE ACCRETION (ESTIMATED)|CODE TABLE|0|0|3|CODE TABLE|0|1
+020033|causeOfIceAccretion|flag|CAUSE OF ICE ACCRETION|FLAG TABLE|0|0|4|FLAG TABLE|0|2
+020034|seaIceConcentration|table|SEA ICE CONCENTRATION|CODE TABLE|0|0|5|CODE TABLE|0|2
+020035|amountAndTypeOfIce|table|AMOUNT AND TYPE OF ICE|CODE TABLE|0|0|4|CODE TABLE|0|2
+020036|iceSituation|table|ICE SITUATION|CODE TABLE|0|0|5|CODE TABLE|0|2
+020037|iceDevelopment|table|ICE DEVELOPMENT|CODE TABLE|0|0|5|CODE TABLE|0|2
+020038|iceEdgeBearing|long|BEARING OF ICE EDGE|deg|0|0|12|deg|0|3
+020039|iceDistance|long|ICE DISTANCE|m|-1|0|13|m|-1|4
+020040|evolutionOfDriftSnow|table|EVOLUTION OF DRIFT SNOW|CODE TABLE|0|0|4|CODE TABLE|0|2
+020041|airframeIcing|table|AIRFRAME ICING|CODE TABLE|0|0|4|CODE TABLE|0|2
+020042|airframeIcingPresent|table|AIRFRAME ICING PRESENT|CODE TABLE|0|0|2|CODE TABLE|0|1
+020043|peakLiquidWaterContent|double|PEAK LIQUID WATER CONTENT|kg m-3|4|0|7|kg m-3|4|2
+020044|averageLiquidWaterContent|double|AVERAGE LIQUID WATER CONTENT|kg m-3|4|0|7|kg m-3|4|2
+020045|supercooledLargeDropletConditions|table|SUPERCOOLED LARGE DROPLET (SLD) CONDITIONS|CODE TABLE|0|0|2|CODE TABLE|0|1
+020048|evolutionOfFeature|table|EVOLUTION OF FEATURE|CODE TABLE|0|0|4|CODE TABLE|0|2
+020050|cloudIndex|table|CLOUD INDEX|CODE TABLE|0|0|8|CODE TABLE|0|3
+020051|amountOfLowClouds|long|AMOUNT OF LOW CLOUDS|%|0|0|7|%|0|3
+020052|amountOfMiddleClouds|long|AMOUNT OF MIDDLE CLOUDS|%|0|0|7|%|0|3
+020053|amountOfHighClouds|long|AMOUNT OF HIGH CLOUDS|%|0|0|7|%|0|3
+020054|trueDirectionFromWhichAPhenomenonOrCloudsAreMovingOrInWhichTheyAreObserved|long|TRUE DIRECTION FROM WHICH A PHENOMENON OR CLOUDS ARE MOVING OR IN WHICH THEY ARE OBSERVED|deg|0|0|9|deg|0|3
+020055|stateOfSkyInTropics|table|STATE OF SKY IN THE TROPICS|CODE TABLE|0|0|4|CODE TABLE|0|2
+020056|cloudPhase|table|CLOUD PHASE|CODE TABLE|0|0|3|CODE TABLE|0|1
+020058|visibilitySeawardsFromACoastalStation|long|VISIBILITY SEAWARDS FROM A COASTAL STATION|m|-1|0|13|m|-1|4
+020059|minimumHorizontalVisibility|long|MINIMUM HORIZONTAL VISIBILITY|m|-1|0|9|m|-1|3
+020060|prevailingHorizontalVisibility|long|PREVAILING HORIZONTAL VISIBILITY|m|-1|0|10|m|-1|4
+020061|runwayVisualRangeRvr|long|RUNWAY VISUAL RANGE (RVR)|m|0|0|12|m|0|4
+020062|stateOfGround|table|STATE OF THE GROUND (WITH OR WITHOUT SNOW)|CODE TABLE|0|0|5|CODE TABLE|0|2
+020063|specialPhenomena|table|SPECIAL PHENOMENA|CODE TABLE|0|0|10|CODE TABLE|0|4
+020065|snowCover|long|SNOW COVER|%|0|0|7|%|0|3
+020066|maximumDiameterOfHailstones|double|MAXIMUM DIAMETER OF HAILSTONES|m|3|0|8|m|3|3
+020067|diameterOfDeposit|double|DIAMETER OF DEPOSIT|m|3|0|9|m|3|3
+020070|minimumNumberOfAtmospherics|long|MINIMUM NUMBER OF ATMOSPHERICS|Numeric|0|0|7|Numeric|0|3
+020071|accuracyOfFixAndRateOfAtmospherics|table|ACCURACY OF FIX AND RATE OF ATMOSPHERICS|CODE TABLE|0|0|4|CODE TABLE|0|2
+020079|snowOrIceCrystalsIndicator|table|SNOW OR ICE CRYSTALS INDICATOR|CODE TABLE|0|0|2|CODE TABLE|0|1
+020081|cloudAmountInSegment|long|CLOUD AMOUNT IN SEGMENT|%|0|0|7|%|0|3
+020082|amountSegmentCloudFree|long|AMOUNT SEGMENT CLOUD FREE|%|0|0|7|%|0|3
+020083|amountOfSegmentCoveredByScene|long|AMOUNT OF SEGMENT COVERED BY SCENE|%|0|0|7|%|0|3
+020085|generalConditionOfRunway|table|GENERAL CONDITION OF RUNWAY|CODE TABLE|0|0|4|CODE TABLE|0|1
+020086|runwayDeposits|table|RUNWAY DEPOSITS|CODE TABLE|0|0|4|CODE TABLE|0|1
+020087|runwayContamination|table|RUNWAY CONTAMINATION|CODE TABLE|0|0|4|CODE TABLE|0|1
+020088|depthOfRunwayDeposits|double|DEPTH OF RUNWAY DEPOSITS|m|3|0|12|m|0|4
+020089|runwayFrictionCoefficient|table|RUNWAY FRICTION COEFFICIENT|CODE TABLE|0|0|7|CODE TABLE|0|2
+020090|specialClouds|table|SPECIAL CLOUDS|CODE TABLE|0|0|4|CODE TABLE|0|2
+020091|verticalVisibility|long|VERTICAL VISIBILITY|ft|-2|0|10|ft|-2|3
+020092|heightOfBaseOfCloud|long|HEIGHT OF BASE OF CLOUD|ft|-2|0|10|ft|-2|3
+020093|heightOfInversion|long|HEIGHT OF INVERSION|m|-1|0|8|m|-1|3
+020095|iceProbability|long|ICE PROBABILITY|Numeric|3|0|10|Numeric|3|4
+020096|iceAgeAParameter|double|ICE AGE (A PARAMETER)|dB|2|-4096|13|dB|2|4
+020101|locustAcridianName|table|LOCUST (ACRIDIAN) NAME|CODE TABLE|0|0|4|CODE TABLE|0|2
+020102|locustMaturityColour|table|LOCUST (MATURITY) COLOUR|CODE TABLE|0|0|4|CODE TABLE|0|2
+020103|stageOfDevelopmentOfLocusts|table|STAGE OF DEVELOPMENT OF LOCUSTS|CODE TABLE|0|0|4|CODE TABLE|0|2
+020104|organizationStateOfSwarm|table|ORGANIZATION STATE OF SWARM OR BAND OF LOCUSTS|CODE TABLE|0|0|4|CODE TABLE|0|2
+020105|sizeOfSwarmOrBandOfLocustsAndDurationOfPassageOfSwarm|table|SIZE OF SWARM OR BAND OF LOCUSTS AND DURATION OF PASSAGE OF SWARM|CODE TABLE|0|0|4|CODE TABLE|0|2
+020106|locustPopulationDensity|table|LOCUST POPULATION DENSITY|CODE TABLE|0|0|4|CODE TABLE|0|2
+020107|directionOfMovementsOfLocustSwarm|table|DIRECTION OF MOVEMENTS OF LOCUST SWARM|CODE TABLE|0|0|4|CODE TABLE|0|2
+020108|extentOfVegetation|table|EXTENT OF VEGETATION|CODE TABLE|0|0|4|CODE TABLE|0|2
+020111|xAxisErrorEllipseMajorComponent|long|X-AXIS ERROR ELLIPSE MAJOR COMPONENT|m|-1|0|17|m|-1|6
+020112|yAxisErrorEllipseMinorComponent|long|Y-AXIS ERROR ELLIPSE MINOR COMPONENT|m|-1|0|17|m|-1|6
+020113|zAxisErrorEllipseComponent|long|Z-AXIS ERROR ELLIPSE COMPONENT|m|-1|0|17|m|-1|6
+020114|angleOfXAxisInErrorEllipse|double|ANGLE OF X-AXIS IN ERROR ELLIPSE|deg|2|-18000|16|deg|2|5
+020115|angleOfZAxisInErrorEllipse|double|ANGLE OF Z-AXIS IN ERROR ELLIPSE|deg|2|-18000|16|deg|2|5
+020116|emissionHeightOfCloudStroke|long|EMISSION HEIGHT OF CLOUD STROKE|m|0|0|16|m|0|5
+020117|amplitudeOfLightningStrike|long|AMPLITUDE OF LIGHTNING STRIKE|A|-1|-32000|16|A|-1|5
+020118|lightningDetectionError|long|LIGHTNING DETECTION ERROR|m|0|0|19|m|0|6
+020119|lightningDischargePolarity|table|LIGHTNING DISCHARGE POLARITY|CODE TABLE|0|0|2|CODE TABLE|0|1
+020121|thresholdValueForPolarityDecision|double|THRESHOLD VALUE FOR POLARITY DECISION|V|3|0|16|V|3|5
+020122|thresholdValueForPolarityDecision|long|THRESHOLD VALUE FOR POLARITY DECISION|A|0|0|16|A|0|5
+020123|minimumDirectionThreshold|double|MINIMUM THRESHOLD FOR DETECTION|V/m|3|0|16|V/m|3|5
+020124|lightningStrokeOrFlash|table|LIGHTNING STROKE OR FLASH|CODE TABLE|0|0|2|CODE TABLE|0|1
+020126|lightningRateOfDischarge|long|LIGHTNING RATE OF DISCHARGE|/h|0|0|23|/h|0|7
+020127|lightningDistanceFromStation|long|LIGHTNING - DISTANCE FROM STATION|m|-3|0|8|m|-3|3
+020128|lightningDirectionFromStation|double|LIGHTNING - DIRECTION FROM STATION|deg|1|0|12|deg|1|4
+020129|lightningDensityStrokeFlashOrEvent|double|LIGHTNING DENSITY (STROKE, FLASH OR EVENT)|m-2|6|0|10|m-2|6|4
+020130|cloudHydrometeorConcentration|long|CLOUD HYDROMETEOR CONCENTRATION|Numeric|0|0|10|Numeric|0|3
+020131|effectiveRadiusOfCloudHydrometeors|double|EFFECTIVE RADIUS OF CLOUD HYDROMETEORS|m|5|0|6|m|5|2
+020132|cloudLiquidWaterContent|double|CLOUD LIQUID WATER CONTENT|kg m-3|5|0|11|kg m-3|5|4
+020133|hydrometeorRadius|double|HYDROMETEOR RADIUS|m|5|0|6|m|5|2
+020135|iceMassOnARod|double|ICE MASS (ON A ROD)|kg/m|1|0|10|kg/m|1|3
+020136|supplementaryCloudType|table|SUPPLEMENTARY CLOUD TYPE|CODE TABLE|0|0|9|CODE TABLE|0|3
+020137|evolutionOfClouds|table|EVOLUTION OF CLOUDS|CODE TABLE|0|0|4|CODE TABLE|0|2
+020138|roadSurfaceCondition|table|ROAD SURFACE CONDITION|CODE TABLE|0|0|4|CODE TABLE|0|2
+020139|finalCloudModelAssumption|table|FINAL CLOUD MODEL ASSUMPTION|CODE TABLE|0|0|4|CODE TABLE|0|2
+020140|lightningArea|long|LIGHTNING AREA|m2|0|0|30|m2|0|0
+020141|lightningEnergy|double|LIGHTNING ENERGY|J|19|0|30|J|0|0
+020142|lightningDetectionEfficiency|long|LIGHTNING DETECTION EFFICIENCY|%|0|0|7|%|0|0
+020143|liquidCloud|table|LIQUID CLOUD|CODE TABLE|0|0|2|CODE TABLE|0|1
+021001|horizontalReflectivity|long|HORIZONTAL REFLECTIVITY|dB|0|-64|7|dB|0|3
+021002|verticalReflectivity|long|VERTICAL REFLECTIVITY|dB|0|-64|7|dB|0|3
+021003|differentialReflectivity|double|DIFFERENTIAL REFLECTIVITY|dB|1|-5|7|dB|1|3
+021004|differentialReflectivity|double|DIFFERENTIAL REFLECTIVITY|dB|2|-800|11|dB|2|4
+021005|linearDepolarizationRatio|long|LINEAR DEPOLARIZATION RATIO|dB|0|-65|6|dB|0|2
+021006|circularDepolarizationRatio|long|CIRCULAR DEPOLARIZATION RATIO|dB|0|-65|6|dB|0|2
+021007|radarReflectivityFactor|double|RADAR REFLECTIVITY FACTOR|dB|2|-9000|15|dB|0|0
+021008|uncertaintyInRadarReflectivityFactor|double|UNCERTAINTY IN RADAR REFLECTIVITY FACTOR|dB|2|0|13|dB|0|0
+021009|verticalDopplerVelocity|double|VERTICAL DOPPLER VELOCITY|m/s|2|-10000|15|m/s|0|0
+021010|uncertaintyInVerticalDopplerVelocity|double|UNCERTAINTY IN VERTICAL DOPPLER VELOCITY|m/s|2|-10000|15|m/s|0|0
+021011|dopplerMeanVelocityXDirection|long|DOPPLER MEAN VELOCITY IN X-DIRECTION|m/s|0|-128|8|m/s|0|3
+021012|dopplerMeanVelocityYDirection|long|DOPPLER MEAN VELOCITY IN Y-DIRECTION|m/s|0|-128|8|m/s|0|3
+021013|dopplerMeanVelocityZDirection|long|DOPPLER MEAN VELOCITY IN Z-DIRECTION|m/s|0|-128|8|m/s|0|3
+021014|dopplerMeanVelocityRadial|double|DOPPLER MEAN VELOCITY (RADIAL)|m/s|1|-4096|13|m/s|1|4
+021017|dopplerVelocitySpectralWidth|double|DOPPLER VELOCITY SPECTRAL WIDTH|m/s|1|0|8|m/s|1|3
+021018|extendedNyquistVelocity|double|EXTENDED NYQUIST VELOCITY|m/s|1|0|10|m/s|1|4
+021019|highNyquistVelocity|double|HIGH NYQUIST VELOCITY|m/s|1|0|10|m/s|1|3
+021021|echoTops|long|ECHO TOPS|m|-3|0|4|m|-3|2
+021022|rangeBinOffset|double|RANGE BIN OFFSET|m|1|0|14|m|1|5
+021023|rangeBinSize|long|RANGE BIN SIZE|m|0|0|14|m|0|5
+021024|azimuthOffset|double|AZIMUTH OFFSET|deg|1|0|12|deg|1|4
+021025|azimuthalResolution|double|AZIMUTHAL RESOLUTION|deg|1|0|8|deg|1|3
+021026|ascatSigma0Usability|table|ASCAT SIGMA-0 USABILITY|CODE TABLE|0|0|3|CODE TABLE|0|1
+021027|landContributionRatio|long|LAND CONTRIBUTION RATIO|Numeric|4|0|14|Numeric|4|5
+021028|differentialPhase|double|DIFFERENTIAL PHASE|deg|1|0|12|deg|1|4
+021029|crossPolarizationCorrelationCoefficient|long|CROSS-POLARIZATION CORRELATION COEFFICIENT|Numeric|2|-100|8|Numeric|2|3
+021030|signalToNoiseRatio|long|SIGNAL TO NOISE RATIO|dB|0|-32|8|dB|0|3
+021031|verticallyIntegratedLiquidWaterContent|long|VERTICALLY INTEGRATED LIQUID-WATER CONTENT|kg m-2|0|0|7|kg m-2|0|3
+021036|radarRainfallIntensity|double|RADAR RAINFALL INTENSITY|m/s|7|0|12|m/s|7|4
+021041|brightBandHeight|long|BRIGHT-BAND HEIGHT|m|-2|0|8|m|-2|3
+021051|signalPowerAbove1Mw|long|SIGNAL POWER ABOVE 1 MW|dB|0|-256|8|dB|0|3
+021062|backscatter|double|BACKSCATTER|dB|2|-5000|13|dB|2|4
+021063|radiometricResolutionNoiseValue|double|RADIOMETRIC RESOLUTION (NOISE VALUE)|%|1|0|10|%|1|4
+021064|clutterNoiseEstimate|long|CLUTTER NOISE ESTIMATE|Numeric|0|0|8|Numeric|0|3
+021065|missingPacketCounter|long|MISSING PACKET COUNTER|Numeric|0|-127|8|Numeric|0|3
+021066|waveScatterometerProductConfidenceData|flag|WAVE SCATTEROMETER PRODUCT CONFIDENCE DATA|FLAG TABLE|0|0|12|FLAG TABLE|0|4
+021067|windProductConfidenceData|flag|WIND PRODUCT CONFIDENCE DATA|FLAG TABLE|0|0|13|FLAG TABLE|0|5
+021068|radarAltimeterProductConfidenceData|flag|RADAR ALTIMETER PRODUCT CONFIDENCE DATA|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+021069|sstProductConfidenceData|flag|SST PRODUCT CONFIDENCE DATA|FLAG TABLE|0|0|10|FLAG TABLE|0|4
+021070|sstProductConfidenceDataSadist2|flag|SST PRODUCT CONFIDENCE DATA (SADIST-2)|FLAG TABLE|0|0|23|FLAG TABLE|0|6
+021071|peakiness|long|PEAKINESS|Numeric|0|0|16|Numeric|0|5
+021072|satelliteAltimeterCalibrationStatus|flag|SATELLITE ALTIMETER CALIBRATION STATUS|FLAG TABLE|0|0|4|FLAG TABLE|0|2
+021073|satelliteAltimeterInstrumentMode|flag|SATELLITE ALTIMETER INSTRUMENT MODE|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+021075|imageSpectrumIntensity|long|IMAGE SPECTRUM INTENSITY|Numeric|0|0|8|Numeric|0|3
+021076|representationOfIntensities|table|REPRESENTATION OF INTENSITIES|CODE TABLE|0|0|3|CODE TABLE|0|1
+021077|altitudeCorrectionIonosphere|double|ALTITUDE CORRECTION (IONOSPHERE)|m|3|0|14|m|3|5
+021078|altitudeCorrectionDryTroposphere|double|ALTITUDE CORRECTION (DRY TROPOSPHERE)|m|3|0|9|m|3|3
+021079|altitudeCorrectionWetTroposphere|double|ALTITUDE CORRECTION (WET TROPOSPHERE)|m|3|2000|10|m|3|4
+021080|altitudeCorrectionCalibrationConstant|double|ALTITUDE CORRECTION (CALIBRATION CONSTANT)|m|3|0|11|m|3|4
+021081|openLoopCorrectionHeightTimeLoop|double|OPEN LOOP CORRECTION (HEIGHT-TIME LOOP)|m|3|0|10|m|3|4
+021082|openLoopCorrectionAutoGainControl|double|OPEN LOOP CORRECTION (AUTO GAIN CONTROL)|dB|3|-3000|14|dB|3|5
+021083|warmTargetCalibration|long|WARM TARGET CALIBRATION|Numeric|0|0|16|Numeric|0|5
+021084|coldTargetCalibration|long|COLD TARGET CALIBRATION|Numeric|0|0|16|Numeric|0|5
+021085|atsrSeaSurfaceTemperatureAcrossTrackBandNumber|long|ATSR SEA-SURFACE TEMPERATURE ACROSS-TRACK BAND NUMBER|Numeric|0|0|4|Numeric|0|2
+021086|numberOfPixelsInNadirOnlyAverage|long|NUMBER OF PIXELS IN NADIR ONLY, AVERAGE|Numeric|0|0|9|Numeric|0|3
+021087|numberOfPixelsInDualViewAverage|long|NUMBER OF PIXELS IN DUAL VIEW, AVERAGE|Numeric|0|0|9|Numeric|0|3
+021088|wetBackscatter|double|WET BACKSCATTER|dB|2|-5000|13|dB|2|4
+021091|radarSignalDopplerSpectrum0thMoment|long|RADAR SIGNAL DOPPLER SPECTRUM 0TH MOMENT|dB|0|-100|8|dB|0|3
+021092|rassSignalDopplerSpectrum0thMomentReferringToRassSignal|long|RASS SIGNAL DOPPLER SPECTRUM 0TH MOMENT, REFERRING TO RASS SIGNAL|dB|0|-100|8|dB|0|3
+021093|kuBandPeakiness|long|KU BAND PEAKINESS|Numeric|3|0|16|Numeric|3|5
+021094|sBandPeakiness|long|S BAND PEAKINESS|Numeric|3|0|16|Numeric|3|5
+021095|kpCoefficientA|long|KP COEFFICIENT A|Numeric|6|0|20|Numeric|6|7
+021096|kpCoefficientB|long|KP COEFFICIENT B|Numeric|6|0|20|Numeric|6|7
+021097|kpCoefficientC|long|KP COEFFICIENT C|Numeric|6|0|20|Numeric|6|7
+021101|numberOfVectorAmbiguities|long|NUMBER OF VECTOR AMBIGUITIES|Numeric|0|0|3|Numeric|0|1
+021102|indexOfSelectedWindVector|long|INDEX OF SELECTED WIND VECTOR|Numeric|0|0|3|Numeric|0|1
+021103|totalNumberOfSigma0Measurements|long|TOTAL NUMBER OF SIGMA-0 MEASUREMENTS|Numeric|0|0|5|Numeric|0|2
+021104|likelihoodComputedForSolution|long|LIKELIHOOD COMPUTED FOR SOLUTION|Numeric|3|-30000|15|Numeric|3|5
+021105|normalizedRadarCrossSection|double|NORMALIZED RADAR CROSS-SECTION|dB|2|-10000|14|dB|2|5
+021106|kpVarianceCoefficientAlpha|long|KP VARIANCE COEFFICIENT (ALPHA)|Numeric|3|0|14|Numeric|3|5
+021107|kpVarianceCoefficientBeta|long|KP VARIANCE COEFFICIENT (BETA)|Numeric|8|0|16|Numeric|8|5
+021109|seawindsWindVectorCellQuality|flag|SEAWINDS WIND VECTOR CELL QUALITY|FLAG TABLE|0|0|17|FLAG TABLE|0|6
+021110|numberOfInnerBeamSigma0ForwardOfSatellite|long|NUMBER OF INNER-BEAM SIGMA-0 (FORWARD OF SATELLITE)|Numeric|0|0|6|Numeric|0|2
+021111|numberOfOuterBeamSigma0ForwardOfSatellite|long|NUMBER OF OUTER-BEAM SIGMA-0 (FORWARD OF SATELLITE)|Numeric|0|0|6|Numeric|0|2
+021112|numberOfInnerBeamSigma0AftOfSatellite|long|NUMBER OF INNER-BEAM SIGMA-0 (AFT OF SATELLITE)|Numeric|0|0|6|Numeric|0|2
+021113|numberOfOuterBeamSigma0AftOfSatellite|long|NUMBER OF OUTER-BEAM SIGMA-0 (AFT OF SATELLITE)|Numeric|0|0|6|Numeric|0|2
+021114|kpVarianceCoefficientGamma|double|KP VARIANCE COEFFICIENT (GAMMA)|dB|3|-140000|18|dB|3|6
+021115|seawindsSigma0Quality|flag|SEAWINDS SIGMA-0 QUALITY|FLAG TABLE|0|0|17|FLAG TABLE|0|6
+021116|seawindsSigma0Mode|flag|SEAWINDS SIGMA-0 MODE|FLAG TABLE|0|0|17|FLAG TABLE|0|6
+021117|sigma0VarianceQualityControl|long|SIGMA-0 VARIANCE QUALITY CONTROL|Numeric|2|0|16|Numeric|2|5
+021118|attenuationCorrectionOnSigma0|double|ATTENUATION CORRECTION ON SIGMA-0|dB|2|-10000|14|dB|2|5
+021119|windScatterometerGeophysicalModelFunction|table|WIND SCATTEROMETER GEOPHYSICAL MODEL FUNCTION|CODE TABLE|0|0|6|CODE TABLE|0|2
+021120|probabilityOfRain|long|PROBABILITY OF RAIN|Numeric|3|0|10|Numeric|3|4
+021121|seawindsNofRainIndex|long|SEAWINDS NOF RAIN INDEX|Numeric|0|0|8|Numeric|0|3
+021122|attenuationCorrectionOnSigma0FromTb|double|ATTENUATION CORRECTION ON SIGMA-0 (FROM TB)|dB|2|-10000|14|dB|2|5
+021123|seawindsNormalizedRadarCrossSection|double|SEAWINDS NORMALIZED RADAR CROSS-SECTION|dB|2|-30000|15|dB|2|5
+021128|numberOfValidPointsPerSecondUsedToDerivePreviousParameters|long|NUMBER OF VALID POINTS PER SECOND USED TO DERIVE PREVIOUS PARAMETERS|Numeric|0|0|8|Numeric|0|3
+021130|spectrumTotalEnergy|long|SPECTRUM TOTAL ENERGY|Numeric|6|0|28|Numeric|6|9
+021131|spectrumMaxEnergy|long|SPECTRUM MAX ENERGY|Numeric|6|0|28|Numeric|6|9
+021132|directionOfSpectrumMaxOnHigherResolutionGrid|double|DIRECTION OF SPECTRUM MAX ON HIGHER RESOLUTION GRID|deg|3|0|19|deg|3|6
+021133|wavelengthOfSpectrumMaxOnHigherResolutionGrid|double|WAVELENGTH OF SPECTRUM MAX ON HIGHER RESOLUTION GRID|m|3|0|29|m|3|9
+021134|rangeResolutionOfCressCovarianceSpectrum|double|RANGE RESOLUTION OF CRESS COVARIANCE SPECTRUM|rad/m|3|0|19|rad/m|3|6
+021135|realPartOfCrossSpectraPolarGridNumberOfBins|long|REAL PART OF CROSS SPECTRA POLAR GRID NUMBER OF BINS|Numeric|3|-524288|20|Numeric|3|7
+021136|imaginaryPartOfCrossSpectraPolarGridNumberOfBins|long|IMAGINARY PART OF CROSS SPECTRA POLAR GRID NUMBER OF BINS|Numeric|3|-524288|20|Numeric|3|7
+021137|kuBandCorrectedOceanBackscatterCoefficient|double|KU BAND CORRECTED OCEAN BACKSCATTER COEFFICIENT|dB|2|-32768|16|dB|2|5
+021138|stdKuBandCorrectedOceanBackscatterCoefficient|double|STD KU BAND CORRECTED OCEAN BACKSCATTER COEFFICIENT|dB|2|-32768|16|dB|2|5
+021139|kuBandNetInstrumentalCorrectionForAgc|double|KU BAND NET INSTRUMENTAL CORRECTION FOR AGC|dB|2|-2048|12|dB|2|4
+021140|sBandCorrectedOceanBackscatterCoefficient|double|S BAND CORRECTED OCEAN BACKSCATTER COEFFICIENT|dB|2|-32768|16|dB|2|5
+021141|stdSBandCorrectedOceanBackscatterCoefficient|double|STD S BAND CORRECTED OCEAN BACKSCATTER COEFFICIENT|dB|2|-32768|16|dB|2|5
+021142|sBandNetInstrumentalCorrectionForAgc|double|S BAND NET INSTRUMENTAL CORRECTION FOR AGC|dB|2|-1024|11|dB|2|4
+021143|kuBandRainAttenuation|double|KU BAND RAIN ATTENUATION|dB|2|-1073741824|31|dB|2|10
+021144|altimeterRainFlag|flag|ALTIMETER RAIN FLAG|FLAG TABLE|0|0|2|FLAG TABLE|0|1
+021145|kuBandAutomaticGainControl|double|KU BAND AUTOMATIC GAIN CONTROL|dB|2|0|13|dB|2|4
+021146|rmsKuBandAutomaticGainControl|double|RMS KU BAND AUTOMATIC GAIN CONTROL|dB|2|0|8|dB|2|3
+021147|numberOfValidPointsForKuBandAutomaticGainControl|long|NUMBER OF VALID POINTS FOR KU BAND AUTOMATIC GAIN CONTROL|Numeric|0|0|5|Numeric|0|2
+021148|trailingEdgeVariationFlag|flag|TRAILING EDGE VARIATION FLAG|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+021150|beamCollocation|table|BEAM CO-LOCATION|CODE TABLE|0|0|2|CODE TABLE|0|1
+021151|estimatedErrorInSigma0At40DegreesIncidenceAngle|double|ESTIMATED ERROR IN SIGMA-0 AT 40 DEGREES INCIDENCE ANGLE|dB|2|0|9|dB|2|3
+021152|slopeAt40DegreesIncidenceAngle|double|SLOPE AT 40 DEGREES INCIDENCE ANGLE|dB/deg|2|-80|7|dB/deg|2|2
+021153|estimatedErrorInSlopeAt40DegreesIncidenceAngle|double|ESTIMATED ERROR IN SLOPE AT 40 DEGREES INCIDENCE ANGLE|dB/deg|2|-40|6|dB/deg|2|2
+021154|soilMoistureSensitivity|double|SOIL MOISTURE SENSITIVITY|dB|2|0|12|dB|2|4
+021155|windVectorCellQuality|flag|WIND VECTOR CELL QUALITY|FLAG TABLE|0|0|24|FLAG TABLE|0|8
+021156|backscatterDistance|long|BACKSCATTER DISTANCE|Numeric|1|-4096|13|Numeric|1|4
+021157|lossPerUnitLengthOfAtmosphere|double|LOSS PER UNIT LENGTH OF ATMOSPHERE USED|dB/m|10|0|22|dB/m|10|7
+021158|ascatKpEstimateQuality|table|ASCAT KP ESTIMATE QUALITY|CODE TABLE|0|0|2|CODE TABLE|0|1
+021159|ascatSigma0Usability|table|ASCAT SIGMA-0 USABILITY|CODE TABLE|0|0|2|CODE TABLE|0|1
+021160|ascatUseOfSyntheticData|long|ASCAT USE OF SYNTHETIC DATA|Numeric|3|0|10|Numeric|3|4
+021161|ascatSyntheticDataQuantity|long|ASCAT SYNTHETIC DATA QUANTITY|Numeric|3|0|10|Numeric|3|4
+021162|ascatSatelliteOrbitAndAttitudeQuality|long|ASCAT SATELLITE ORBIT AND ATTITUDE QUALITY|Numeric|3|0|10|Numeric|3|4
+021163|ascatSolarArrayReflectionContamination|long|ASCAT SOLAR ARRAY REFLECTION CONTAMINATION|Numeric|3|0|10|Numeric|3|4
+021164|ascatTelemetryPresenceAndQuality|long|ASCAT TELEMETRY PRESENCE AND QUALITY|Numeric|3|0|10|Numeric|3|4
+021165|ascatExtrapolatedReferenceFunctionPresence|long|ASCAT EXTRAPOLATED REFERENCE FUNCTION PRESENCE|Numeric|3|0|10|Numeric|3|4
+021166|landFraction|long|LAND FRACTION|Numeric|3|0|10|Numeric|3|4
+021167|subsurfaceScatteringProbability|long|SUBSURFACE SCATTERING PROBABILITY|%|0|0|7|%|0|3
+021169|icePresenceIndicator|table|ICE PRESENCE INDICATOR|CODE TABLE|0|0|2|CODE TABLE|0|1
+021170|cBandCorrectedOceanBackscatterCoefficient|double|C BAND CORRECTED OCEAN BACKSCATTER COEFFICIENT|dB|2|-32768|16|dB|2|5
+021171|rmsCBandCorrectedOceanBackscatterCoefficient|double|RMS C BAND CORRECTED OCEAN BACKSCATTER COEFFICIENT|dB|2|-32768|16|dB|2|5
+021172|cBandNetInstrumentalCorrectionForAgc|double|C BAND NET INSTRUMENTAL CORRECTION FOR AGC|dB|2|-2048|12|dB|2|4
+021173|cBandAutomaticGainControl|double|C BAND AUTOMATIC GAIN CONTROL|dB|2|0|13|dB|2|4
+021174|rmsCBandAutomaticGainControl|double|RMS C BAND AUTOMATIC GAIN CONTROL|dB|2|0|9|dB|2|3
+021175|numberOfValidPointsForCBandAutomaticGainControl|long|NUMBER OF VALID POINTS FOR C BAND AUTOMATIC GAIN CONTROL|Numeric|0|0|10|Numeric|0|4
+021176|highFrequencyVariabilityCorrection|double|HIGH FREQUENCY VARIABILITY CORRECTION|m|3|0|16|m|3|5
+021177|correctedOcogBackscatterCoefficient|double|CORRECTED OCOG BACKSCATTER COEFFICIENT|dB|2|0|16|dB|2|5
+021178|stdOf20HzOcogBackscatterCoefficient|double|STD OF 20 HZ OCOG BACKSCATTER COEFFICIENT|dB|2|0|16|dB|2|5
+021179|numberOf20HzValidPointsForOcogBackscatterCoefficient|long|NUMBER OF 20 HZ VALID POINTS FOR OCOG BACKSCATTER COEFFICIENT|Numeric|0|0|16|Numeric|0|5
+021180|numberOf20HzValidPointsForOceanBackscatterCoefficient|long|NUMBER OF 20 HZ VALID POINTS FOR OCEAN BACKSCATTER COEFFICIENT|Numeric|0|0|8|Numeric|0|3
+021181|20HzOceanBackscatterCoefficient|double|20 HZ OCEAN BACKSCATTER COEFFICIENT|dB|2|0|16|dB|2|5
+021182|20HzKuBandPeakiness|long|20 HZ KU BAND PEAKINESS|Numeric|3|0|16|Numeric|3|5
+021183|specificBandCorrectedOceanBackscatterCoefficient|double|SPECIFIC BAND CORRECTED OCEAN BACKSCATTER COEFFICIENT|dB|2|-32768|16|dB|2|5
+021184|stdSpecificBandCorrectedOceanBackscatterCoefficient|double|STD SPECIFIC BAND CORRECTED OCEAN BACKSCATTER COEFFICIENT|dB|2|-32768|16|dB|2|5
+021185|specificBandNetInstrumentalCorrectionForAgc|double|SPECIFIC BAND NET INSTRUMENTAL CORRECTION FOR AGC|dB|2|-2048|12|dB|2|4
+021186|specificBandAutomaticGainControl|double|SPECIFIC BAND AUTOMATIC GAIN CONTROL|dB|2|0|13|dB|2|4
+021187|rmsSpecificBandAutomaticGainControl|double|RMS SPECIFIC BAND AUTOMATIC GAIN CONTROL|dB|2|0|8|dB|2|3
+021188|numberOfValidPointsForSpecificBandAutomaticGainControl|long|NUMBER OF VALID POINTS FOR SPECIFIC BAND AUTOMATIC GAIN CONTROL|Numeric|0|0|7|Numeric|0|3
+021189|correctedOcogBackscatterCoefficientNegativeReference|double|CORRECTED OCOG BACKSCATTER COEFFICIENT (NEGATIVE REFERENCE)|dB|2|-32768|16|dB|2|6
+022001|wavesDirection|long|DIRECTION OF WAVES|deg|0|0|9|deg|0|3
+022002|windWavesDirection|long|DIRECTION OF WIND WAVES|deg|0|0|9|deg|0|3
+022003|swellWavesDirection|long|DIRECTION OF SWELL WAVES|deg|0|0|9|deg|0|3
+022004|currentDirection|long|DIRECTION OF CURRENT|deg|0|0|9|deg|0|3
+022005|seaSurfaceCurrentDirection|long|DIRECTION OF SEA-SURFACE CURRENT|deg|0|0|9|deg|0|3
+022011|periodOfWaves|long|PERIOD OF WAVES|s|0|0|6|s|0|2
+022012|periodOfWindWaves|long|PERIOD OF WIND WAVES|s|0|0|6|s|0|2
+022013|periodOfSwellWaves|long|PERIOD OF SWELL WAVES|s|0|0|6|s|0|2
+022021|heightOfWaves|double|HEIGHT OF WAVES|m|1|0|10|m|1|4
+022022|heightOfWindWaves|double|HEIGHT OF WIND WAVES|m|1|0|10|m|1|4
+022023|heightOfSwellWaves|double|HEIGHT OF SWELL WAVES|m|1|0|10|m|1|4
+022025|standardDeviationWaveHeight|double|STANDARD DEVIATION WAVE HEIGHT|m|2|0|10|m|2|4
+022026|standardDeviationOfSignificantWaveHeight|double|STANDARD DEVIATION OF SIGNIFICANT WAVE HEIGHT|m|2|0|10|m|2|4
+022031|speedOfCurrent|double|SPEED OF CURRENT|m/s|2|0|13|m/s|2|4
+022032|speedOfSeaSurfaceCurrent|double|SPEED OF SEA-SURFACE CURRENT|m/s|2|0|13|m/s|2|4
+022035|tidalElevationWithRespectToLocalChartDatum|double|TIDAL ELEVATION WITH RESPECT TO LOCAL CHART DATUM|m|2|0|14|m|2|4
+022036|meteorologicalResidualTidalElevationSurgeOrOffset|double|METEOROLOGICAL RESIDUAL TIDAL ELEVATION (SURGE OR OFFSET)|m|2|0|14|m|2|4
+022037|tidalElevationWithRespectToNationalLandDatum|double|TIDAL ELEVATION WITH RESPECT TO NATIONAL LAND DATUM|m|3|-10000|15|m|3|5
+022038|tidalElevationWithRespectToLocalChartDatum|double|TIDAL ELEVATION WITH RESPECT TO LOCAL CHART DATUM|m|3|-10000|15|m|3|5
+022039|meteorologicalResidualTidalElevationSurgeOrOffset|double|METEOROLOGICAL RESIDUAL TIDAL ELEVATION (SURGE OR OFFSET)|m|3|-5000|13|m|3|4
+022040|meteorologicalResidualTidalElevationSurgeOrOffset|double|METEOROLOGICAL RESIDUAL TIDAL ELEVATION (SURGE OR OFFSET)|m|3|-5000|14|m|3|5
+022041|seaSurfaceTemperature15DayRunningMean|double|SEA-SURFACE TEMPERATURE (15-DAY RUNNING MEAN)|K|1|0|12|K|1|4
+022042|oceanographicWaterTemperature|double|SEA/WATER TEMPERATURE|K|1|0|12|K|1|4
+022043|oceanographicWaterTemperature|double|SEA/WATER TEMPERATURE|K|2|0|15|K|2|5
+022044|soundVelocity|double|SOUND VELOCITY|m/s|1|0|14|m/s|1|5
+022045|oceanographicWaterTemperature|double|SEA/WATER TEMPERATURE|K|3|0|19|K|3|6
+022046|seaIceFraction|long|SEA ICE FRACTION|Numeric|2|0|7|Numeric|2|3
+022049|seaSurfaceTemperature|double|SEA-SURFACE TEMPERATURE|K|2|0|15|K|2|5
+022050|standardDeviationSeaSurfaceTemperature|double|STANDARD DEVIATION SEA-SURFACE TEMPERATURE|K|2|0|8|K|2|3
+022055|floatCycleNumber|long|FLOAT CYCLE NUMBER|Numeric|0|0|10|Numeric|0|3
+022056|directionOfProfile|table|DIRECTION OF PROFILE|CODE TABLE|0|0|2|CODE TABLE|0|1
+022059|seaSurfaceSalinity|double|SEA-SURFACE SALINITY|0/00|2|0|14|0/00|2|5
+022060|lagrangianDrifterDrogueStatus|table|LAGRANGIAN DRIFTER DROGUE STATUS|CODE TABLE|0|0|3|CODE TABLE|0|1
+022061|seaState|table|STATE OF THE SEA|CODE TABLE|0|0|4|CODE TABLE|0|2
+022062|salinity|double|SALINITY|0/00|2|0|14|0/00|2|5
+022063|totalWaterDepth|long|TOTAL WATER DEPTH|m|0|0|14|m|0|5
+022064|salinity|double|SALINITY|0/00|3|0|17|0/00|3|6
+022065|oceanographicWaterPressure|long|WATER PRESSURE|Pa|-3|0|17|Pa|-3|6
+022066|oceanographicWaterConductivity|double|WATER CONDUCTIVITY|S/m|6|0|26|S/m|6|8
+022067|instrumentTypeForWaterTemperatureOrSalinityProfileMeasurement|table|INSTRUMENT TYPE FOR WATER TEMPERATURE/SALINITY PROFILE MEASUREMENT|CODE TABLE|0|0|10|CODE TABLE|0|4
+022068|waterTemperatureProfileRecorderTypes|table|WATER TEMPERATURE PROFILE RECORDER TYPES|CODE TABLE|0|0|7|CODE TABLE|0|3
+022069|spectralWaveDensity|double|SPECTRAL WAVE DENSITY|m2/Hz|3|0|22|m2/Hz|3|7
+022070|significantWaveHeight|double|SIGNIFICANT WAVE HEIGHT|m|2|0|13|m|2|4
+022071|spectralPeakWavePeriod|double|SPECTRAL PEAK WAVE PERIOD|s|1|0|9|s|1|3
+022072|spectralPeakWaveLength|long|SPECTRAL PEAK WAVELENGTH|m|0|0|13|m|0|4
+022073|maximumWaveHeight|double|MAXIMUM WAVE HEIGHT|m|2|0|13|m|2|4
+022074|averageWavePeriod|double|AVERAGE WAVE PERIOD|s|1|0|9|s|1|3
+022075|averageWaveLength|long|AVERAGE WAVELENGTH|m|0|0|13|m|0|4
+022076|directionFromWhichDominantWavesAreComing|long|DIRECTION FROM WHICH DOMINANT WAVES ARE COMING|deg|0|0|9|deg|0|3
+022077|directionalSpreadOfDominantWave|long|DIRECTIONAL SPREAD OF DOMINANT WAVE|deg|0|0|9|deg|0|3
+022078|durationOfWaveRecord|long|DURATION OF WAVE RECORD|s|0|0|12|s|0|4
+022079|lengthOfWaveRecord|long|LENGTH OF WAVE RECORD|m|0|0|16|m|0|5
+022080|wavebandCentralFrequency|double|WAVEBAND CENTRAL FREQUENCY|Hz|3|0|10|Hz|3|4
+022081|wavebandCentralWaveNumber|double|WAVEBAND CENTRAL WAVE NUMBER|/m|5|0|13|/m|5|4
+022082|maximumNonDirectionalSpectralWaveDensity|double|MAXIMUM NON-DIRECTIONAL SPECTRAL WAVE DENSITY|m2 s|2|0|20|m2 s|2|7
+022083|maximumNonDirectionalSpectralWaveNumber|double|MAXIMUM NON-DIRECTIONAL SPECTRAL WAVE NUMBER|m3|2|0|20|m3|2|7
+022084|bandContainingMaximumNonDirectionalSpectralWaveDensity|long|BAND CONTAINING MAXIMUM NON-DIRECTIONAL SPECTRAL WAVE DENSITY|Numeric|0|0|7|Numeric|0|3
+022085|spectralWaveDensityRatio|long|SPECTRAL WAVE DENSITY RATIO|Numeric|0|0|7|Numeric|0|3
+022086|meanDirectionFromWhichWavesAreComing|long|MEAN DIRECTION FROM WHICH WAVES ARE COMING|deg|0|0|9|deg|0|3
+022087|principalDirectionFromWhichWavesAreComing|long|PRINCIPAL DIRECTION FROM WHICH WAVES ARE COMING|deg|0|0|9|deg|0|3
+022088|firstNormalizedPolarCoordinateFromFourierCoefficients|long|FIRST NORMALIZED POLAR COORDINATE FROM FOURIER COEFFICIENTS|Numeric|2|0|7|Numeric|2|3
+022089|secondNormalizedPolarCoordinateFromFourierCoefficients|long|SECOND NORMALIZED POLAR COORDINATE FROM FOURIER COEFFICIENTS|Numeric|2|0|7|Numeric|2|3
+022090|nonDirectionalSpectralEstimateByWaveFrequency|double|NON-DIRECTIONAL SPECTRAL ESTIMATE BY WAVE FREQUENCY|m2 s|2|0|20|m2 s|2|7
+022091|nonDirectionalSpectralEstimateByWaveNumber|double|NON-DIRECTIONAL SPECTRAL ESTIMATE BY WAVE NUMBER|m3|2|0|20|m3|2|7
+022092|directionalSpectralEstimateByWaveFrequency|double|DIRECTIONAL SPECTRAL ESTIMATE BY WAVE FREQUENCY|m2 rad-1 s|2|0|20|m2 rad-1 s|2|7
+022093|directionalSpectralEstimateByWaveNumber|double|DIRECTIONAL SPECTRAL ESTIMATE BY WAVE NUMBER|m4|2|0|20|m4|2|7
+022094|totalNumberOfWaveBands|long|TOTAL NUMBER OF WAVE BANDS|Numeric|0|0|7|Numeric|0|3
+022095|directionalSpreadOfIndividualWaves|long|DIRECTIONAL SPREAD OF INDIVIDUAL WAVES|deg|0|0|8|deg|0|3
+022096|spectralBandWidth|double|SPECTRAL BAND WIDTH|/s|3|0|4|/s|3|2
+022097|meanWavelength731MOfImageSpectrumAtLowWaveNumbers|long|MEAN WAVELENGTH > 731 M OF IMAGE SPECTRUM AT LOW WAVE NUMBERS|m|0|0|14|m|0|5
+022098|wavelengthSpreadWavelength731MAtLowWaveNumbers|long|WAVELENGTH SPREAD (WAVELENGTH > 731 M) AT LOW WAVE NUMBERS|m|0|0|14|m|0|5
+022099|meanDirectionAtLowWaveNumbersWavelength731M|long|MEAN DIRECTION AT LOW WAVE NUMBERS (WAVELENGTH > 731 M)|deg|0|0|9|deg|0|3
+022100|directionSpreadAtLowWaveNumbersWavelength731M|long|DIRECTION SPREAD AT LOW WAVE NUMBERS (WAVELENGTH > 731 M)|deg|0|0|9|deg|0|3
+022101|totalEnergyWavelength731mAtLowWaveNumbers|long|TOTAL ENERGY (WAVELENGTH > 731M) AT LOW WAVE NUMBERS|Numeric|0|0|31|Numeric|0|10
+022102|scaledMaximumNonDirectionalSpectralWaveDensityByFrequency|long|SCALED MAXIMUM NON-DIRECTIONAL SPECTRAL WAVE DENSITY BY FREQUENCY|m2 s|0|0|14|m2 s|0|5
+022103|scaledMaximumNonDirectionalSpectralWaveDensityByWavenumber|long|SCALED MAXIMUM NON-DIRECTIONAL SPECTRAL WAVE DENSITY BY WAVE NUMBER|m3|0|0|14|m3|0|5
+022104|scaledNonDirectionalSpectralWaveDensityByFrequency|long|SCALED NON-DIRECTIONAL SPECTRAL WAVE DENSITY BY FREQUENCY|m2 s|0|0|14|m2 s|0|5
+022105|scaledNonDirectionalSpectralWaveDensityByWavenumber|long|SCALED NON-DIRECTIONAL SPECTRAL WAVE DENSITY BY WAVE NUMBER|m3|0|0|14|m3|0|5
+022106|scaledDirectionalSpectralWaveDensityByFrequency|long|SCALED DIRECTIONAL SPECTRAL WAVE DENSITY BY FREQUENCY|m2 rad-1 s|0|0|14|m2 rad-1 s|0|5
+022107|scaledDirectionalSpectralWaveDensityByWavenumber|long|SCALED DIRECTIONAL SPECTRAL WAVE DENSITY BY WAVE NUMBER|m4|0|0|14|m4|0|5
+022108|spectralWaveDensityRatio|long|SPECTRAL WAVE DENSITY RATIO|%|0|0|7|%|0|3
+022120|tideStationAutomatedWaterLevelCheck|table|TIDE STATION AUTOMATED WATER LEVEL CHECK|CODE TABLE|0|0|5|CODE TABLE|0|2
+022121|tideStationManualWaterLevelCheck|table|TIDE STATION MANUAL WATER LEVEL CHECK|CODE TABLE|0|0|5|CODE TABLE|0|2
+022122|automatedMeteorologicalDataCheck|table|TIDE STATION AUTOMATED METEOROLOGICAL DATA CHECK|CODE TABLE|0|0|5|CODE TABLE|0|2
+022123|tideStationManualMeteorologicalDataCheck|table|TIDE STATION MANUAL METEOROLOGICAL DATA CHECK|CODE TABLE|0|0|5|CODE TABLE|0|2
+022130|numberOfValidPointsForSpecificBand|long|NUMBER OF VALID POINTS FOR SPECIFIC BAND|Numeric|0|0|10|Numeric|0|4
+022131|rmsSpecificBandSignificantWaveHeight|double|RMS SPECIFIC BAND SIGNIFICANT WAVE HEIGHT|m|3|0|16|m|3|5
+022132|numberOfValidPointsForSpecificBandSignificantWaveHeight|long|NUMBER OF VALID POINTS FOR SPECIFIC BAND SIGNIFICANT WAVE HEIGHT|Numeric|0|0|10|Numeric|0|4
+022133|specificBandNetInstrumentCorrectionForSignificantWaveHeight|double|SPECIFIC BAND NET INSTRUMENT CORRECTION FOR SIGNIFICANT WAVE HEIGHT|m|3|-1000|11|m|3|4
+022134|numberOfValidPointsForSpecificBandBackscatter|long|NUMBER OF VALID POINTS FOR SPECIFIC BAND BACKSCATTER|Numeric|0|0|10|Numeric|0|4
+022141|seaSurfaceTemperature15DayRunningMean|double|SEA-SURFACE TEMPERATURE (15-DAY RUNNING MEAN)|K|2|0|15|K|2|5
+022142|squareOfSignificantWaveHeight|double|SQUARE OF SIGNIFICANT WAVE HEIGHT|m2|3|-33554432|26|m2|3|8
+022143|stdOf20HzSwhSquared|double|STD OF 20 HZ SWH SQUARED|m2|3|-8388608|24|m2|3|8
+022144|numberOf20HzValidPointsForSwhSquared|long|NUMBER OF 20 HZ VALID POINTS FOR SWH SQUARED|Numeric|0|0|9|Numeric|0|3
+022145|stdOf20HzOceanRange|double|STD OF 20 HZ OCEAN RANGE|m|3|-33554432|31|m|3|10
+022146|ocogRange|double|OCOG RANGE|m|3|0|31|m|3|10
+022147|stdOf20HzOcogRange|double|STD OF 20 HZ OCOG RANGE|m|3|-8388608|31|m|3|10
+022148|numberOf20HzValidPointsForOceanRange|long|NUMBER OF 20 HZ VALID POINTS FOR OCEAN RANGE|Numeric|0|0|9|Numeric|0|3
+022149|20HzSignificantWaveHeightSquared|double|20 HZ SIGNIFICANT WAVE HEIGHT SQUARED|m2|3|-33554432|26|m2|3|8
+022150|numberOf18HzValidPointsForKuBand|long|NUMBER OF 18 HZ VALID POINTS FOR KU BAND|Numeric|0|0|10|Numeric|0|4
+022151|kuBandOceanRange|double|KU BAND OCEAN RANGE|m|3|0|31|m|3|10
+022152|stdOf18HzKuBandOceanRange|double|STD OF 18 HZ KU BAND OCEAN RANGE|m|3|0|16|m|3|5
+022153|numberOf18HzValidPointsForSBand|long|NUMBER OF 18 HZ VALID POINTS FOR S BAND|Numeric|0|0|10|Numeric|0|4
+022154|sBandOceanRange|double|S BAND OCEAN RANGE|m|3|0|31|m|3|10
+022155|stdOf18HzSBandOceanRange|double|STD OF 18 HZ S BAND OCEAN RANGE|m|3|0|16|m|3|5
+022156|kuBandSignificantWaveHeight|double|KU BAND SIGNIFICANT WAVE HEIGHT|m|3|0|16|m|3|5
+022157|stdOf18HzKuBandOceanRange|double|STD OF 18 HZ KU BAND OCEAN RANGE|m|3|0|16|m|3|5
+022158|sBandSignificantWaveHeight|double|S BAND SIGNIFICANT WAVE HEIGHT|m|3|0|16|m|3|5
+022159|stdOf18HzSBandSignificantWaveHeight|double|STD OF 18 HZ S BAND SIGNIFICANT WAVE HEIGHT|m|3|0|16|m|3|5
+022160|normalizedInverseWaveAge|long|NORMALIZED INVERSE WAVE AGE|Numeric|6|0|21|Numeric|6|7
+022161|waveSpectra|double|WAVE SPECTRA|m4|4|0|27|m4|4|9
+022162|rmsOf20HzKuBandOceanRange|double|RMS OF 20 HZ KU BAND OCEAN RANGE|m|3|0|16|m|3|5
+022163|numberOf20HzValidPointsForKuBand|long|NUMBER OF 20 HZ VALID POINTS FOR KU BAND|Numeric|0|0|10|Numeric|0|4
+022164|rms20HzKuBandSignificantWaveHeight|double|RMS 20 HZ KU BAND SIGNIFICANT WAVE HEIGHT|m|3|0|16|m|3|5
+022165|numberOf20HzValidPointsForKuBandSignificantWaveHeight|long|NUMBER OF 20 HZ VALID POINTS FOR KU BAND SIGNIFICANT WAVE HEIGHT|Numeric|0|0|10|Numeric|0|4
+022166|kuBandNetInstrumentalCorrectionForSignificantWaveHeight|double|KU BAND NET INSTRUMENTAL CORRECTION FOR SIGNIFICANT WAVE HEIGHT|m|3|-1000|11|m|3|4
+022167|numberOfValidPointsForKuBandBackscatter|long|NUMBER OF VALID POINTS FOR KU BAND BACKSCATTER|Numeric|0|0|10|Numeric|0|4
+022168|cBandOceanRange|double|C BAND OCEAN RANGE|m|3|0|31|m|3|10
+022169|rmsOfCBandOceanRange|double|RMS OF C BAND OCEAN RANGE|m|3|0|16|m|3|5
+022170|numberOf20HzValidPointsForCBand|long|NUMBER OF 20 HZ VALID POINTS FOR C BAND|Numeric|0|0|10|Numeric|0|4
+022171|cBandSignificantWaveHeight|double|C BAND SIGNIFICANT WAVE HEIGHT|m|3|0|16|m|3|5
+022172|rms20HzCBandSignificantWaveHeight|double|RMS 20 HZ C BAND SIGNIFICANT WAVE HEIGHT|m|3|0|16|m|3|5
+022173|numberOf20HzValidPointsForCBandSignificantWaveHeight|long|NUMBER OF 20 HZ VALID POINTS FOR C BAND SIGNIFICANT WAVE HEIGHT|Numeric|0|0|10|Numeric|0|4
+022174|cBandNetInstrumentalCorrectionForSignificantWaveHeight|double|C BAND NET INSTRUMENTAL CORRECTION FOR SIGNIFICANT WAVE HEIGHT|m|3|-1000|11|m|3|4
+022175|numberOfValidPointsForCBandBackscatter|long|NUMBER OF VALID POINTS FOR C BAND BACKSCATTER|Numeric|0|0|10|Numeric|0|4
+022177|heightOfXbtOrXctdLauncher|long|HEIGHT OF XBT/XCTD LAUNCHER|m|0|0|6|m|0|3
+022178|xbtOrXctdLauncherType|table|XBT/XCTD LAUNCHER TYPE|CODE TABLE|0|0|8|CODE TABLE|0|3
+022179|specificBandSignificantWaveHeightNegativeReference|double|SPECIFIC BAND SIGNIFICANT WAVE HEIGHT (NEGATIVE REFERENCE)|m|3|-500|16|m|3|6
+022182|waterColumnHeight|double|WATER COLUMN HEIGHT|m|3|0|23|m|3|7
+022184|waterColumnHeightDeviationFromReferenceValue|double|WATER COLUMN HEIGHT DEVIATION FROM THE REFERENCE VALUE|m|3|-2000|12|m|3|4
+022185|bprTransmissionCount|long|BPR TRANSMISSION COUNT|Numeric|0|0|10|Numeric|0|3
+022186|directionFromWhichWavesAreComing|long|DIRECTION FROM WHICH WAVES ARE COMING|deg|0|0|9|deg|0|3
+022187|directionalSpreadOfWaves|long|DIRECTIONAL SPREAD OF WAVE|deg|0|0|9|deg|0|3
+022188|oceanographicDissolvedOxygen|double|DISSOLVED OXYGEN|umol/kg|3|0|19|umol/kg|3|6
+022189|specificBandOceanRange|double|SPECIFIC BAND OCEAN RANGE|m|3|0|31|m|3|10
+022190|specificBandSignificantWaveHeight|double|SPECIFIC BAND SIGNIFICANT WAVE HEIGHT|m|3|0|16|m|3|5
+022191|rmsOfSpecificBandOceanRange|double|RMS OF SPECIFIC BAND OCEAN RANGE|m|4|0|16|m|4|5
+023001|accidentEarlyNotificationArticleApplicable|table|ACCIDENT EARLY NOTIFICATION - ARTICLE APPLICABLE|CODE TABLE|0|0|3|CODE TABLE|0|1
+023002|facilityInvolvedInIncident|table|ACTIVITY OR FACILITY INVOLVED IN INCIDENT|CODE TABLE|0|0|5|CODE TABLE|0|2
+023003|releaseType|table|TYPE OF RELEASE|CODE TABLE|0|0|3|CODE TABLE|0|1
+023004|countermeasuresTakenNearBorder|table|COUNTERMEASURES TAKEN NEAR BORDER|CODE TABLE|0|0|3|CODE TABLE|0|1
+023005|causeOfIncident|table|CAUSE OF INCIDENT|CODE TABLE|0|0|2|CODE TABLE|0|1
+023006|incidentSituation|table|INCIDENT SITUATION|CODE TABLE|0|0|3|CODE TABLE|0|1
+023007|characteristicsOfRelease|table|CHARACTERISTICS OF RELEASE|CODE TABLE|0|0|3|CODE TABLE|0|1
+023008|stateOfCurrentRelease|table|STATE OF CURRENT RELEASE|CODE TABLE|0|0|2|CODE TABLE|0|1
+023009|stateOfExpectedRelease|table|STATE OF EXPECTED RELEASE|CODE TABLE|0|0|2|CODE TABLE|0|1
+023016|possibilityOfSignificantChemicalToxicHealthEffect|table|POSSIBILITY OF SIGNIFICANT CHEMICAL TOXIC HEALTH EFFECT|CODE TABLE|0|0|2|CODE TABLE|0|1
+023017|flowDischargeOfMajorRecipient|double|FLOW DISCHARGE OF MAJOR RECIPIENT|m3/s|6|0|20|m3/s|6|7
+023018|releaseBehaviourOverTime|table|RELEASE BEHAVIOUR OVER TIME|CODE TABLE|0|0|3|CODE TABLE|0|1
+023019|actualReleaseHeight|long|ACTUAL RELEASE HEIGHT|m|0|-15000|17|m|0|6
+023021|effectiveReleaseHeight|long|EFFECTIVE RELEASE HEIGHT|m|0|-15000|17|m|0|6
+023022|distanceOfReleasePointOrSiteOfIncident|long|DISTANCE OF RELEASE POINT OR SITE OF INCIDENT|m|0|0|24|m|0|8
+023023|mainTransportSpeedInAtmosphere|double|MAIN TRANSPORT SPEED IN THE ATMOSPHERE|m/s|1|0|12|m/s|1|4
+023024|mainTransportSpeedInWater|double|MAIN TRANSPORT SPEED IN WATER|m/s|2|0|13|m/s|2|4
+023025|mainTransportSpeedInGroundWater|double|MAIN TRANSPORT SPEED IN GROUND WATER|m/s|2|0|13|m/s|2|4
+023027|mainTransportDirectionInTheAtmosphere|long|MAIN TRANSPORT DIRECTION IN THE ATMOSPHERE|deg|0|0|9|deg|0|3
+023028|mainTransportDirectionInWater|long|MAIN TRANSPORT DIRECTION IN WATER|deg|0|0|9|deg|0|3
+023029|mainTransportDirectionInGroundWater|long|MAIN TRANSPORT DIRECTION IN GROUND WATER|deg|0|0|9|deg|0|3
+023031|possibilityPlume|table|POSSIBILITY THAT PLUME WILL ENCOUNTER PRECIPITATION IN STATE IN WHICH INCIDENT OCCURRED|CODE TABLE|0|0|2|CODE TABLE|0|1
+023032|plumeWillEncounterChangeInWindDirectionAndOrOrSpeedFlag|table|PLUME WILL ENCOUNTER CHANGE IN WIND DIRECTION AND/OR SPEED FLAG|CODE TABLE|0|0|2|CODE TABLE|0|1
+023040|flowDischargeRiver|double|FLOW DISCHARGE - RIVER|m3/s|1|0|22|m3/s|1|7
+023041|flowDischargeWell|double|FLOW DISCHARGE - WELL|m3/s|3|0|16|m3/s|3|5
+024001|estimateOfAmountOfRadioactivityReleasedUpToSpecifiedTime|long|ESTIMATE OF AMOUNT OF RADIOACTIVITY RELEASED UP TO SPECIFIED TIME|Bq|-11|0|28|Bq|-11|9
+024002|estimatedMaximumPotentialRelease|long|ESTIMATED MAXIMUM POTENTIAL RELEASE|Bq|-11|0|28|Bq|-11|9
+024003|compositionOfRelease|table|COMPOSITION OF RELEASE|CODE TABLE|0|0|5|CODE TABLE|0|2
+024004|elementName|string|ELEMENT NAME|CCITT IA5|0|0|16|Character|0|2
+024005|isotopeMass|long|ISOTOPE MASS|Numeric|0|0|9|Numeric|0|3
+024011|dose|double|DOSE|mSv|2|0|32|mSv|2|10
+024012|trajectoryDoseDefinedLocationAndExpectedTimeOfArrival|double|TRAJECTORY DOSE (DEFINED LOCATION AND EXPECTED TIME OF ARRIVAL)|mSv|2|0|32|mSv|2|10
+024013|gammaDoseInAirAlongMainTransportPathDefinedLocationAndTimePeriod|double|GAMMA DOSE IN AIR ALONG THE MAIN TRANSPORT PATH (DEFINED LOCATION AND TIME PERIOD)|mSv|2|0|32|mSv|2|10
+024014|gammaRadiationDoseRate|double|GAMMA RADIATION DOSE RATE|nSv/h|1|0|14|nSv/h|1|4
+024021|airConcentrationOfNamedIsotopeTypeIncludingGrossBeta|double|AIR CONCENTRATION (OF NAMED ISOTOPE TYPE INCLUDING GROSS BETA)|Bq m-3|2|0|32|Bq m-3|2|10
+024022|concentrationInPrecipitationOfNamedIsotopeType|double|CONCENTRATION IN PRECIPITATION (OF NAMED ISOTOPE TYPE)|Bq/l|2|0|32|Bq/l|2|10
+024023|pulseRateOfBetaRadiation|double|PULSE RATE OF BETA RADIATION|/s|1|0|14|/s|1|4
+024024|pulseRateOfGammaRadiation|double|PULSE RATE OF GAMMA RADIATION|/s|1|0|14|/s|1|4
+025001|rangeGateLength|long|RANGE-GATE LENGTH|m|-1|0|6|m|-1|2
+025002|numberOfGatesAveraged|long|NUMBER OF GATES AVERAGED|Numeric|0|0|4|Numeric|0|2
+025003|numberOfIntegratedPulses|long|NUMBER OF INTEGRATED PULSES|Numeric|0|0|8|Numeric|0|3
+025004|echoProcessing|table|ECHO PROCESSING|CODE TABLE|0|0|2|CODE TABLE|0|1
+025005|echoIntegration|table|ECHO INTEGRATION|CODE TABLE|0|0|2|CODE TABLE|0|1
+025006|zToRConversion|table|Z TO R CONVERSION|CODE TABLE|0|0|3|CODE TABLE|0|1
+025007|zToRConversionFactor|long|Z TO R CONVERSION FACTOR|Numeric|0|0|12|Numeric|0|4
+025008|zToRConversionExponent|long|Z TO R CONVERSION EXPONENT|Numeric|2|0|9|Numeric|2|3
+025009|calibrationMethod|flag|CALIBRATION METHOD|FLAG TABLE|0|0|4|FLAG TABLE|0|2
+025010|clutterTreatment|table|CLUTTER TREATMENT|CODE TABLE|0|0|4|CODE TABLE|0|2
+025011|groundOccultationCorrectionScreening|table|GROUND OCCULTATION CORRECTION (SCREENING)|CODE TABLE|0|0|2|CODE TABLE|0|1
+025012|rangeAttenuationCorrection|table|RANGE ATTENUATION CORRECTION|CODE TABLE|0|0|2|CODE TABLE|0|1
+025013|brightBandCorrection|flag|BRIGHT-BAND CORRECTION|FLAG TABLE|0|0|2|FLAG TABLE|0|1
+025014|azimuthClutterCutOff|long|AZIMUTH CLUTTER CUT-OFF|Numeric|0|0|12|Numeric|0|4
+025015|radomeAttenuationCorrection|flag|RADOME ATTENUATION CORRECTION|FLAG TABLE|0|0|2|FLAG TABLE|0|1
+025016|clearAirAttenuationCorrection|double|CLEAR-AIR ATTENUATION CORRECTION|dB/m|5|0|6|dB/m|5|2
+025017|precipitationAttenuationCorrection|flag|PRECIPITATION ATTENUATION CORRECTION|FLAG TABLE|0|0|2|FLAG TABLE|0|1
+025018|aToZLawForAttenuationFactor|long|A TO Z LAW FOR ATTENUATION FACTOR|Numeric|7|0|6|Numeric|7|2
+025019|aToZLawForAttenuationExponent|long|A TO Z LAW FOR ATTENUATION EXPONENT|Numeric|2|0|7|Numeric|2|3
+025020|meanSpeedEstimation|table|MEAN SPEED ESTIMATION|CODE TABLE|0|0|2|CODE TABLE|0|1
+025021|windComputationEnhancement|flag|WIND COMPUTATION ENHANCEMENT|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+025022|ghrsstRejectionFlag|flag|GHRSST REJECTION FLAG|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+025023|ghrsstConfidenceFlag|flag|GHRSST CONFIDENCE FLAG|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+025024|ghrsstDataQuality|table|GHRSST DATA QUALITY|CODE TABLE|0|0|4|CODE TABLE|0|2
+025025|batteryVoltage|double|BATTERY VOLTAGE|V|1|0|9|V|1|3
+025026|batteryVoltageLargeRange|double|BATTERY VOLTAGE (LARGE RANGE)|V|1|0|12|V|1|4
+025028|operatorOrManufacturerDefinedParameter|long|OPERATOR OR MANUFACTURER DEFINED PARAMETER|Numeric|1|-16384|15|Numeric|1|5
+025029|calibrationMethod|flag|CALIBRATION METHOD|FLAG TABLE|0|0|6|FLAG TABLE|0|2
+025030|runningMeanSeaSurfaceTemperatureUsage|table|RUNNING MEAN SEA-SURFACE TEMPERATURE USAGE|CODE TABLE|0|0|2|CODE TABLE|0|1
+025031|nwpGeneratedVerticalProfileThinningMethod|table|NWP-GENERATED VERTICAL PROFILE THINNING METHOD|CODE TABLE|0|0|3|CODE TABLE|0|1
+025032|windProfilerModeInformation|table|WIND PROFILER MODE INFORMATION|CODE TABLE|0|0|2|CODE TABLE|0|1
+025033|windProfilerSubmodeInformation|table|WIND PROFILER SUBMODE INFORMATION|CODE TABLE|0|0|2|CODE TABLE|0|1
+025034|windProfilerQualityControlTestResults|flag|WIND PROFILER QUALITY CONTROL TEST RESULTS|FLAG TABLE|0|0|4|FLAG TABLE|0|2
+025035|decisionMethodForPolarity|table|DECISION METHOD FOR POLARITY|CODE TABLE|0|0|3|CODE TABLE|0|1
+025036|atmosphericsLocationMethod|table|ATMOSPHERICS LOCATION METHOD|CODE TABLE|0|0|4|CODE TABLE|0|2
+025037|sstBias|double|SST BIAS|K|2|-127|8|K|2|3
+025038|differenceBetweenSstAndAnalysis|double|DIFFERENCE BETWEEN SST AND ANALYSIS|K|1|-127|8|K|1|3
+025040|co2WindProductDerivation|table|CO2 WIND PRODUCT DERIVATION|CODE TABLE|0|0|4|CODE TABLE|0|2
+025041|movingPlatformDirectionReportingMethod|table|MOVING PLATFORM DIRECTION REPORTING METHOD|CODE TABLE|0|0|2|CODE TABLE|0|1
+025042|movingPlatformSpeedReportingMethod|table|MOVING PLATFORM SPEED REPORTING METHOD|CODE TABLE|0|0|2|CODE TABLE|0|1
+025043|waveSamplingIntervalTime|double|WAVE SAMPLING INTERVAL (TIME)|s|4|0|15|s|4|5
+025044|waveSamplingIntervalSpace|double|WAVE SAMPLING INTERVAL (SPACE)|m|2|0|14|m|2|5
+025045|hirsChannelCombination|flag|HIRS CHANNEL COMBINATION|FLAG TABLE|0|0|21|FLAG TABLE|0|7
+025046|msuChannelCombination|flag|MSU CHANNEL COMBINATION|FLAG TABLE|0|0|5|FLAG TABLE|0|2
+025047|ssuChannelCombination|flag|SSU CHANNEL COMBINATION|FLAG TABLE|0|0|4|FLAG TABLE|0|2
+025048|amsuAChannelCombination|flag|AMSU-A CHANNEL COMBINATION|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+025049|amsuBChannelCombination|flag|AMSU-B CHANNEL COMBINATION|FLAG TABLE|0|0|6|FLAG TABLE|0|2
+025050|principalComponentScore|long|PRINCIPAL COMPONENT SCORE|Numeric|4|-131072|18|Numeric|4|6
+025051|avhrrChannelCombination|flag|AVHRR CHANNEL COMBINATION|FLAG TABLE|0|0|7|FLAG TABLE|0|3
+025052|log10OfPrincipalComponentsNormalizedFitToData|long|LOG10 OF PRINCIPAL COMPONENTS NORMALIZED FIT TO DATA|Numeric|4|0|15|Numeric|4|5
+025053|observationQuality|flag|OBSERVATION QUALITY|FLAG TABLE|0|0|12|FLAG TABLE|0|4
+025054|ssmisSubframeIdNumber|long|SSMIS SUBFRAME ID NUMBER|Numeric|0|0|5|Numeric|0|2
+025055|multiplexerHousekeeping|double|MULTIPLEXER HOUSEKEEPING|K|2|0|16|K|2|5
+025056|normalizedErrorEstimateInBackscatterMeasurementKp|long|NORMALIZED ERROR ESTIMATE IN BACKSCATTER MEASUREMENT (KP)|Numeric|4|0|14|Numeric|4|5
+025060|softwareIdentification|long|SOFTWARE IDENTIFICATION|Numeric|0|0|14|Numeric|0|5
+025061|softwareVersionNumber|string|SOFTWARE IDENTIFICATION AND VERSION NUMBER|CCITT IA5|0|0|96|Character|0|12
+025062|databaseIdentification|long|DATABASE IDENTIFICATION|Numeric|0|0|14|Numeric|0|5
+025063|SystemIdentifier|table|CENTRAL PROCESSOR OR SYSTEM IDENTIFIER|CODE TABLE|0|0|8|CODE TABLE|0|3
+025065|orientationCorrectionAzimuth|double|ORIENTATION CORRECTION (AZIMUTH)|deg|2|-1000|11|deg|2|4
+025066|orientationCorrectionElevation|double|ORIENTATION CORRECTION (ELEVATION)|deg|2|-1000|11|deg|2|4
+025067|radiosondeReleasePointPressureCorrection|long|RADIOSONDE RELEASE POINT PRESSURE CORRECTION|Pa|0|-8000|14|Pa|0|4
+025068|numberOfArchiveRecomputes|long|NUMBER OF ARCHIVE RECOMPUTES|Numeric|0|0|7|Numeric|0|3
+025069|flightLevelPressureCorrections|flag|FLIGHT LEVEL PRESSURE CORRECTIONS|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+025070|majorFrameCount|long|MAJOR FRAME COUNT|Numeric|0|0|4|Numeric|0|2
+025071|frameCount|long|FRAME COUNT|Numeric|0|0|5|Numeric|0|2
+025075|satelliteAntennaCorrectionsVersionNumber|long|SATELLITE ANTENNA CORRECTIONS VERSION NUMBER|Numeric|0|0|5|Numeric|0|2
+025076|log10OfTemperatureRadianceCentralWaveNumberForAtovs|double|LOG10 OF (TEMPERATURE-RADIANCE CENTRAL WAVE NUMBER) FOR ATOVS|log (m-1)|8|0|30|log (m-1)|8|10
+025077|bandwidthCorrectionCoefficient1|long|BANDWIDTH CORRECTION COEFFICIENT 1|Numeric|5|-100000|18|Numeric|5|7
+025078|bandwidthCorrectionCoefficient2|long|BANDWIDTH CORRECTION COEFFICIENT 2|Numeric|5|0|17|Numeric|5|6
+025079|albedoRadianceSolarFilteredIrradianceForAtovs|double|ALBEDO-RADIANCE SOLAR FILTERED IRRADIANCE FOR ATOVS|W m-2|4|0|24|W m-2|4|8
+025080|albedoRadianceEquivalentFilterWidthForAtovs|double|ALBEDO-RADIANCE EQUIVALENT FILTER WIDTH FOR ATOVS|m|10|0|14|m|10|5
+025081|incidenceAngle|double|INCIDENCE ANGLE|deg|3|0|17|deg|3|6
+025082|azimuthAngle|double|AZIMUTH ANGLE|deg|3|0|19|deg|3|6
+025083|faradayRotationalAngle|double|FARADAY ROTATIONAL ANGLE|deg|3|0|19|deg|3|6
+025084|geometricRotationalAngle|double|GEOMETRIC ROTATIONAL ANGLE|deg|5|0|26|deg|5|8
+025085|fractionOfClearPixelsInHirsFov|long|FRACTION OF CLEAR PIXELS IN HIRS FOV|Numeric|0|0|7|Numeric|0|3
+025086|depthCorrectionIndicator|table|DEPTH CORRECTION INDICATOR|CODE TABLE|0|0|2|CODE TABLE|0|1
+025090|orbitStateFlag|table|ORBIT STATE FLAG|CODE TABLE|0|0|4|CODE TABLE|0|2
+025091|structureConstantOfRefractionIndexCn2|double|STRUCTURE CONSTANT OF THE REFRACTION INDEX (CN2)|dB|3|-18192|13|dB|3|5
+025092|acousticPropagationVelocity|double|ACOUSTIC PROPAGATION VELOCITY|m/s|2|28000|14|m/s|2|5
+025093|rassComputationCorrection|flag|RASS COMPUTATION CORRECTION|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+025095|altimeterStateFlag|flag|ALTIMETER STATE FLAG|FLAG TABLE|0|0|2|FLAG TABLE|0|1
+025096|radiometerStateFlag|flag|RADIOMETER STATE FLAG|FLAG TABLE|0|0|5|FLAG TABLE|0|2
+025097|threeDimensionalErrorEstimateOfNavigatorOrbit|table|THREE-DIMENSIONAL ERROR ESTIMATE OF THE NAVIGATOR ORBIT|CODE TABLE|0|0|4|CODE TABLE|0|2
+025098|altimeterDataQualityFlag|flag|ALTIMETER DATA QUALITY FLAG|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+025099|altimeterCorrectionQualityFlag|flag|ALTIMETER CORRECTION QUALITY FLAG|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+025100|xbtOrXctdFallRateEquationCoefficientA|long|XBT/XCTD FALL RATE EQUATION COEFFICIENT A|Numeric|5|0|20|Numeric|5|6
+025101|xbtOrXctdFallRateEquationCoefficientB|long|XBT/XCTD FALL RATE EQUATION COEFFICIENT B|Numeric|5|-500000|21|Numeric|5|6
+025102|numberOfMissingLinesExcludingDataGaps|long|NUMBER OF MISSING LINES EXCLUDING DATA GAPS|Numeric|0|0|8|Numeric|0|3
+025103|numberOfDirectionalBins|long|NUMBER OF DIRECTIONAL BINS|Numeric|0|0|8|Numeric|0|3
+025104|numberOfWavelengthBins|long|NUMBER OF WAVELENGTH BINS|Numeric|0|0|8|Numeric|0|3
+025105|firstDirectionalBin|double|FIRST DIRECTIONAL BIN|deg|3|0|19|deg|3|6
+025106|directionalBinStep|double|DIRECTIONAL BIN STEP|deg|3|0|19|deg|3|6
+025107|firstWavelengthBin|double|FIRST WAVELENGTH BIN|m|3|0|29|m|3|9
+025108|lastWavelengthBin|double|LAST WAVELENGTH BIN|m|3|0|29|m|3|9
+025110|imageProcessingSummary|flag|IMAGE PROCESSING SUMMARY|FLAG TABLE|0|0|10|FLAG TABLE|0|4
+025111|numberOfInputDataGaps|long|NUMBER OF INPUT DATA GAPS|Numeric|0|0|8|Numeric|0|3
+025112|bandSpecificAltimeterDataQualityFlag|flag|BAND SPECIFIC ALTIMETER DATA QUALITY FLAG|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+025113|bandSpecificAltimeterCorrectionQualityFlag|flag|BAND SPECIFIC ALTIMETER CORRECTION QUALITY FLAG|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+025120|ra2L2ProcessingFlag|table|RA2-L2-PROCESSING FLAG|CODE TABLE|0|0|2|CODE TABLE|0|1
+025121|ra2L2ProcessingQuality|long|RA2-L2-PROCESSING QUALITY|%|0|0|7|%|0|3
+025122|hardwareConfigurationForRf|table|HARDWARE CONFIGURATION FOR RF|CODE TABLE|0|0|2|CODE TABLE|0|1
+025123|hardwareConfigurationForHpa|table|HARDWARE CONFIGURATION FOR HPA|CODE TABLE|0|0|2|CODE TABLE|0|1
+025124|mwrL2ProcessingFlag|table|MWR-L2-PROCESSING FLAG|CODE TABLE|0|0|2|CODE TABLE|0|1
+025125|mwrL2ProcessingQuality|long|MWR-L2-PROCESSING QUALITY|%|0|0|7|%|0|3
+025126|modelDryTroposphericCorrection|double|MODEL DRY TROPOSPHERIC CORRECTION|m|3|-32768|16|m|3|5
+025127|invertedBarometerCorrection|double|INVERTED BAROMETER CORRECTION|m|3|-32768|16|m|3|5
+025128|modelWetTroposphericCorrection|double|MODEL WET TROPOSPHERIC CORRECTION|m|3|-32768|16|m|3|5
+025129|mwrDerivedWetTroposphericCorrection|double|MWR DERIVED WET TROPOSPHERIC CORRECTION|m|3|-32768|16|m|3|5
+025130|ra2IonosphericCorrectionOnKuBand|double|RA2 IONOSPHERIC CORRECTION ON KU BAND|m|3|-32768|16|m|3|5
+025131|ionosphericCorrectionFromDorisOnKuBand|double|IONOSPHERIC CORRECTION FROM DORIS ON KU BAND|m|3|-32768|16|m|3|5
+025132|ionosphericCorrectionFromModelOnKuBand|double|IONOSPHERIC CORRECTION FROM MODEL ON KU BAND|m|3|-32768|16|m|3|5
+025133|seaStateBiasCorrectionOnKuBand|double|SEA STATE BIAS CORRECTION ON KU BAND|m|3|-32768|16|m|3|5
+025134|ra2IonosphericCorrectionOnSBand|double|RA2 IONOSPHERIC CORRECTION ON S BAND|m|3|-32768|16|m|3|5
+025135|ionosphericCorrectionFromDorisOnSBand|double|IONOSPHERIC CORRECTION FROM DORIS ON S BAND|m|3|-32768|16|m|3|5
+025136|ionosphericCorrectionFromModelOnSBand|double|IONOSPHERIC CORRECTION FROM MODEL ON S BAND|m|3|-32768|16|m|3|5
+025137|seaStateBiasCorrectionOnSBand|double|SEA STATE BIAS CORRECTION ON S BAND|m|3|-32768|16|m|3|5
+025138|averageSignalToNoiseRatio|long|AVERAGE SIGNAL-TO-NOISE RATIO|Numeric|0|-2048|12|Numeric|0|4
+025139|processingLevel|long|PROCESSING LEVEL|Numeric|0|0|5|Numeric|0|4
+025140|startChannel|long|START CHANNEL|Numeric|0|0|14|Numeric|0|5
+025141|endChannel|long|END CHANNEL|Numeric|0|0|14|Numeric|0|5
+025142|channelScaleFactor|long|CHANNEL SCALE FACTOR|Numeric|0|0|6|Numeric|0|2
+025143|linearCoefficient|long|LINEAR COEFFICIENT|Numeric|6|-5000000|24|Numeric|6|8
+025144|numberOfVisualChannelsUsedInProcessing|long|NUMBER OF VISUAL CHANNELS USED IN PROCESSING|Numeric|0|0|6|Numeric|0|2
+025145|numberOfInfraredChannelsUsedInProcessing|long|NUMBER OF INFRARED CHANNELS USED IN PROCESSING|Numeric|0|0|6|Numeric|0|2
+025148|coefficientOfVariation|long|COEFFICIENT OF VARIATION|Numeric|2|-10000|15|Numeric|2|5
+025149|optimalEstimationCost|long|OPTIMAL ESTIMATION COST|Numeric|0|0|8|Numeric|0|3
+025150|methodOfTropicalCycloneIntensityAnalysisUsingSatelliteData|table|METHOD OF TROPICAL CYCLONE INTENSITY ANALYSIS USING SATELLITE DATA|CODE TABLE|0|0|4|CODE TABLE|0|2
+025160|kuBandNetInstrumentalCorrection|double|KU BAND NET INSTRUMENTAL CORRECTION|m|4|-120000|18|m|4|6
+025161|cBandNetInstrumentalCorrection|double|C BAND NET INSTRUMENTAL CORRECTION|m|4|-120000|18|m|4|6
+025162|seaStateBiasCorrectionOnCBand|double|SEA STATE BIAS CORRECTION ON C BAND|m|4|-6000|13|m|4|4
+025163|altimeterIonosphericCorrectionOnKuBand|double|ALTIMETER IONOSPHERIC CORRECTION ON KU BAND|m|3|-32768|16|m|3|5
+025164|radiometerWetTroposphericCorrection|double|RADIOMETER WET TROPOSPHERIC CORRECTION|m|4|-5000|13|m|4|4
+025165|ionosphericCorrectionFromModelOnSpecificBand|double|IONOSPHERIC CORRECTION FROM MODEL ON SPECIFIC BAND|m|4|-32768|16|m|4|5
+025166|seaStateBiasCorrectionOnSpecificBand|double|SEA STATE BIAS CORRECTION ON SPECIFIC BAND|m|4|-32768|16|m|4|5
+025167|specificBandNetInstrumentalCorrection|double|SPECIFIC BAND NET INSTRUMENTAL CORRECTION|m|4|-120000|18|m|4|6
+025170|samplingIntervalTime|long|SAMPLING INTERVAL (TIME)|s|0|0|10|s|0|4
+025171|sampleAveragingPeriod|long|SAMPLE AVERAGING PERIOD|s|0|0|10|s|0|4
+025172|numberOfSamples|long|NUMBER OF SAMPLES|Numeric|0|0|10|Numeric|0|4
+025174|smosInformationFlag|flag|SMOS INFORMATION FLAG|FLAG TABLE|0|0|14|FLAG TABLE|0|5
+025175|modifiedResidual|long|MODIFIED RESIDUAL|Numeric|2|0|13|Numeric|2|4
+025180|lrmPercent|double|LRM PER CENT|%|2|0|16|%|2|5
+025181|l2ProcessingFlag|table|L2 PROCESSING FLAG|CODE TABLE|0|0|2|CODE TABLE|0|1
+025182|l1ProcessingFlag|table|L1 PROCESSING FLAG|CODE TABLE|0|0|2|CODE TABLE|0|1
+025183|l1ProcessingQuality|double|L1 PROCESSING QUALITY|%|2|0|14|%|2|5
+025184|l2ProductStatus|table|L2 PRODUCT STATUS|CODE TABLE|0|0|2|CODE TABLE|0|1
+025185|encryptionMethod|table|ENCRYPTION METHOD|CODE TABLE|0|0|8|CODE TABLE|0|3
+025186|encryptionKeyVersion|string|ENCRYPTION KEY VERSION|CCITT IA5|0|0|96|Character|0|12
+025187|confidenceFlag|table|CONFIDENCE FLAG|CODE TABLE|0|0|4|CODE TABLE|0|2
+025188|methodForReducingPressureToSeaLevel|table|METHOD FOR REDUCING PRESSURE TO SEA LEVEL|CODE TABLE|0|0|5|CODE TABLE|0|2
+025189|rangeCutOffWavelength|long|RANGE CUT-OFF WAVELENGTH|m|0|1|9|m|0|3
+025190|altimeterEchoProcessingMode|table|ALTIMETER ECHO PROCESSING MODE|CODE TABLE|0|0|8|CODE TABLE|0|3
+025191|altimeterTrackingMode|table|ALTIMETER TRACKING MODE|CODE TABLE|0|0|8|CODE TABLE|0|3
+026001|principalTimeOfDailyReadingInUtcOfMaximumTemperature|double|PRINCIPAL TIME OF DAILY READING IN UTC OF MAXIMUM TEMPERATURE|h|1|0|12|h|1|3
+026002|principalTimeOfDailyReadingInUtcOfMinimumTemperature|double|PRINCIPAL TIME OF DAILY READING IN UTC OF MINIMUM TEMPERATURE|h|1|0|12|h|1|3
+026003|timeDifference|long|TIME DIFFERENCE|min|0|-1440|12|min|0|4
+026010|hoursIncluded|flag|HOURS INCLUDED|FLAG TABLE|0|0|26|FLAG TABLE|0|9
+026020|durationOfPrecipitation|long|DURATION OF PRECIPITATION|min|0|0|11|min|0|4
+026021|nonCoordinateYear|long|YEAR|a|0|0|12|a|0|4
+026022|nonCoordinateMonth|long|MONTH|mon|0|0|4|mon|0|2
+026023|nonCoordinateDay|long|DAY|d|0|0|6|d|0|2
+026030|measurementIntegrationTime|double|MEASUREMENT INTEGRATION TIME|s|2|0|8|s|2|3
+027001|nonCoordinateLatitude|double|LATITUDE (HIGH ACCURACY)|deg|5|-9000000|25|deg|5|7
+027002|nonCoordinateLatitude|double|LATITUDE (COARSE ACCURACY)|deg|2|-9000|15|deg|2|4
+027003|alternateLatitude|double|ALTERNATE LATITUDE (COARSE ACCURACY)|deg|2|-9000|15|deg|2|4
+027004|alternateLatitude|double|ALTERNATE LATITUDE (HIGH ACCURACY)|deg|5|-9000000|25|deg|5|7
+027010|footprintAxis1|long|FOOTPRINT AXIS 1|m|-1|0|14|m|-1|5
+027020|satelliteLocationCounter|long|SATELLITE LOCATION COUNTER|Numeric|0|0|16|Numeric|0|5
+027021|satelliteSublocationDimension|long|SATELLITE SUBLOCATION DIMENSION|Numeric|0|0|16|Numeric|0|5
+027031|DistanceFromEarthCentreInDirectionOf0DegreesLongitude|double|IN DIRECTION OF 0 DEGREES LONGITUDE, DISTANCE FROM THE EARTH'S CENTRE|m|2|-1073741824|31|m|2|10
+027079|horizontalWidthOfSampledVolume|long|HORIZONTAL WIDTH OF SAMPLED VOLUME|m|0|0|18|m|0|6
+027080|viewingAzimuthAngle|double|VIEWING AZIMUTH ANGLE|deg|2|0|16|deg|0|5
+028001|nonCoordinateLongitude|double|LONGITUDE (HIGH ACCURACY)|deg|5|-18000000|26|deg|5|8
+028002|nonCoordinateLongitude|double|LONGITUDE (COARSE ACCURACY)|deg|2|-18000|16|deg|2|5
+028003|alternateLongitude|double|ALTERNATE LONGITUDE (COARSE ACCURACY)|deg|2|-18000|16|deg|2|5
+028004|alternateLongitude|double|ALTERNATE LONGITUDE (HIGH ACCURACY)|deg|5|-18000000|26|deg|5|8
+028010|footprintAxis2|long|FOOTPRINT AXIS 2|m|-1|0|14|m|-1|5
+028031|DistanceFromEarthCentreInDirection90DegreesEast|double|IN DIRECTION 90 DEGREES EAST, DISTANCE FROM THE EARTH'S CENTRE|m|2|-1073741824|31|m|2|10
+029001|projectionType|table|PROJECTION TYPE|CODE TABLE|0|0|3|CODE TABLE|0|1
+029002|coordinateGridType|table|COORDINATE GRID TYPE|CODE TABLE|0|0|3|CODE TABLE|0|1
+029014|optionalListOfParametersForAnExternalMapProjectionLibrary|string|OPTIONAL LIST OF PARAMETERS FOR AN EXTERNAL MAP PROJECTION LIBRARY|CCITT IA5|0|0|504|Character|0|63
+030001|pixelValue4Bits|long|PIXEL VALUE (4 BITS)|Numeric|0|0|4|Numeric|0|2
+030002|pixelValue8Bits|long|PIXEL VALUE (8 BITS)|Numeric|0|0|8|Numeric|0|3
+030004|pixelValue16Bits|long|PIXEL VALUE (16 BITS)|Numeric|0|0|16|Numeric|0|5
+030010|numberOfGridPoints|long|NUMBER OF GRID POINTS|Numeric|0|0|13|Numeric|0|4
+030021|numberOfPixelsPerRow|long|NUMBER OF PIXELS PER ROW|Numeric|0|0|12|Numeric|0|4
+030022|numberOfPixelsPerColumn|long|NUMBER OF PIXELS PER COLUMN|Numeric|0|0|12|Numeric|0|4
+030031|pictureType|table|PICTURE TYPE|CODE TABLE|0|0|4|CODE TABLE|0|2
+030032|combinationWithOtherData|flag|COMBINATION WITH OTHER DATA|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+030033|numberOfBinsAlongRadial|long|NUMBER OF BINS ALONG THE RADIAL|Numeric|0|0|12|Numeric|0|4
+030034|numberOfAzimuths|long|NUMBER OF AZIMUTHS|Numeric|0|0|12|Numeric|0|4
+031000|shortDelayedDescriptorReplicationFactor|long|SHORT DELAYED DESCRIPTOR REPLICATION FACTOR|Numeric|0|0|1|NA|0|0
+031001|delayedDescriptorReplicationFactor|long|DELAYED DESCRIPTOR REPLICATION FACTOR|Numeric|0|0|8|NA|0|0
+031002|extendedDelayedDescriptorReplicationFactor|long|EXTENDED DELAYED DESCRIPTOR REPLICATION FACTOR|Numeric|0|0|16|NA|0|0
+031011|delayedDescriptorAndDataRepetitionFactor|long|DELAYED DESCRIPTOR AND DATA REPETITION FACTOR|Numeric|0|0|8|NA|0|0
+031012|extendedDelayedDescriptorAndDataRepetitionFactor|long|EXTENDED DELAYED DESCRIPTOR AND DATA REPETITION FACTOR|Numeric|0|0|16|NA|0|0
+031021|associatedFieldSignificance|table|ASSOCIATED FIELD SIGNIFICANCE|CODE TABLE|0|0|6|NA|0|0
+031031|dataPresentIndicator|flag|DATA PRESENT INDICATOR|FLAG TABLE|0|0|1|NA|0|0
+033002|qualityInformation|table|QUALITY INFORMATION|CODE TABLE|0|0|2|CODE TABLE|0|1
+033003|qualityInformation|table|QUALITY INFORMATION|CODE TABLE|0|0|3|CODE TABLE|0|1
+033005|qualityInformationAwsData|flag|QUALITY INFORMATION (AWS DATA)|FLAG TABLE|0|0|30|FLAG TABLE|0|10
+033006|internalMeasurementStatusInformationAws|table|INTERNAL MEASUREMENT STATUS INFORMATION (AWS)|CODE TABLE|0|0|3|CODE TABLE|0|1
+033007|percentConfidence|long|PER CENT CONFIDENCE|%|0|0|7|%|0|3
+033015|dataQualityCheckIndicator|table|DATA QUALITY-CHECK INDICATOR|CODE TABLE|0|0|6|CODE TABLE|0|2
+033020|qualityControlIndicationOfFollowingValue|table|QUALITY CONTROL INDICATION OF FOLLOWING VALUE|CODE TABLE|0|0|3|CODE TABLE|0|1
+033021|qualityOfFollowingValue|table|QUALITY OF FOLLOWING VALUE|CODE TABLE|0|0|2|CODE TABLE|0|1
+033022|qualityOfBuoySatelliteTransmission|table|QUALITY OF BUOY SATELLITE TRANSMISSION|CODE TABLE|0|0|2|CODE TABLE|0|1
+033023|qualityOfBuoyLocation|table|QUALITY OF BUOY LOCATION|CODE TABLE|0|0|2|CODE TABLE|0|1
+033024|stationElevationQualityMarkForMobileStations|table|STATION ELEVATION QUALITY MARK (FOR MOBILE STATIONS)|CODE TABLE|0|0|4|CODE TABLE|0|2
+033025|acarsInterpolatedValuesIndicator|table|ACARS INTERPOLATED VALUES INDICATOR|CODE TABLE|0|0|3|CODE TABLE|0|1
+033026|moistureQuality|table|MOISTURE QUALITY|CODE TABLE|0|0|6|CODE TABLE|0|2
+033027|locationQualityClassRangeOfRadiusOf66Confidence|table|LOCATION QUALITY CLASS (RANGE OF RADIUS OF 66 % CONFIDENCE)|CODE TABLE|0|0|3|CODE TABLE|0|1
+033028|snapshotOverallQuality|table|SNAPSHOT OVERALL QUALITY|CODE TABLE|0|0|3|CODE TABLE|0|1
+033030|scanLineStatusFlagsForAtovs|flag|SCAN LINE STATUS FLAGS FOR ATOVS|FLAG TABLE|0|0|24|FLAG TABLE|0|8
+033031|scanLineQualityFlagsForAtovs|flag|SCAN LINE QUALITY FLAGS FOR ATOVS|FLAG TABLE|0|0|24|FLAG TABLE|0|8
+033032|channelQualityFlagsForAtovs|flag|CHANNEL QUALITY FLAGS FOR ATOVS|FLAG TABLE|0|0|24|FLAG TABLE|0|8
+033033|fieldOfViewQualityFlagsForAtovs|flag|FIELD OF VIEW QUALITY FLAGS FOR ATOVS|FLAG TABLE|0|0|24|FLAG TABLE|0|8
+033035|qualityControl|table|MANUAL/AUTOMATIC QUALITY CONTROL|CODE TABLE|0|0|4|CODE TABLE|0|2
+033036|nominalConfidenceThreshold|long|NOMINAL CONFIDENCE THRESHOLD|%|0|0|7|%|0|3
+033037|windCorrelationError|flag|WIND CORRELATION ERROR|FLAG TABLE|0|0|20|FLAG TABLE|0|7
+033038|qualityFlagsForGroundBasedGnssData|flag|QUALITY FLAGS FOR GROUND-BASED GNSS DATA|FLAG TABLE|0|0|10|FLAG TABLE|0|4
+033039|radioOccultationDataQualityFlags|flag|QUALITY FLAGS FOR RADIO OCCULTATION DATA|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033040|confidenceInterval|long|CONFIDENCE INTERVAL|%|0|0|7|%|0|3
+033041|attributeOfFollowingValue|table|ATTRIBUTE OF FOLLOWING VALUE|CODE TABLE|0|0|2|CODE TABLE|0|1
+033042|typeOfLimitRepresentedByFollowingValue|table|TYPE OF LIMIT REPRESENTED BY FOLLOWING VALUE|CODE TABLE|0|0|3|CODE TABLE|0|1
+033043|astConfidence|flag|AST CONFIDENCE|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+033044|asarQualityInformation|flag|ASAR QUALITY INFORMATION|FLAG TABLE|0|0|15|FLAG TABLE|0|5
+033045|probabilityOfFollowingEvent|long|PROBABILITY OF FOLLOWING EVENT|%|0|0|7|%|0|3
+033046|conditionalProbability|long|CONDITIONAL PROBABILITY OF FOLLOWING EVENT WITH RESPECT TO SPECIFIED CONDITIONING EVENT|%|0|0|7|%|0|3
+033047|measurementConfidenceData|flag|MEASUREMENT CONFIDENCE DATA|FLAG TABLE|0|0|31|FLAG TABLE|0|11
+033048|confidenceMeasureOfSarInversion|table|CONFIDENCE MEASURE OF SAR INVERSION|CODE TABLE|0|0|2|CODE TABLE|0|1
+033049|confidenceMeasureOfWindRetrieval|table|CONFIDENCE MEASURE OF WIND RETRIEVAL|CODE TABLE|0|0|2|CODE TABLE|0|1
+033050|globalGtsppQualityFlag|table|GLOBAL GTSPP QUALITY FLAG|CODE TABLE|0|0|4|CODE TABLE|0|2
+033052|sBandOceanRetrackingQuality|flag|S BAND OCEAN RETRACKING QUALITY|FLAG TABLE|0|0|21|FLAG TABLE|0|7
+033053|kuBandOceanRetrackingQuality|flag|KU BAND OCEAN RETRACKING QUALITY|FLAG TABLE|0|0|21|FLAG TABLE|0|7
+033054|overallQualityOfRetrievedAtmosphericProfile|table|OVERALL QUALITY OF RETRIEVED ATMOSPHERIC PROFILE|CODE TABLE|0|0|3|CODE TABLE|0|1
+033055|windVectorQualityFlag|flag|WIND VECTOR QUALITY FLAG|FLAG TABLE|0|0|24|FLAG TABLE|0|8
+033056|sigma0QualityFlag|flag|SIGMA-0 QUALITY FLAG|FLAG TABLE|0|0|24|FLAG TABLE|0|8
+033060|gqisFlagQual|table|GQISFLAGQUAL - INDIVIDUAL IASI-SYSTEM QUALITY FLAG|CODE TABLE|0|0|2|CODE TABLE|0|1
+033061|gqisQualIndex|long|GQISQUALINDEX - INDICATOR FOR INSTRUMENT NOISE PERFORMANCE (CONTRIBUTIONS FROM SPECTRAL AND RADIOMETRIC CALIBRATION)|%|0|0|7|%|0|3
+033062|gqisQualIndexLoc|long|GQISQUALINDEXLOC - INDICATOR FOR GEOMETRIC QUALITY INDEX|%|0|0|7|%|0|3
+033063|gqisQualIndexRad|long|GQISQUALINDEXRAD - INDICATOR FOR INSTRUMENT NOISE PERFORMANCE (CONTRIBUTIONS FROM RADIOMETRIC CALIBRATION)|%|0|0|7|%|0|3
+033064|gqisQualIndexSpect|long|GQISQUALINDEXSPECT - INDICATOR FOR INSTRUMENT NOISE PERFORMANCE (CONTRIBUTIONS FROM SPECTRAL CALIBRATION)|%|0|0|7|%|0|3
+033065|gqisSysTecQual|long|GQISSYSTECSONDQUAL - OUTPUT OF SYSTEM TEC (TECHNICAL EXPERTISE CENTRE) QUALITY FUNCTION|Numeric|0|0|24|Numeric|0|8
+033066|amvQualityFlag|flag|AMV QUALITY FLAG|FLAG TABLE|0|0|24|FLAG TABLE|0|8
+033070|totalOzoneQuality|table|TOTAL OZONE QUALITY|CODE TABLE|0|0|4|CODE TABLE|0|2
+033071|profileOzoneQuality|table|PROFILE OZONE QUALITY|CODE TABLE|0|0|4|CODE TABLE|0|2
+033072|ozoneError|table|OZONE ERROR|CODE TABLE|0|0|5|CODE TABLE|0|2
+033075|scanLevelDataValidityQualityFlags|flag|SCAN-LEVEL QUALITY FLAGS|FLAG TABLE|0|0|13|FLAG TABLE|0|5
+033076|calibrationQualityFlags|flag|CALIBRATION QUALITY FLAGS|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+033077|fieldOfViewQualityFlags|flag|FIELD-OF-VIEW QUALITY FLAGS|FLAG TABLE|0|0|19|FLAG TABLE|0|7
+033078|geolocationQuality|table|GEOLOCATION QUALITY|CODE TABLE|0|0|4|CODE TABLE|0|2
+033079|granuleLevelQualityFlags|flag|GRANULE LEVEL QUALITY FLAGS|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033080|scanLevelQualityFlags|flag|SCAN LEVEL QUALITY FLAGS|FLAG TABLE|0|0|20|FLAG TABLE|0|7
+033081|channelDataQualityFlags|flag|CHANNEL DATA QUALITY FLAGS|FLAG TABLE|0|0|12|FLAG TABLE|0|4
+033082|geolocationQualityFlags|flag|GEOLOCATION QUALITY FLAGS|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033083|radianceDataQualityFlags|flag|RADIANCE DATA QUALITY FLAGS|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033084|pixelLevelQualityFlags|flag|PIXEL LEVEL QUALITY FLAGS|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033085|aerosolOpticalThicknessQualityFlags|flag|AEROSOL OPTICAL THICKNESS QUALITY FLAGS|FLAG TABLE|0|0|18|FLAG TABLE|0|6
+033086|qualityOfPixelLevelRetrieval|table|QUALITY OF PIXEL LEVEL RETRIEVAL|CODE TABLE|0|0|3|CODE TABLE|0|1
+033087|extentOfSatelliteWithinSouthAtlanticAnomalyBasedOnClimatologicalData|table|EXTENT OF SATELLITE WITHIN SOUTH ATLANTIC ANOMALY (BASED ON CLIMATOLOGICAL DATA)|CODE TABLE|0|0|4|CODE TABLE|0|1
+033088|ozoneTotalColumnQualityFlag|flag|OZONE TOTAL COLUMN QUALITY FLAG|FLAG TABLE|0|0|18|FLAG TABLE|0|6
+033089|noiseEquivalentDeltaTemperatureNedtQualityIndicatorsForWarmTargetCalibration|double|NOISE EQUIVALENT DELTA TEMPERATURE (NEDT) QUALITY INDICATORS FOR WARM TARGET CALIBRATION|K|2|0|12|K|2|4
+033090|nedtQualityIndicatorsForColdTargetCalibration|double|NEDT QUALITY INDICATORS FOR COLD TARGET CALIBRATION|K|2|0|12|K|2|4
+033091|nedtQualityIndicatorsForOverallCalibration|double|NEDT QUALITY INDICATORS FOR OVERALL CALIBRATION|K|2|0|12|K|2|4
+033092|bandSpecificOceanQualityFlag|flag|BAND SPECIFIC OCEAN QUALITY FLAG|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+033093|extendedQualityFlagsForGroundBasedGnssData|flag|EXTENDED QUALITY FLAGS FOR GROUND-BASED GNSS DATA|FLAG TABLE|0|0|31|FLAG TABLE|0|31
+033094|calibrationQualityControlFlags|flag|CALIBRATION QUALITY CONTROL FLAGS|FLAG TABLE|0|0|24|FLAG TABLE|0|24
+033095|mwiTemperaturesFlag|flag|MWI TEMPERATURES FLAG|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+033096|mwiCalibrationFlag|flag|MWI CALIBRATION FLAG|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033097|mwiScanQualityFlag|flag|MWI SCAN QUALITY FLAG|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033098|mwiDataQualityFlag|flag|MWI DATA QUALITY FLAG|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+033099|mwiNavigationStatusFlag|flag|MWI NAVIGATION STATUS FLAG|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033100|iciTemperaturesFlag|flag|ICI TEMPERATURES FLAG|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+033101|iciCalibrationFlag|flag|ICI CALIBRATION FLAG|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033102|iciScanQualityFlag|flag|ICI SCAN QUALITY FLAG|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033103|iciDataQualityFlag|flag|ICI DATA QUALITY FLAG|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+033104|iciNavigationStatusFlag|flag|ICI NAVIGATION STATUS FLAG|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033105|iciProcessingFlags|flag|ICI PROCESSING FLAGS|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033106|mwiProcessingFlags|flag|MWI PROCESSING FLAGS|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033107|mwsScanLineProcessingFlags|flag|MWS SCAN LINE PROCESSING FLAGS|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033108|mwsNavigationStatusFlags|flag|MWS NAVIGATION STATUS FLAGS|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033109|mwsOverallQualityFlags|flag|MWS OVERALL QUALITY FLAGS|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033110|mwsChannelProcessingFlags|flag|MWS CHANNEL PROCESSING FLAGS|FLAG TABLE|0|0|9|FLAG TABLE|0|3
+033111|scaQualityFlags|flag|SCA QUALITY FLAGS|FLAG TABLE|0|0|32|FLAG TABLE|0|11
+033112|faradayRotationAngleOneWay|double|FARADAY ROTATION ANGLE (ONE WAY)|deg|2|-18000|16|deg|2|6
+033113|iasiNgGeneralQualityFlags|flag|IASI-NG GENERAL QUALITY FLAGS|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+033114|outOfBoundsCheck|flag|OUT OF BOUNDS CHECK|FLAG TABLE|0|0|17|FLAG TABLE|0|6
+033115|aerosolOpticalDepthQualityInformation|table|AEROSOL OPTICAL DEPTH QUALITY INFORMATION|CODE TABLE|0|0|5|CODE TABLE|0|2
+033116|firstGuessInBoundsCheck|flag|FIRST GUESS IN BOUNDS CHECK|FLAG TABLE|0|0|17|FLAG TABLE|0|6
+033117|inBoundsCheck|flag|IN BOUNDS CHECK|FLAG TABLE|0|0|17|FLAG TABLE|0|6
+033118|relativeErrorPercentage|double|RELATIVE ERROR PERCENTAGE|%|2|-10000|15|%|2|5
+033119|forecastErrorPercentage|long|FORECAST ERROR PERCENTAGE|%|0|-100|8|%|0|3
+035000|fmAndRegionalCodeNumber|table|FM AND REGIONAL CODE NUMBER|CODE TABLE|0|0|10|CODE TABLE|0|3
+035001|timeFrameForMonitoring|table|TIME FRAME FOR MONITORING|CODE TABLE|0|0|3|CODE TABLE|0|1
+035011|numberOfReportsActuallyReceived|long|NUMBER OF REPORTS ACTUALLY RECEIVED|Numeric|0|0|14|Numeric|0|4
+035021|bulletinBeingMonitoredTtaaii|string|BULLETIN BEING MONITORED (TTAAII)|CCITT IA5|0|0|48|Character|0|6
+035022|bulletinBeingMonitoredYygggg|string|BULLETIN BEING MONITORED (YYGGGG)|CCITT IA5|0|0|48|Character|0|6
+035023|bulletinBeingMonitoredCccc|string|BULLETIN BEING MONITORED (CCCC)|CCITT IA5|0|0|32|Character|0|4
+035024|bulletinBeingMonitoredBbb|string|BULLETIN BEING MONITORED (BBB)|CCITT IA5|0|0|24|Character|0|3
+035030|discrepanciesInAvailabilityOfExpectedData|table|DISCREPANCIES IN THE AVAILABILITY OF EXPECTED DATA|CODE TABLE|0|0|4|CODE TABLE|0|1
+035031|qualifierOnMonitoringResults|table|QUALIFIER ON MONITORING RESULTS|CODE TABLE|0|0|7|CODE TABLE|0|2
+035032|causeOfMissingData|table|CAUSE OF MISSING DATA|CODE TABLE|0|0|4|CODE TABLE|0|1
+035033|observationAndCollectionDeficiencies|table|OBSERVATION AND COLLECTION DEFICIENCIES|CODE TABLE|0|0|7|CODE TABLE|0|2
+035034|statisticalTrendsForAvailabilityOfDataDuringSurveyPeriods|table|STATISTICAL TRENDS FOR AVAILABILITY OF DATA (DURING THE SURVEY PERIOD(S))|CODE TABLE|0|0|3|CODE TABLE|0|1
+035035|reasonForTermination|table|REASON FOR TERMINATION|CODE TABLE|0|0|5|CODE TABLE|0|2
+040001|surfaceSoilMoisture|double|SURFACE SOIL MOISTURE (MS)|%|1|0|10|%|1|4
+040002|estimatedErrorInSurfaceSoilMoisture|double|ESTIMATED ERROR IN SURFACE SOIL MOISTURE|%|1|0|10|%|1|4
+040003|meanSurfaceSoilMoisture|long|MEAN SURFACE SOIL MOISTURE|Numeric|3|0|10|Numeric|3|4
+040004|rainFallDetection|long|RAIN FALL DETECTION|Numeric|3|0|10|Numeric|3|4
+040005|soilMoistureCorrectionFlag|flag|SOIL MOISTURE CORRECTION FLAG|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+040006|soilMoistureProcessingFlag|flag|SOIL MOISTURE PROCESSING FLAG|FLAG TABLE|0|0|16|FLAG TABLE|0|6
+040007|soilMoistureQuality|double|SOIL MOISTURE QUALITY|%|1|0|10|%|1|4
+040008|frozenLandSurfaceFraction|double|FROZEN LAND SURFACE FRACTION|%|1|0|10|%|1|4
+040009|inundationAndWetlandFraction|double|INUNDATION AND WETLAND FRACTION|%|1|0|10|%|1|4
+040010|topographicComplexity|double|TOPOGRAPHIC COMPLEXITY|%|1|0|10|%|1|4
+040011|interpolationFlag|flag|INTERPOLATION FLAG|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+040012|radiometerDataQualityFlag|flag|RADIOMETER DATA QUALITY FLAG|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+040013|radiometerBrightnessTemperatureInterpretationFlag|table|RADIOMETER BRIGHTNESS TEMPERATURE INTERPRETATION FLAG|CODE TABLE|0|0|3|CODE TABLE|0|1
+040014|highFrequencyFluctuationsOfSeaSurfaceTopographyCorrection|double|HIGH-FREQUENCY FLUCTUATIONS OF THE SEA-SURFACE TOPOGRAPHY CORRECTION|m|4|-3000|13|m|4|4
+040015|normalizedDifferentialVegetationIndex|long|NORMALIZED DIFFERENTIAL VEGETATION INDEX (NDVI)|Numeric|2|-100|8|Numeric|2|3
+040016|residualRmsInBand|long|RESIDUAL RMS IN BAND|Numeric|3|0|14|Numeric|3|5
+040017|nonNormalizedPrincipalComponentScore|long|NON-NORMALIZED PRINCIPAL COMPONENT SCORE|Numeric|0|-1073741824|31|Numeric|0|10
+040018|averageOfImagerMeasurements|double|GIACAVGIMAGIIS - AVERAGE OF IMAGER MEASUREMENTS|W m-2 sr-1 m|6|0|24|W m-2 sr-1 m|6|8
+040019|giacvarimagiisVarianceOfImagerMeasurements|double|GIACVARIMAGIIS - VARIANCE OF IMAGER MEASUREMENTS|W m-2 sr-1 m|6|0|24|W m-2 sr-1 m|6|8
+040020|gqisFlagQualDetailed|flag|GQISFLAGQUALDETAILED - QUALITY FLAG FOR THE SYSTEM|FLAG TABLE|0|0|17|FLAG TABLE|0|6
+040021|fractionOfWeightedAvhrrPixelInIasiFovCoveredWithSnowOrIce|long|FRACTION OF WEIGHTED AVHRR PIXEL IN IASI FOV COVERED WITH SNOW/ICE|%|0|0|7|%|0|3
+040022|numberOfMissingBadOrFailedAvhrrPixels|long|NUMBER OF MISSING, BAD OR FAILED AVHRR PIXELS|Numeric|0|0|7|Numeric|0|3
+040023|auxiliaryAltimeterStateFlags|flag|AUXILIARY ALTIMETER STATE FLAGS|FLAG TABLE|0|0|5|FLAG TABLE|0|2
+040024|meteorologicalMapAvailability|table|METEOROLOGICAL MAP AVAILABILITY|CODE TABLE|0|0|3|CODE TABLE|0|1
+040025|interpolationFlagForMeanDiurnalTide|table|INTERPOLATION FLAG FOR MEAN DIURNAL TIDE|CODE TABLE|0|0|2|CODE TABLE|0|1
+040026|scoreQuantizationFactor|long|SCORE QUANTIZATION FACTOR|Numeric|2|0|16|Numeric|2|5
+040027|sunGlintAngle|double|SUN GLINT ANGLE|deg|2|-18000|16|deg|2|5
+040028|gmiQualityFlag|table|GMI QUALITY FLAG|CODE TABLE|0|0|4|CODE TABLE|0|2
+040029|horizontalObservationIntegrationLength|long|HORIZONTAL OBSERVATION INTEGRATION LENGTH|m|0|0|26|m|0|8
+040030|horizontalLineOfSightWind|double|HORIZONTAL LINE OF SIGHT WIND|m/s|2|-32767|16|m/s|2|5
+040031|errorEstimateOfHorizontalLineOfSightWind|double|ERROR ESTIMATE OF HORIZONTAL LINE OF SIGHT WIND|m/s|2|0|15|m/s|2|5
+040032|derivativeWindToPressure|double|DERIVATIVE WIND TO PRESSURE|m s-1 Pa-1|3|-100000|18|m s-1 Pa-1|3|6
+040033|derivativeWindToTemperature|double|DERIVATIVE WIND TO TEMPERATURE|m s-1 K-1|3|-100000|18|m s-1 K-1|3|6
+040034|derivativeWindToBackscatterRatio|double|DERIVATIVE WIND TO BACKSCATTER RATIO|m/s|3|-200000|19|m/s|3|6
+040035|satelliteRange|long|SATELLITE RANGE|m|0|380000|18|m|0|6
+040036|lidarL2bClassificationType|table|LIDAR L2B CLASSIFICATION TYPE|CODE TABLE|0|0|4|CODE TABLE|0|2
+040037|backscatterRatio|long|BACKSCATTER RATIO|Numeric|3|500|20|Numeric|3|7
+040038|cloudParticleSize|double|CLOUD PARTICLE SIZE|m|7|0|28|m|7|6
+040039|singleLookComplexImageIntensity|long|SINGLE LOOK COMPLEX IMAGE INTENSITY|Numeric|0|-25|5|Numeric|0|3
+040040|singleLookComplexImageSkewness|long|SINGLE LOOK COMPLEX IMAGE SKEWNESS|Numeric|2|1|13|Numeric|0|4
+040041|singleLookComplexImageKurtosis|long|SINGLE LOOK COMPLEX IMAGE KURTOSIS|Numeric|2|1|13|Numeric|0|4
+040042|singleLookComplexImageVariance|long|SINGLE LOOK COMPLEX IMAGE VARIANCE|Numeric|2|1|13|Numeric|0|4
+040043|satelliteManoeuvreIndicator|table|SATELLITE MANOEUVRE INDICATOR|CODE TABLE|0|0|3|CODE TABLE|0|1
+040044|dustIndex|long|DUST INDEX|Numeric|1|0|8|Numeric|1|3
+040045|cloudFormationAndHeightAssignment|flag|CLOUD FORMATION AND HEIGHT ASSIGNMENT|FLAG TABLE|0|0|5|FLAG TABLE|0|2
+040046|cloudinessSummary|table|CLOUDINESS SUMMARY|CODE TABLE|0|0|3|CODE TABLE|0|1
+040047|validationFlagForIasiOrIasiNgLevel1Product|table|VALIDATION FLAG FOR IASI OR IASI-NG LEVEL 1 PRODUCT|CODE TABLE|0|0|3|CODE TABLE|0|1
+040048|validationFlagOfAmsuALevel1DataFlow|table|VALIDATION FLAG OF AMSU-A LEVEL 1 DATA FLOW|CODE TABLE|0|0|3|CODE TABLE|0|1
+040049|cloudTestsExecutedAndResults|flag|CLOUD TESTS EXECUTED AND RESULTS|FLAG TABLE|0|0|16|FLAG TABLE|0|5
+040050|retrievalInitialisation|flag|RETRIEVAL INITIALISATION|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+040051|convergenceOfTheIterativeRetrieval|table|CONVERGENCE OF THE ITERATIVE RETRIEVAL|CODE TABLE|0|0|3|CODE TABLE|0|1
+040052|indicationOfSuperAdiabaticAndSuperSaturationInFinalRetrieval|flag|INDICATION OF SUPER-ADIABATIC AND SUPER-SATURATION IN FINAL RETRIEVAL|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+040053|numberOfIterationsUsedForRetrieval|long|NUMBER OF ITERATIONS USED FOR RETRIEVAL|Numeric|0|0|8|Numeric|0|3
+040054|potentialProcessingAndInputsErrors|flag|POTENTIAL PROCESSING AND INPUTS ERRORS|FLAG TABLE|0|0|13|FLAG TABLE|0|4
+040055|diagnosticsOnTheRetrieval|flag|DIAGNOSTICS ON THE RETRIEVAL|FLAG TABLE|0|0|21|FLAG TABLE|0|7
+040056|generalRetrievalQuality|table|GENERAL RETRIEVAL QUALITY|CODE TABLE|0|0|3|CODE TABLE|0|1
+040057|iasiLevel2RetrievalFlags|flag|IASI LEVEL 2 RETRIEVAL FLAGS|FLAG TABLE|0|0|31|FLAG TABLE|0|10
+040058|numberOfVectorsDescribingTheCharacterizationMatrices|long|NUMBER OF VECTORS DESCRIBING THE CHARACTERIZATION MATRICES|Numeric|0|0|8|Numeric|0|3
+040059|numberOfLayersActuallyRetrieved|long|NUMBER OF LAYERS ACTUALLY RETRIEVED|Numeric|0|0|8|Numeric|0|3
+040060|numberOfProfilesRetrievedInScanline|long|NUMBER OF PROFILES RETRIEVED IN SCANLINE|Numeric|0|0|8|Numeric|0|3
+040061|airPartialColumnsOnEachRetrievedLayer|double|AIR PARTIAL COLUMNS ON EACH RETRIEVED LAYER|mol cm-2|3|0|16|mol cm-2|3|5
+040062|aPrioriPartialColumnsOnEachRetrievedLayer|double|A-PRIORI PARTIAL COLUMNS ON EACH RETRIEVED LAYER|mol cm-2|10|0|16|mol cm-2|10|5
+040063|scalingVectorMultiplyingTheAPrioriVectorInOrderToDefineTheRetrievedVector|long|SCALING VECTOR MULTIPLYING THE A PRIORI VECTOR IN ORDER TO DEFINE THE RETRIEVED VECTOR|Numeric|5|0|26|Numeric|5|8
+040064|mainEigenvaluesOfTheSensitivityMatrix|long|MAIN EIGENVALUES OF THE SENSITIVITY MATRIX|Numeric|6|0|31|Numeric|6|10
+040065|mainEigenvectorsOfTheSensitivityMatrix|long|MAIN EIGENVECTORS OF THE SENSITIVITY MATRIX|Numeric|6|-1000000000|31|Numeric|6|10
+040066|qualityIndicatorForAtmosphericWaterVapour|long|QUALITY INDICATOR FOR ATMOSPHERIC WATER VAPOUR|Numeric|1|0|8|Numeric|1|3
+040067|qualityIndicatorForAtmosphericTemperature|long|QUALITY INDICATOR FOR ATMOSPHERIC TEMPERATURE|Numeric|1|0|8|Numeric|1|3
+040068|generalRetrievalQualityFlagForSo2|table|GENERAL RETRIEVAL QUALITY FLAG FOR SO2|CODE TABLE|0|0|4|CODE TABLE|0|2
+040069|pwlrEstimatedRetrievalErrorForSurfaceAirTemperature|double|PWLR ESTIMATED RETRIEVAL ERROR FOR SURFACE AIR TEMPERATURE|K|4|-1000000|21|K|4|7
+040070|pwlrEstimatedRetrievalErrorOfSurfaceDewpoint|double|PWLR ESTIMATED RETRIEVAL ERROR OF SURFACE DEWPOINT|K|4|-1000000|21|K|4|7
+040071|retrievalErrorCovarianceMatrixForOzoneInPrincipalComponentDomain|long|RETRIEVAL ERROR COVARIANCE MATRIX FOR OZONE IN PRINCIPAL COMPONENT DOMAIN|Numeric|4|-1000000|21|Numeric|4|7
+040072|pwlrEstimatedRetrievalQualityIndicatorOfAtmosphericOzone|long|PWLR ESTIMATED RETRIEVAL QUALITY INDICATOR OF ATMOSPHERIC OZONE|Numeric|1|0|8|Numeric|1|3
+040073|pwlrEstimatedRetrievalErrorOfSurfaceSkinTemperature|double|PWLR ESTIMATED RETRIEVAL ERROR OF SURFACE SKIN TEMPERATURE|K|1|0|8|K|1|3
+040074|generalInterferometryQualityFlags|flag|GENERAL INTERFEROMETRY QUALITY FLAGS|FLAG TABLE|0|0|16|FLAG TABLE|0|0
+040075|retrievalErrorCovarianceMatrixForHumidityInPrincipalComponentDomain|long|RETRIEVAL ERROR COVARIANCE MATRIX FOR HUMIDITY IN PRINCIPAL COMPONENT DOMAIN|Numeric|0|0|21|Numeric|0|7
+040076|retrievalErrorCovarianceMatrixForTemperatureInPrincipalComponentDomain|long|RETRIEVAL ERROR COVARIANCE MATRIX FOR TEMPERATURE IN PRINCIPAL COMPONENT DOMAIN|Numeric|0|0|21|Numeric|0|7
+040077|oceanProductQualityFlag|flag|OCEAN PRODUCT QUALITY FLAG|FLAG TABLE|0|0|8|FLAG TABLE|0|3
+040080|cloudTestResultsForIasiNgLevel2|flag|CLOUD TEST RESULTS FOR IASI-NG LEVEL 2|FLAG TABLE|0|0|5|FLAG TABLE|0|2
+041001|pco2|double|PCO2|Pa|3|0|18|Pa|3|6
+041002|fluorescence|double|FLUORESCENCE|kg l-1|12|0|16|kg l-1|12|5
+041003|dissolvedNitrates|double|DISSOLVED NITRATES|umol/kg|3|0|17|umol/kg|3|5
+041004|chlorophyllA|double|CHLOROPHYLL-A|mg m-3|4|0|19|mg m-3|4|7
+041005|turbidity|double|TURBIDITY|NTU|2|0|12|NTU|2|4
+041006|seaWaterPh|long|SEA WATER PH|Numeric|4|70000|15|Numeric|4|5
+041007|bbp700|double|BBP700|/m|7|0|20|/m|7|7
+042001|dominantSwellWaveDirectionOfSpectralPartition|long|DOMINANT SWELL WAVE DIRECTION OF SPECTRAL PARTITION|deg|0|0|9|deg|0|3
+042002|significantSwellWaveHeightOfSpectralPartition|double|SIGNIFICANT SWELL WAVE HEIGHT OF SPECTRAL PARTITION|m|1|0|9|m|1|3
+042003|dominantSwellWavelengthOfSpectralPartition|double|DOMINANT SWELL WAVELENGTH OF SPECTRAL PARTITION|m|2|100|17|m|2|6
+042004|confidenceOfInversionForEachPartitionOfSwellWaveSpectra|table|CONFIDENCE OF INVERSION FOR EACH PARTITION OF SWELL WAVE SPECTRA|CODE TABLE|0|0|4|CODE TABLE|0|2
+042005|ambiguityRemovalFactorForSwellWavePartition|long|AMBIGUITY REMOVAL FACTOR FOR SWELL WAVE PARTITION|Numeric|5|-100000|18|Numeric|5|6
+042006|waveAge|long|WAVE AGE|Numeric|2|1|8|Numeric|2|3
+042007|shortestOceanWavelengthOnSpectralResolution|double|SHORTEST OCEAN WAVELENGTH ON SPECTRAL RESOLUTION|m|2|0|16|m|2|5
+042008|nonlinearInverseSpectralWidth|double|NONLINEAR INVERSE SPECTRAL WIDTH|m|2|0|16|m|2|5
+042009|binPartitionReference|long|BIN PARTITION REFERENCE|Numeric|0|0|8|Numeric|0|3
+042010|partitionNumber|long|PARTITION NUMBER|Numeric|0|1|4|Numeric|0|2
+042011|a1CoefficientOfTheDirectionalFourierSeries|long|A1 COEFFICIENT OF THE DIRECTIONAL FOURIER SERIES|Numeric|4|-20000|15|Numeric|4|6
+042012|b1CoefficientOfTheDirectionalFourierSeries|long|B1 COEFFICIENT OF THE DIRECTIONAL FOURIER SERIES|Numeric|4|-20000|15|Numeric|4|6
+042013|a2CoefficientOfTheDirectionalFourierSeries|long|A2 COEFFICIENT OF THE DIRECTIONAL FOURIER SERIES|Numeric|4|-20000|15|Numeric|4|6
+042014|b2CoefficientOfTheDirectionalFourierSeries|long|B2 COEFFICIENT OF THE DIRECTIONAL FOURIER SERIES|Numeric|4|-20000|15|Numeric|4|6
+042015|checkFactorK|long|CHECK FACTOR K|Numeric|2|0|12|Numeric|2|4
+042016|seaWaterPotentialDensityReferencedToSeaSurface|double|SEA WATER POTENTIAL DENSITY REFERENCED TO SEA SURFACE|kg m-3|5|-10000000|24|kg m-3|5|9
+042017|qualityFlagOfSwellWaveSpectra|table|QUALITY FLAG OF SWELL WAVE SPECTRA|CODE TABLE|0|0|4|CODE TABLE|0|2
+042018|qualityFlagForEachPartitionOfSwellWaveSpectra|table|QUALITY FLAG FOR EACH PARTITION OF SWELL WAVE SPECTRA|CODE TABLE|0|0|4|CODE TABLE|0|4
diff --git a/definitions/bufr/tables/0/wmo/43/sequence.def b/definitions/bufr/tables/0/wmo/43/sequence.def
new file mode 100644
index 000000000..7e89f7228
--- /dev/null
+++ b/definitions/bufr/tables/0/wmo/43/sequence.def
@@ -0,0 +1,1309 @@
+"300002" = [  000002, 000003 ]
+"300003" = [  000010, 000011, 000012 ]
+"300004" = [  300003, 000013, 000014, 000015, 000016, 000017, 000018, 000019, 000020 ]
+"300010" = [  300003, 101000, 031001, 000030 ]
+"300015" = [  000030, 102000, 031002, 000024, 000025 ]
+"300016" = [  000030, 102000, 031001, 000026, 000027 ]
+"301001" = [  001001, 001002 ]
+"301002" = [  001003, 001004, 001005 ]
+"301003" = [  001011, 001012, 001013 ]
+"301004" = [  001001, 001002, 001015, 002001 ]
+"301005" = [  001035, 001034 ]
+"301011" = [  004001, 004002, 004003 ]
+"301012" = [  004004, 004005 ]
+"301013" = [  004004, 004005, 004006 ]
+"301014" = [  102002, 301011, 301012 ]
+"301018" = [  001114, 025185, 025186 ]
+"301021" = [  005001, 006001 ]
+"301022" = [  005001, 006001, 007001 ]
+"301023" = [  005002, 006002 ]
+"301024" = [  005002, 006002, 007001 ]
+"301025" = [  301023, 004003, 301012 ]
+"301026" = [  301021, 004003, 004003, 004004, 004004, 004005, 004005 ]
+"301027" = [  008007, 101000, 031001, 301028, 008007 ]
+"301028" = [  008040, 033042, 007010, 101000, 031002, 301023, 019007, 008040 ]
+"301029" = [  001018, 002001, 301011 ]
+"301030" = [  001018, 002001, 301011, 301024 ]
+"301031" = [  301001, 002001, 301011, 301012, 301022 ]
+"301032" = [  301001, 002001, 301011, 301012, 301024 ]
+"301033" = [  001005, 002001, 301011, 301012, 301021 ]
+"301034" = [  001005, 002001, 301011, 301012, 301023 ]
+"301035" = [  001005, 001012, 001013, 002001, 301011, 301012, 301023 ]
+"301036" = [  301003, 002001, 301011, 301012, 301023 ]
+"301037" = [  301001, 002011, 002012, 301011, 301012, 301022 ]
+"301038" = [  301001, 002011, 002012, 301011, 301012, 301024 ]
+"301039" = [  301003, 002011, 002012, 301011, 301012, 301023 ]
+"301040" = [  301003, 002011, 002012, 301011, 301012, 301024 ]
+"301041" = [  001007, 002021, 002022, 301011, 301012 ]
+"301042" = [  301041, 301021 ]
+"301043" = [  001007, 002023, 301011, 301013, 301021 ]
+"301044" = [  001007, 002024, 301011, 301013, 301021 ]
+"301045" = [  301011, 301012, 201138, 202131, 004006, 201000, 202000, 304030, 304031 ]
+"301046" = [  001007, 001012, 002048, 021119, 025060, 202124, 002026, 002027, 202000, 005040
+               ]
+"301047" = [  001007, 025060, 001033, 001034, 001012, 301045, 002021, 301011, 301012, 201138,
+               202131, 004006, 201000, 202000, 301023 ]
+"301048" = [  002104, 002121, 002113, 002026, 002027, 002111, 002140, 202127, 001013, 202126,
+               007001, 202000, 025010, 021064 ]
+"301049" = [  002111, 002112, 021062, 021063, 021065 ]
+"301051" = [  001006, 002061, 301011, 301012, 301021, 008004 ]
+"301055" = [  001005, 002001, 301011, 301012, 301021, 001012, 001014 ]
+"301056" = [  001087, 001011, 001015, 002008, 002001, 301011, 301012, 301021, 007030, 007031
+               ]
+"301058" = [  301011, 301012, 201152, 202135, 004006, 202000, 201000, 301021, 020111, 020112,
+               020113, 020114, 020115, 020116, 020117, 020118, 020119, 025035, 020121, 020122,
+               020123, 020124, 025175, 020023, 025063, 202136, 201136, 002121, 201000, 202000,
+               025061, 002184, 002189, 025036, 101000, 031002, 301059 ]
+"301059" = [  301021, 007030, 007032 ]
+"301062" = [  101000, 031001, 301001 ]
+"301065" = [  001006, 001008, 002001, 002002, 002005, 002062, 002070, 002065 ]
+"301066" = [  301011, 301013, 301023, 007004, 002064, 008004 ]
+"301070" = [  002143, 002142, 002144 ]
+"301071" = [  001007, 001031, 002020, 002028, 002029 ]
+"301072" = [  301071, 301011, 301013, 301021 ]
+"301074" = [  002143, 002142, 002145, 002146 ]
+"301075" = [  301001, 001015, 301024, 008021, 301011, 301012 ]
+"301076" = [  002011, 002143, 002142 ]
+"301089" = [  001101, 001102 ]
+"301090" = [  301004, 301011, 301012, 301021, 007030, 007031 ]
+"301091" = [  002180, 002181, 002182, 002183, 002184, 002179, 002186, 002187, 002188, 002189
+               ]
+"301092" = [  001011, 001003, 002001, 301011, 301012, 301021, 007030, 007031, 033024 ]
+"301093" = [  301036, 007030, 007031 ]
+"301110" = [  301001, 001011, 002011, 002014, 002003 ]
+"301111" = [  301001, 001011, 002011, 002013, 002014, 002003 ]
+"301112" = [  001006, 002011, 002013, 002014, 002003 ]
+"301113" = [  008021, 301011, 301013 ]
+"301114" = [  301021, 007030, 007031, 007007, 033024 ]
+"301120" = [  301001, 001094, 002011, 301121 ]
+"301121" = [  008041, 301122, 301021, 007031, 007007 ]
+"301122" = [  301011, 301012, 201135, 202130, 004006, 202000, 201000 ]
+"301123" = [  102002, 008041, 001062, 301001, 001094, 002011, 001018, 001095, 025061, 025068,
+               001082, 001083, 001081, 002067, 002066, 002014, 025067, 025065, 025066, 002095,
+               002096, 002097, 002016, 002083, 002080, 002081, 001093, 002084, 002085, 002086,
+               002082, 008041, 301011 ]
+"301125" = [  001033, 001034, 025060, 001007, 002019, 001012 ]
+"301126" = [  001087, 001015, 002149, 301011, 301012, 301021 ]
+"301128" = [  001081, 001082, 001083, 001095, 002015, 002016, 002017, 002066, 002067, 002080,
+               002081, 002082, 002083, 002084, 002085, 002086, 002095, 002096, 002097, 002103,
+               002191, 025061, 035035 ]
+"301129" = [  001007, 001031, 002019, 002020 ]
+"301130" = [  301011, 301012, 202131, 201138, 004006, 201000, 202000 ]
+"301131" = [  301021, 007024, 005021, 007025, 005022 ]
+"301132" = [  301150, 301001, 301021, 007030, 008021, 301011, 301012, 002006, 001079, 001085
+               ]
+"301150" = [  001125, 001126, 001127, 001128 ]
+"302001" = [  010004, 010051, 010061, 010063 ]
+"302002" = [  010004, 007004, 010003, 010061, 010063 ]
+"302003" = [  011011, 011012, 012004, 012006, 013003, 020001, 020003, 020004, 020005 ]
+"302004" = [  020010, 008002, 020011, 020013, 020012, 020012, 020012 ]
+"302005" = [  008002, 020011, 020012, 020013 ]
+"302006" = [  010004, 010051, 010062, 010063 ]
+"302011" = [  302001, 302003, 302004 ]
+"302012" = [  302002, 302003, 302004 ]
+"302013" = [  302006, 302003, 101000, 031001, 302005 ]
+"302021" = [  022001, 022011, 022021 ]
+"302022" = [  022002, 022012, 022022 ]
+"302023" = [  022003, 022013, 022023 ]
+"302024" = [  302022, 101002, 302023 ]
+"302031" = [  302001, 010062, 007004, 010009 ]
+"302032" = [  007032, 012101, 012103, 013003 ]
+"302033" = [  007032, 020001 ]
+"302034" = [  007032, 013023 ]
+"302035" = [  302032, 302033, 302034, 007032, 302004, 101000, 031001, 302005 ]
+"302036" = [  105000, 031001, 008002, 020011, 020012, 020014, 020017 ]
+"302037" = [  020062, 013013, 012113 ]
+"302038" = [  020003, 004024, 020004, 020005 ]
+"302039" = [  004024, 014031 ]
+"302040" = [  007032, 102002, 004024, 013011 ]
+"302041" = [  007032, 004024, 004024, 012111, 004024, 004024, 012112 ]
+"302042" = [  007032, 002002, 008021, 004025, 011001, 011002, 008021, 103002, 004025, 011043,
+               011041 ]
+"302043" = [  302038, 101002, 302039, 302040, 302041, 302042, 007032 ]
+"302044" = [  004024, 002004, 013033 ]
+"302045" = [  004024, 014002, 014004, 014016, 014028, 014029, 014030 ]
+"302046" = [  004024, 004024, 012049 ]
+"302047" = [  102003, 008002, 020054 ]
+"302048" = [  005021, 007021, 020012, 005021, 007021 ]
+"302049" = [  008002, 020011, 020013, 020012, 020012, 020012, 008002 ]
+"302050" = [  008041, 005021, 007005, 202130, 006021, 202000, 008041, 201131, 202129, 002115,
+               010004, 002115, 013003, 202000, 201000, 002115, 011001, 011002, 002115, 102002,
+               012101, 004024, 002115, 012103, 012102, 101003, 020012, 020011, 020013, 101002,
+               020003 ]
+"302051" = [  010004, 010051, 007004, 010003, 012004, 012051, 012016, 012017, 013004, 102004,
+               008051, 008020 ]
+"302052" = [  007032, 007033, 012101, 002039, 012102, 012103, 013003 ]
+"302053" = [  007032, 007033, 020001 ]
+"302054" = [  302052, 302053, 007033, 302034, 007032, 302004, 101000, 031001, 302005 ]
+"302055" = [  020031, 020032, 020033, 020034, 020035, 020036, 020037, 020038 ]
+"302056" = [  002038, 007063, 022043, 007063 ]
+"302057" = [  302056, 302021, 302024 ]
+"302058" = [  007032, 007033, 004024, 004024, 012111, 004024, 004024, 012112 ]
+"302059" = [  007032, 007033, 002002, 008021, 004025, 011001, 011002, 008021, 103002, 004025,
+               011043, 011041 ]
+"302060" = [  302038, 302040, 302058, 302059 ]
+"302062" = [  025188, 302001, 302093, 101000, 031000, 302053, 007032, 007033, 101000, 031000,
+               302004, 101000, 031001, 302005, 008002, 101000, 031000, 302055, 101000, 031000,
+               302056, 101000, 031000, 302021, 101000, 031000, 302024 ]
+"302063" = [  302038, 101000, 031000, 302040, 101000, 031000, 302034, 007032, 101000, 031000,
+               302058, 101000, 031000, 302064 ]
+"302064" = [  007032, 007033, 002002, 008021, 004025, 011001, 011002, 008021, 103000, 031001,
+               004025, 011043, 011041 ]
+"302066" = [  020023, 020024, 020027, 020054, 020023, 020027, 020054, 020025, 020026, 020027,
+               020040, 020066, 020027, 020021, 020067, 020027 ]
+"302067" = [  001023, 004025, 002177, 101000, 031001, 020003, 103000, 031001, 005021, 020001,
+               005021, 101000, 031000, 302056, 103000, 031000, 033041, 020058, 022061, 101000,
+               031000, 302022, 101000, 031001, 302023, 104000, 031001, 020054, 020137, 020012,
+               020090, 103000, 031001, 020054, 020137, 020136, 004025, 013012, 004025, 011042,
+               104000, 031001, 008021, 004025, 011042, 008021, 115000, 031001, 008021, 004015,
+               008021, 004025, 011001, 011002, 008021, 004015, 008021, 004025, 011001, 011002,
+               008021, 004025, 004015, 103000, 031001, 004025, 004025, 020003, 110000, 031001,
+               004025, 004025, 005021, 005021, 020054, 020024, 020025, 020026, 020027, 020063
+               ]
+"302069" = [  007032, 007033, 033041, 020001 ]
+"302070" = [  007032, 007033, 011001, 011002, 011043, 011041, 011016, 011017 ]
+"302071" = [  007032, 007033, 008021, 004025, 011001, 011002, 008021, 103002, 004025, 011043,
+               011041, 004025, 011016, 011017 ]
+"302072" = [  007032, 007033, 012101, 012103, 013003 ]
+"302073" = [  020010, 105004, 008002, 020011, 020012, 033041, 020013 ]
+"302074" = [  020003, 004025, 020004, 020005 ]
+"302075" = [  008021, 004025, 013055, 013058, 008021 ]
+"302076" = [  020021, 020022, 026020, 020023, 020024, 020025, 020026 ]
+"302077" = [  007032, 007033, 004025, 012111, 012112, 007032, 004025, 012112 ]
+"302078" = [  002176, 020062, 002177, 013013 ]
+"302079" = [  007032, 002175, 002178, 004025, 013011 ]
+"302080" = [  002185, 004025, 013033 ]
+"302081" = [  004025, 014031 ]
+"302082" = [  004025, 014002, 014004, 014016, 014028, 014029, 014030 ]
+"302083" = [  004025, 008023, 010004, 011001, 011002, 012101, 013003, 008023 ]
+"302084" = [  302031, 302072, 103000, 031000, 101005, 307063, 007061, 101000, 031000, 302069,
+               007032, 007033, 105000, 031000, 020031, 020032, 002038, 022043, 302021, 101000,
+               031000, 302078, 012113, 101000, 031000, 302004, 105000, 031001, 008002, 020011,
+               020012, 033041, 020013, 302036, 101000, 031000, 302047, 008002, 101000, 031000,
+               302048 ]
+"302085" = [  105000, 031000, 020003, 103002, 004024, 020004, 020005, 101000, 031000, 302175,
+               102000, 031000, 004025, 302076, 102000, 031000, 004025, 013059, 007032, 007033,
+               008021, 004025, 011001, 011002, 008021, 103003, 004025, 011043, 011041, 004025,
+               011016, 011017, 302077, 007033, 302041, 106000, 031000, 007032, 002175, 002178,
+               102005, 004024, 013011, 007032, 103000, 031000, 002185, 101002, 302044, 102000,
+               031000, 101002, 302039, 102000, 031000, 101002, 302045, 101000, 031000, 302046,
+               101000, 031000, 302083 ]
+"302089" = [  020101, 020102, 020103, 020104, 020105, 020106, 020107, 020108 ]
+"302090" = [  002038, 007063, 022045 ]
+"302091" = [  020001, 004024, 013011 ]
+"302092" = [  011104, 001012, 001013, 010038, 010039, 011007, 011008 ]
+"302093" = [  007032, 007033, 303099, 012101, 103000, 031000, 007032, 007033, 303099, 002039,
+               002097, 003024, 003021, 012102, 012103, 013003, 007032, 007033, 303099, 002039,
+               002097, 003021, 003024 ]
+"302175" = [  008021, 004025, 013155, 013058, 008021 ]
+"303001" = [  007003, 011001, 011002 ]
+"303002" = [  007004, 011001, 011002 ]
+"303003" = [  007004, 010003, 012001, 012003 ]
+"303004" = [  007004, 010003, 012001, 012003, 011001, 011002 ]
+"303011" = [  007003, 008001, 011001, 011002 ]
+"303012" = [  007004, 008001, 011001, 011002 ]
+"303013" = [  007004, 008001, 010003, 012001, 013003, 011001, 011002 ]
+"303014" = [  007004, 008001, 010003, 012001, 012003, 011001, 011002 ]
+"303021" = [  007004, 007004, 204007, 031021 ]
+"303022" = [  303021, 010003, 204000 ]
+"303023" = [  303021, 012001, 204000 ]
+"303024" = [  303021, 013016, 204000 ]
+"303025" = [  002025, 204007, 031021, 012063, 204000 ]
+"303026" = [  007004, 008003, 204007, 031021, 012001, 204000 ]
+"303027" = [  007004, 204007, 031021, 010003, 204000 ]
+"303031" = [  007004, 008003, 007021, 007022, 008012, 012061 ]
+"303032" = [  020011, 020016 ]
+"303033" = [  020010, 020016 ]
+"303040" = [  008041, 004025, 004026, 301021, 301122, 201131, 202129, 025069, 007004, 013003,
+               202000, 201000, 002013, 012101, 010009, 102002, 008040, 035035 ]
+"303041" = [  002152, 002023, 007004, 011001, 011002, 002153, 002154, 012071 ]
+"303050" = [  004086, 008042, 007004, 005015, 006015, 011001, 011002 ]
+"303051" = [  004086, 008042, 007004, 005015, 006015, 011061, 011062 ]
+"303052" = [  004086, 008042, 007009, 005015, 006015, 011001, 011002 ]
+"303053" = [  004086, 008042, 007009, 005015, 006015, 011061, 011062 ]
+"303054" = [  004086, 008042, 007004, 010009, 005015, 006015, 012101, 012103, 011001, 011002
+               ]
+"303055" = [  004086, 008042, 007009, 005015, 006015, 012101, 013009, 012103, 011001, 011002
+               ]
+"303056" = [  004086, 008042, 207001, 007004, 010009, 207000, 005015, 006015, 012101, 012103,
+               011001, 011002 ]
+"303099" = [  003005, 003006, 003007, 002096, 003022, 003003, 003020, 003004, 003023, 003008,
+               003009 ]
+"303100" = [  013165, 013045, 013166, 013044, 013042, 013167, 013168, 013169, 013170, 013171
+               ]
+"304001" = [  008003, 010004, 012001, 011001, 011002 ]
+"304002" = [  008003, 010004, 011001, 011002 ]
+"304003" = [  008003, 012001 ]
+"304004" = [  008003, 010004, 020010, 012001 ]
+"304005" = [  002024, 007004, 007004, 013003 ]
+"304006" = [  014001, 014001, 014003 ]
+"304011" = [  002163, 002164, 008012, 007024, 002057, 008021, 004001, 004002, 004003, 004004,
+               008021, 004024, 110004, 008021, 004004, 004005, 004006, 008021, 004004, 004005,
+               004006, 011001, 011002, 103010, 002163, 007004, 012001 ]
+"304030" = [  027031, 028031, 010031 ]
+"304031" = [  001041, 001042, 001043 ]
+"304032" = [  002153, 002154, 020081, 020082, 020012 ]
+"304033" = [  002152, 002166, 002167, 002153, 002154, 012075, 012076, 012063 ]
+"304034" = [  102004, 027001, 028001, 007022, 005043, 020010, 020016, 033003, 010040 ]
+"304035" = [  002153, 002154, 012063, 008001, 012063, 008001, 012063, 008001, 008003, 012063,
+               008003, 012063, 008003, 012063, 008003 ]
+"304036" = [  020082, 008012, 020082, 008012, 020081, 008003, 020081, 008003, 020081, 008003,
+               020081, 008003 ]
+"304037" = [  002153, 002154, 012063, 008011, 012063, 008011, 012063, 008011, 008003, 012063,
+               008003, 012063, 008003, 012063 ]
+"304039" = [  201136, 005042, 201000, 014046 ]
+"304040" = [  025140, 025141, 040026, 040016, 025062, 101000, 031002, 040017 ]
+"305001" = [  011001, 011002, 013060, 013071 ]
+"305002" = [  301012, 012001, 013003, 014051, 013060, 013072, 013080, 013081, 013082, 013083,
+               013084 ]
+"305003" = [  301012, 004065, 101000, 031001, 305001 ]
+"305004" = [  301030, 305002, 305003 ]
+"305006" = [  013072, 013082, 013019, 012001, 013073, 013060 ]
+"305007" = [  301029, 301012, 004065, 101000, 031001, 305006 ]
+"305008" = [  305006, 012030 ]
+"305009" = [  301029, 301012, 004065, 101000, 031001, 305008 ]
+"305010" = [  305008, 002091, 002091 ]
+"305011" = [  301029, 301012, 004065, 101000, 031001, 305010 ]
+"305016" = [  014021, 007004, 013003, 011002, 011001, 011041, 011043 ]
+"305017" = [  013080, 013081, 013083, 013085, 013084 ]
+"305018" = [  301029, 301012, 004065, 103000, 031001, 305008, 305016, 305017 ]
+"306001" = [  002032, 102000, 031001, 007062, 022042 ]
+"306002" = [  002031, 022004, 022031 ]
+"306003" = [  002002, 011011, 011012, 012004 ]
+"306004" = [  002032, 002033, 103000, 031001, 007062, 022043, 022062 ]
+"306005" = [  002031, 103000, 031001, 007062, 022004, 022031 ]
+"306006" = [  306003, 306002, 022063 ]
+"306007" = [  001012, 001014, 306008, 004024, 027003, 028003 ]
+"306008" = [  002034, 002035, 002036 ]
+"306011" = [  301021, 001075, 002147, 301011, 301013 ]
+"306012" = [  002007, 008015, 008032, 306029 ]
+"306013" = [  306012, 301011, 301013, 022120, 022121, 004015, 004065, 102000, 031001, 022038,
+               022040 ]
+"306014" = [  306012, 301011, 301013, 022120, 022121, 004015, 004065, 101000, 031001, 022038
+               ]
+"306016" = [  301011, 301013, 010004, 010051, 302032, 007032, 002002, 008021, 004025, 011001,
+               011002, 004025, 011043, 011041, 025026, 012060 ]
+"306017" = [  002032, 008034, 106000, 031002, 007065, 008080, 033050, 022045, 008080, 033050,
+               008034 ]
+"306018" = [  002032, 008034, 109000, 031002, 007065, 008080, 033050, 022045, 008080, 033050,
+               022064, 008080, 033050, 008034 ]
+"306019" = [  001075, 301011, 301012, 022042, 022120, 022121, 004015, 004065 ]
+"306020" = [  001075, 301011, 301012, 022042, 022120, 022121, 004075, 004065 ]
+"306021" = [  001075, 301011, 301012, 022122, 022123, 012001, 303002 ]
+"306022" = [  001075, 301011, 301012, 022038, 022039 ]
+"306023" = [  001015, 301023, 301011, 301012, 022038, 022039, 022120, 022121 ]
+"306024" = [  306020, 102006, 022038, 022039 ]
+"306025" = [  306019, 102006, 022038, 022039 ]
+"306027" = [  001005, 001052, 002047, 301011, 301013 ]
+"306028" = [  306027, 301011, 301013, 301021 ]
+"306029" = [  025170, 025171, 025172 ]
+"306030" = [  306027, 306029, 111000, 031001, 033002, 301011, 301013, 025025, 025025, 025026,
+               022185, 004015, 004065, 101004, 022182 ]
+"306031" = [  306027, 306029, 001053, 033002, 301011, 301013, 301011, 301013, 022185, 022182,
+               004016, 004066, 101000, 031001, 022184 ]
+"306033" = [  002033, 007063, 022064 ]
+"306034" = [  002031, 003010, 002040, 022005, 022032 ]
+"306035" = [  112000, 031002, 007062, 008080, 033050, 007065, 008080, 033050, 022043, 008080,
+               033050, 022064, 008080, 033050 ]
+"306036" = [  112000, 031002, 007062, 008080, 033050, 007065, 008080, 033050, 022031, 008080,
+               033050, 022004, 008080, 033050 ]
+"306037" = [  109000, 031002, 007062, 008080, 033050, 007065, 008080, 033050, 022188, 008080,
+               033050 ]
+"306038" = [  010004, 010051, 007033, 012101, 012103, 013003, 007033, 008021, 004025, 011001,
+               011002, 008021, 004025, 011041, 004025, 007033, 002005, 007063, 022049 ]
+"306039" = [  022078, 022070, 022073, 022074, 022071, 022076, 022077 ]
+"306040" = [  022078, 022082, 106000, 031001, 022080, 022069, 022086, 022087, 022088, 022089
+               ]
+"306041" = [  002032, 102000, 031001, 007062, 022043 ]
+"306042" = [  002169, 007033, 008021, 004025, 011001, 011002 ]
+"306043" = [  041001, 008043, 015028, 008043, 013080, 041005, 041003, 022188, 041002, 106000,
+               031000, 004024, 014002, 014002, 014012, 014004, 004024 ]
+"306044" = [  203014, 022188, 203255, 108000, 031002, 007065, 008080, 033050, 201129, 022188,
+               201000, 008080, 033050, 203000 ]
+"306045" = [  203011, 041004, 203255, 106000, 031002, 007065, 008080, 033050, 041004, 008080,
+               033050, 203000 ]
+"306046" = [  203015, 041003, 203255, 106000, 031002, 007065, 008080, 033050, 041003, 008080,
+               033050, 203000 ]
+"306047" = [  106000, 031002, 007065, 008080, 033050, 041006, 008080, 033050 ]
+"306048" = [  203009, 041007, 203255, 106000, 031002, 007065, 008080, 033050, 041007, 008080,
+               033050, 203000 ]
+"307001" = [  301031, 302011 ]
+"307002" = [  301032, 302011 ]
+"307003" = [  307001, 101000, 031001, 302005 ]
+"307004" = [  307002, 101000, 031001, 302005 ]
+"307005" = [  307001, 101004, 302005 ]
+"307006" = [  307002, 101004, 302005 ]
+"307007" = [  301031, 302012 ]
+"307008" = [  301032, 302012 ]
+"307009" = [  301031, 302013 ]
+"307011" = [  001063, 002001, 301011, 301012, 301024, 007006, 011001, 011016, 011017, 011002,
+               011041, 007006, 012001, 012003, 010052, 020009 ]
+"307012" = [  103000, 031001, 008023, 005021, 020001 ]
+"307013" = [  106000, 031001, 001064, 008014, 020061, 008014, 020061, 020018 ]
+"307014" = [  101000, 031001, 020019 ]
+"307015" = [  101000, 031001, 302005, 020002 ]
+"307016" = [  101000, 031001, 020020 ]
+"307017" = [  101000, 031001, 011070 ]
+"307018" = [  008016, 102000, 031001, 008017, 301012, 104000, 031001, 007006, 011001, 011002,
+               011041, 020009, 101000, 031001, 020001, 307014 ]
+"307020" = [  307011, 307014, 307016 ]
+"307021" = [  307011, 307012, 307013, 307014, 307015, 307016, 307017, 307018, 307015 ]
+"307022" = [  001015, 301011, 301012, 301022, 008021, 004025, 010004, 012001, 013003, 033038,
+               008022, 106025, 002020, 001050, 005021, 007021, 015031, 015032, 008060, 015033,
+               015034, 008060, 015033, 015034, 015035, 201131, 202129, 013016, 202000, 201000,
+               015011 ]
+"307024" = [  301150, 001015, 001040, 008021, 301011, 301013, 301022, 010036, 025061, 010004,
+               012001, 013003, 120000, 031000, 025060, 008021, 004025, 115000, 031001, 015079,
+               015080, 008022, 033093, 015089, 015035, 102002, 008060, 015083, 201131, 202129,
+               013016, 202000, 201000, 015011, 131000, 031000, 025060, 008021, 004025, 033093,
+               125000, 031001, 002020, 001050, 001150, 202127, 304030, 202000, 005021, 007021,
+               015038, 015039, 015090, 015081, 015082, 015079, 015089, 015035, 102002, 008060,
+               015083, 015084, 015085, 015086, 015087, 015088, 015011 ]
+"307030" = [  015001, 015002 ]
+"307031" = [  008022, 008023, 015001, 008023, 015001, 008023, 015002 ]
+"307041" = [  301001, 001015, 301024, 301011, 301012, 301070, 307030 ]
+"307042" = [  301001, 001015, 301024, 301011, 301012, 008021, 004025, 301070, 307031 ]
+"307043" = [  301001, 001015, 301024, 301011, 301012, 301074, 307030 ]
+"307044" = [  301001, 001015, 301024, 301011, 301012, 008021, 004025, 301074, 307031 ]
+"307045" = [  001063, 008079, 002001, 301011, 301012, 301023, 007030, 007031, 007032, 011001,
+               011016, 011017, 008054, 011083, 011084, 011002, 008054, 011085, 011086, 011041,
+               008054, 007032, 012023, 012024, 007032, 010052, 020009 ]
+"307046" = [  020060, 102000, 031001, 005021, 020059 ]
+"307047" = [  105000, 031001, 008002, 020011, 020012, 020013, 020092, 020002, 020091 ]
+"307048" = [  008016, 102000, 031001, 008017, 301012, 112000, 031000, 007032, 011001, 008054,
+               011083, 011084, 011002, 008054, 011085, 011086, 011041, 008054, 007032, 020009,
+               101000, 031000, 020060, 307014, 307047 ]
+"307049" = [  102000, 031000, 022043, 022021 ]
+"307050" = [  101000, 031000, 020085, 102000, 031001, 001064, 020085, 105000, 031001, 001064,
+               020086, 020087, 020088, 020089 ]
+"307051" = [  307045, 307046, 307013, 307014, 307047, 307016, 307017, 307049, 307050, 101000,
+               031001, 307048 ]
+"307052" = [  001063, 008039, 301011, 301012, 008079, 008039, 301011, 301012, 008039, 301011,
+               301012, 301023, 007030, 007031 ]
+"307053" = [  007032, 011001, 008054, 011083, 011084, 011002, 008054, 011085, 011086, 011041,
+               008054, 007032, 020009, 020060, 307014, 307047 ]
+"307054" = [  007032, 008039, 004003, 004004, 008023, 012023, 008039, 004003, 004004, 008023,
+               012023, 008023, 007032 ]
+"307055" = [  033045, 008016, 008039, 004003, 301012, 008039, 004003, 301012, 307053 ]
+"307056" = [  307052, 307053, 307054, 101000, 031001, 307055 ]
+"307060" = [  007061, 012030 ]
+"307061" = [  301031, 101005, 307060 ]
+"307062" = [  301032, 101005, 307060 ]
+"307063" = [  007061, 012130 ]
+"307064" = [  004025, 106000, 031001, 007061, 201131, 202129, 012130, 201000, 202000 ]
+"307071" = [  301090, 004074, 004023, 008023, 010004, 010051, 007004, 010009, 007032, 012101,
+               002051, 004051, 012118, 004052, 012119, 013004, 008023, 012151, 007032, 102005,
+               008050, 008020, 014032, 014033, 008050, 008020, 102018, 008052, 008022, 007032,
+               008053, 004003, 012152, 008053, 004003, 012153, 008053, 004003, 008023, 012101,
+               008053, 004003, 008023, 012101, 008023, 007032, 002002, 008053, 004003, 011046,
+               008053, 004003, 004004, 004023, 007032, 013060, 013051, 004053, 008050, 008020,
+               102006, 008052, 008022, 008053, 004003, 013052, 007032 ]
+"307072" = [  004001, 004001, 004002, 004003, 004004, 004074, 004022, 008023, 010004, 010051,
+               007004, 010009, 007032, 012101, 002051, 004051, 012118, 004052, 012119, 013004,
+               012151, 007032, 014032, 008023, 004001, 004001, 004002, 004003, 004004, 004022,
+               007032, 008023, 013060, 004053, 008023, 102008, 008050, 008020 ]
+"307073" = [  307071, 307072 ]
+"307074" = [  301001, 004001, 004002, 301021, 007030, 007032, 112000, 031001, 004003, 004004,
+               004024, 102003, 008023, 012101, 008023, 004004, 004024, 013060, 013012, 013013
+               ]
+"307075" = [  301150, 301001, 301021, 007030, 008095, 008096, 008094, 301011, 004023, 301013,
+               204008, 031021, 013060, 204000, 004023, 301013, 204008, 031021, 013012, 204000,
+               004023, 301013, 204008, 031021, 013013, 204000, 007032, 107003, 004023, 301013,
+               008023, 204008, 031021, 012101, 204000, 008023 ]
+"307076" = [  301090, 004074, 004023, 008023, 010004, 010051, 007004, 010009, 007032, 012101,
+               002051, 004051, 012118, 004052, 012119, 013004, 008023, 012151, 007032, 102005,
+               008050, 008020, 014032, 014033, 008050, 008020, 102018, 008052, 008022, 007032,
+               008053, 004003, 012152, 008053, 004003, 012153, 008053, 004003, 008023, 012101,
+               008053, 004003, 008023, 012101, 008023, 007032, 002002, 008053, 004003, 011046,
+               008053, 004003, 004004, 004074, 004023, 007032, 013060, 013051, 004053, 008050,
+               008020, 102006, 008052, 008022, 008053, 004003, 013052, 007032 ]
+"307077" = [  004001, 004001, 004002, 004003, 004004, 004074, 004022, 008023, 010004, 010051,
+               007004, 010009, 007032, 012101, 002051, 004051, 012118, 004052, 012119, 013004,
+               012151, 007032, 014032, 008023, 004001, 004001, 004002, 004003, 004004, 004074,
+               004022, 007032, 008023, 013060, 004053, 008023, 102008, 008050, 008020 ]
+"307078" = [  307076, 307077 ]
+"307079" = [  301090, 302031, 302035, 302036, 101000, 031000, 302047, 008002, 101000, 031000,
+               302048, 302037, 102000, 031000, 022061, 020058, 101000, 031000, 302056, 101000,
+               031000, 302055, 302043, 302044, 101000, 031001, 302045, 101000, 031000, 302046
+               ]
+"307080" = [  301090, 302031, 302035, 302036, 302047, 008002, 302048, 302037, 302043, 302044,
+               101002, 302045, 302046 ]
+"307081" = [  301090, 302031, 302035, 302036, 302047, 008002, 302048, 302037, 012122, 013056,
+               013057, 020101, 020102, 020103, 020104, 020105, 020106, 020107, 020108, 302043,
+               302044, 101002, 302045, 302046 ]
+"307082" = [  301090, 302031, 302035, 302036, 302047, 008002, 302048, 302037, 012121, 012122,
+               302043, 302044, 101002, 302045, 302046 ]
+"307083" = [  301090, 302031, 302035, 302036, 302047, 008002, 302048, 302037, 012122, 302043,
+               302044, 101002, 302045, 302046 ]
+"307084" = [  301090, 302031, 302035, 302036, 302047, 008002, 302048, 302037, 020055, 101000,
+               031001, 205001, 302043, 302044, 101002, 302045, 302046 ]
+"307086" = [  301090, 302031, 302035, 302036, 008002, 302037, 302066, 302043, 302044, 101002,
+               302045 ]
+"307087" = [  301001, 002001, 301011, 301012, 301023, 007030, 007031, 302001, 010062, 007004,
+               010009, 007032, 012101, 012103, 013003, 007032, 020001, 302004, 101000, 031001,
+               302005 ]
+"307088" = [  020003, 004024, 020004, 020005, 004024, 002004, 013033, 102002, 004024, 014031,
+               102002, 004024, 013011, 007032, 004024, 012111, 004024, 012112, 007032, 002002,
+               008021, 004025, 011001, 011002, 008021 ]
+"307089" = [  307087, 307088 ]
+"307090" = [  301092, 302031, 302035, 302036, 302047, 008002, 302048, 302037, 302043, 302044,
+               101002, 302045, 302046 ]
+"307091" = [  301089, 301090, 008010, 301091, 302001, 007004, 010009, 302072, 103000, 031000,
+               101005, 307063, 007061, 101000, 031000, 302069, 007032, 007033, 105000, 031000,
+               020031, 020032, 002038, 022043, 302021, 101000, 031000, 302078, 101000, 031000,
+               302073, 101000, 031000, 302074, 101000, 031000, 302175, 102000, 031000, 004025,
+               302076, 302071, 302077, 007033, 101000, 031000, 302079, 007032, 101000, 031000,
+               302080, 101000, 031000, 302081, 101000, 031000, 302082, 102000, 031000, 004025,
+               013059, 101000, 031000, 302083, 033005, 033006 ]
+"307092" = [  301150, 301001, 208040, 001019, 208000, 301011, 301012, 301021, 007030, 001023,
+               108000, 031000, 007031, 204018, 031021, 010004, 010051, 007004, 010009, 204000,
+               115000, 031001, 007032, 008010, 204018, 031021, 012101, 012103, 202129, 201132,
+               013003, 201000, 202000, 013009, 204000, 007032, 008010, 107000, 031001, 007061,
+               204018, 031021, 012130, 013111, 204000, 007061, 105000, 031000, 033041, 204018,
+               031021, 020001, 204000, 113000, 031000, 204018, 031021, 020010, 204000, 107000,
+               031001, 008002, 204018, 031021, 020011, 020013, 204000, 008002, 105000, 031000,
+               204018, 031021, 020062, 013013, 204000, 105000, 031000, 004025, 204018, 031021,
+               020003, 204000, 105000, 031000, 004025, 204018, 031021, 013011, 204000, 115000,
+               031001, 007032, 008021, 004025, 204018, 031021, 011001, 011002, 204000, 008021,
+               204018, 031021, 011043, 011041, 204000, 007032, 105000, 031000, 004025, 204018,
+               031021, 014031, 204000, 110000, 031000, 004025, 204018, 031021, 014002, 014002,
+               014004, 014028, 014029, 014030, 204000, 113000, 031000, 004025, 002071, 002072,
+               204018, 031021, 014072, 204000, 002071, 002072, 204018, 031021, 014072, 204000
+               ]
+"307096" = [  301090, 301089, 008010, 301091, 302084, 302085, 033005, 033006 ]
+"307101" = [  301089, 001019, 002001, 301011, 301012, 301021, 007030, 007032, 012101, 007032,
+               002177, 020062, 013013 ]
+"307102" = [  301089, 001018, 001015, 001104, 001105, 001106, 003017, 003018, 003019, 301011,
+               301012, 301021, 007030, 007032, 012101, 012103, 013003, 007032, 020001, 109000,
+               031001, 003016, 012128, 102000, 031001, 007061, 012129, 007061, 013116, 020138,
+               004025, 020024, 013055, 020021, 013011, 007032, 008021, 004025, 011001, 011002,
+               008021, 004025, 011043, 011041, 033005 ]
+"307103" = [  301150, 307101, 013117, 003028, 013163 ]
+"307182" = [  301090, 302031, 302035, 302036, 302047, 008002, 302048, 302037, 012120, 012122,
+               302043, 302044, 101002, 302045, 302046 ]
+"308001" = [  301033, 302011, 022042 ]
+"308002" = [  301034, 302011, 022042 ]
+"308003" = [  301035, 302011, 022042 ]
+"308004" = [  301036, 302011, 022042 ]
+"308005" = [  308004, 302024 ]
+"308006" = [  010004, 010061, 010063, 011001, 011002, 012004, 013003, 022042 ]
+"308007" = [  301055, 302011, 007062, 022042 ]
+"308009" = [  301093, 302001, 302054, 008002, 302055, 302057, 302060 ]
+"308010" = [  001011, 113000, 031001, 301011, 301012, 301021, 004080, 022049, 004080, 022059,
+               004080, 022005, 002042, 022032, 002042, 004080 ]
+"308011" = [  001011, 002001, 301011, 301012, 301023, 007030, 007031, 004074, 004023, 008023,
+               010051, 007032, 007033, 012101, 013004, 007032, 007033, 302056, 008023, 004003,
+               004004, 004023, 007032, 013060, 013051, 004053, 007032 ]
+"308012" = [  004001, 004001, 004002, 004003, 004004, 004074, 004022, 008023, 010051, 007032,
+               007033, 012101, 013004, 007032, 007033, 302056, 008023, 004001, 004001, 004002,
+               004003, 004004, 004022, 007032, 008023, 013060, 004053, 008023 ]
+"308013" = [  308011, 308012 ]
+"308014" = [  101000, 031000, 301018, 003001, 301093, 208032, 001079, 208000, 302062, 302063,
+               101000, 031000, 302092, 101000, 031000, 306033, 101000, 031000, 306034, 101000,
+               031000, 306043 ]
+"308015" = [  001003, 001020, 001005, 001011, 001007, 001001, 001002, 002044, 002045, 301011,
+               301012, 301021, 022063, 022076, 022077, 022094, 025043, 022078, 105002, 002046,
+               022070, 022071, 022073, 022074, 127000, 031001, 002046, 008090, 022102, 008090,
+               022084, 120000, 031001, 022080, 022108, 022086, 022087, 022088, 022089, 105000,
+               031001, 008090, 022104, 008090, 022186, 022187, 105000, 031001, 008090, 022106,
+               008090, 022186, 022187 ]
+"308016" = [  001003, 001020, 001005, 001011, 001007, 001001, 001002, 002044, 002045, 301011,
+               301012, 301021, 022063, 022076, 022077, 022094, 025044, 022079, 105002, 002046,
+               022070, 022072, 022073, 022075, 127000, 031001, 002046, 008090, 022103, 008090,
+               022084, 120000, 031001, 022081, 022108, 022086, 022087, 022088, 022089, 105000,
+               031001, 008090, 022105, 008090, 022186, 022187, 105000, 031001, 008090, 022107,
+               008090, 022186, 022187 ]
+"308017" = [  301056, 302001, 302052, 101000, 031000, 302056, 302064, 302053, 101000, 031000,
+               302004, 101000, 031000, 302005, 101000, 031000, 302038, 101000, 031000, 306039
+               ]
+"308018" = [  301150, 301093, 302001, 302072, 101000, 031000, 302056, 101000, 031000, 302064
+               ]
+"308021" = [  001011, 002001, 301011, 301012, 301023, 007030, 007031, 004074, 004023, 008023,
+               010051, 007032, 007033, 012101, 013004, 007032, 007033, 302056, 008023, 004003,
+               004004, 004074, 004023, 007032, 013060, 013051, 004053, 007032 ]
+"308022" = [  004001, 004001, 004002, 004003, 004004, 004074, 004022, 008023, 010051, 007032,
+               007033, 012101, 013004, 007032, 007033, 302056, 008023, 004001, 004001, 004002,
+               004003, 004004, 004074, 004022, 007032, 008023, 013060, 004053, 008023 ]
+"308023" = [  308021, 308022 ]
+"309001" = [  301037, 101000, 031001, 303011 ]
+"309002" = [  301038, 101000, 031001, 303011 ]
+"309003" = [  301037, 101000, 031001, 303012 ]
+"309004" = [  301038, 101000, 031001, 303012 ]
+"309005" = [  301037, 302004, 101000, 031001, 303013 ]
+"309006" = [  301038, 302004, 101000, 031001, 303013 ]
+"309007" = [  301037, 302004, 101000, 031001, 303014 ]
+"309008" = [  301038, 302004, 101000, 031001, 303014 ]
+"309011" = [  301039, 101000, 031001, 303011 ]
+"309012" = [  301039, 101000, 031001, 303012 ]
+"309013" = [  301039, 302004, 101000, 031001, 303013 ]
+"309014" = [  301039, 302004, 101000, 031001, 303014 ]
+"309015" = [  301040, 101000, 031001, 303011 ]
+"309016" = [  301040, 101000, 031001, 303012 ]
+"309017" = [  301040, 302004, 101000, 031001, 303013 ]
+"309018" = [  301040, 302004, 101000, 031001, 303014 ]
+"309019" = [  301031, 002003, 101000, 031001, 303011 ]
+"309020" = [  301031, 002003, 104000, 031001, 007003, 011003, 011004, 011005 ]
+"309021" = [  301001, 005001, 006001, 007030, 301014, 002003, 002121, 112000, 031001, 007007,
+               301021, 011003, 011110, 011004, 011111, 033002, 011006, 011112, 033002, 010071,
+               027079 ]
+"309022" = [  301001, 005001, 006001, 007030, 301014, 002003, 002121, 110000, 031001, 007007,
+               301021, 012007, 012008, 033002, 011006, 011112, 033002, 010071, 027079 ]
+"309023" = [  301001, 005001, 006001, 007030, 301014, 002003, 302004, 302005, 114000, 031001,
+               007007, 301021, 101000, 031001, 002121, 015063, 015064, 015065, 015066, 015067,
+               015068, 015069, 015070, 015071, 015072, 033002, 010071, 027079 ]
+"309024" = [  301132, 201151, 202130, 002121, 202000, 201000, 008021, 004025, 109000, 031002,
+               007007, 301021, 011003, 011004, 033002, 011006, 033002, 010071, 027079 ]
+"309025" = [  301132, 201151, 202130, 002121, 202000, 201000, 008021, 004025, 106000, 031002,
+               007007, 301021, 012007, 033002, 010071, 027079 ]
+"309026" = [  301132, 302004, 302005, 008092, 008093, 008021, 004025, 201138, 202126, 002121,
+               202000, 201000, 115000, 031002, 007007, 301021, 015073, 015064, 015074, 015066,
+               015075, 015068, 015076, 015077, 015078, 015072, 033002, 010071, 027079 ]
+"309027" = [  301132, 008043, 025061, 302004, 302005, 008092, 008093, 008021, 004025, 118000,
+               031001, 002090, 115000, 031002, 007007, 301021, 015073, 015064, 015074, 015066,
+               015075, 015068, 015076, 015077, 015078, 015072, 033002, 010071, 027079 ]
+"309030" = [  015004, 015005, 104000, 031001, 004015, 008006, 007004, 015003 ]
+"309031" = [  015004, 015005, 104000, 031001, 004025, 008006, 007004, 015003 ]
+"309040" = [  301075, 301076, 309030 ]
+"309041" = [  307041, 301075, 301076, 309030 ]
+"309042" = [  307042, 301075, 301076, 309030 ]
+"309043" = [  307043, 301075, 301076, 309030 ]
+"309044" = [  307044, 301075, 301076, 309030 ]
+"309045" = [  301075, 301076, 309031 ]
+"309046" = [  307041, 301075, 301076, 309031 ]
+"309047" = [  307042, 301075, 301076, 309031 ]
+"309048" = [  307043, 301075, 301076, 309031 ]
+"309049" = [  307044, 301075, 301076, 309031 ]
+"309050" = [  301110, 301113, 301114, 101000, 031002, 303050, 101000, 031001, 303051 ]
+"309051" = [  301110, 301113, 301114, 101000, 031002, 303052, 101000, 031001, 303053 ]
+"309052" = [  301111, 301113, 301114, 302049, 022043, 101000, 031002, 303054, 101000, 031001,
+               303051 ]
+"309053" = [  301112, 301113, 301114, 101000, 031002, 303054, 101000, 031001, 303051 ]
+"309054" = [  301001, 001011, 301011, 301012, 301021, 007030, 007031, 007007, 004023, 004059,
+               115000, 031001, 008001, 008023, 007004, 010009, 012101, 012103, 008023, 011001,
+               011002, 008023, 011019, 008050, 008020, 008050, 008020 ]
+"309055" = [  301111, 025061, 001081, 001082, 002067, 002095, 002096, 002097, 002081, 002082,
+               002084, 002191, 301113, 301114, 010004, 302032, 007032, 002002, 011001, 011002,
+               007032, 020003, 302049, 022043, 101000, 031002, 303055 ]
+"309056" = [  301150, 301111, 301128, 301113, 008091, 301021, 007007, 008091, 101000, 031002,
+               303056, 101000, 031001, 303051 ]
+"309057" = [  301150, 301111, 301128, 301113, 301114, 302049, 022043, 101000, 031002, 303056,
+               101000, 031001, 303051 ]
+"309060" = [  301123, 301121, 302050, 303040 ]
+"309061" = [  301120, 008041, 301122, 201131, 202129, 025069, 007004, 202000, 201000, 033007,
+               033035, 033015, 013009, 033007, 033035, 033015, 002013, 012101, 033007, 033035,
+               033015 ]
+"309062" = [  301120, 008041, 301122, 005001, 033035, 033015, 006001, 033035, 033015, 007007,
+               033035, 033015, 011003, 033035, 033015, 011004, 033035, 033015, 033007 ]
+"309063" = [  301120, 008041, 301122, 005001, 033035, 033015, 006001, 033035, 033015, 007007,
+               033035, 033015, 011003, 033035, 033015, 011004, 033035, 033015, 033007 ]
+"309064" = [  301120, 008041, 301122, 201131, 202129, 104002, 025069, 007004, 033035, 033015,
+               013003, 033035, 033015, 202000, 201000, 104002, 002013, 012101, 033035, 033015,
+               012103, 033035, 033015, 010009, 033035, 033015 ]
+"309065" = [  301120, 008041, 301122, 005001, 033035, 033015, 006001, 033035, 033015, 007007,
+               033035, 033015, 011003, 033035, 033015, 011004, 033035, 033015 ]
+"309066" = [  301120, 008041, 301122, 008040, 201131, 202129, 025069, 007004, 013003, 202000,
+               201000, 002013, 012101, 012103, 010009, 010007, 011002, 011001 ]
+"309070" = [  001035, 001032, 001015, 001063, 301001, 301011, 301012, 301021, 207001, 010001,
+               207000, 008086, 007030, 025031, 008021, 004014, 010004, 010051, 010009, 020010,
+               013095, 128000, 031002, 113000, 031000, 008086, 007004, 011001, 011002, 012101,
+               012102, 012103, 010009, 103000, 031000, 011021, 011022, 011005, 104000, 031000,
+               008086, 007006, 011001, 011002, 105000, 031000, 008086, 007006, 012101, 012102,
+               012103 ]
+"309071" = [  301001, 002014, 002003, 301113, 301114, 301023, 007030, 007007, 103000, 031001,
+               007009, 011001, 011002 ]
+"309072" = [  301132, 107000, 031001, 003032, 003033, 002106, 102000, 031001, 003032, 012190,
+               113000, 031001, 008021, 301011, 301013, 008021, 004026, 002134, 002135, 020143,
+               103000, 031001, 003032, 033021, 012063, 114000, 031001, 008021, 301011, 301013,
+               008021, 004026, 002134, 002135, 105000, 031001, 003034, 003031, 002106, 033021,
+               012063 ]
+"309073" = [  301132, 008021, 004026, 013095, 013109, 020013, 008092, 008093, 013095, 013109,
+               020013, 008092, 008093, 303100, 117000, 031002, 007007, 301021, 033021, 012001,
+               033021, 013002, 033021, 013003, 008092, 008093, 012001, 013002, 013003, 008092,
+               008093, 010071, 027079 ]
+"310001" = [  301042, 303031, 303032, 101026, 303025 ]
+"310002" = [  301042, 303031, 303032, 101009, 303023 ]
+"310003" = [  301042, 303031, 303032, 101006, 303023 ]
+"310004" = [  301042, 303031, 303032, 101003, 303024 ]
+"310005" = [  301042, 303031, 303033, 101000, 031001, 303025 ]
+"310006" = [  301042, 303031, 303033, 101000, 031001, 303023 ]
+"310007" = [  301042, 303031, 303033, 101000, 031001, 303024 ]
+"310008" = [  310011, 101019, 310012, 002150, 025079, 025080, 033032, 014045 ]
+"310009" = [  310011, 101015, 310012 ]
+"310010" = [  310011, 101005, 310012 ]
+"310011" = [  008070, 001033, 001034, 008070, 001033, 001034, 001007, 002048, 005040, 025075,
+               201133, 005041, 201000, 005043, 025070, 033030, 033031, 004001, 004002, 004003,
+               004004, 004005, 202131, 201138, 004006, 201000, 202000, 005001, 006001, 202126,
+               007001, 202000, 007024, 005021, 007025, 005022, 033033, 002151, 012064, 002151,
+               012064, 002151, 012064, 002151, 012064 ]
+"310012" = [  002150, 025076, 025077, 025078, 033032, 201132, 202129, 012063, 202000, 201000
+               ]
+"310013" = [  001007, 005040, 004001, 004002, 004003, 004004, 004005, 004006, 005001, 006001,
+               007025, 005043, 025085, 201131, 202129, 002150, 008023, 008072, 014027, 008072,
+               014027, 002150, 008023, 008072, 014027, 008072, 014027, 002150, 008023, 008072,
+               014027, 008072, 014027, 202000, 201000, 201132, 202129, 002150, 008023, 008072,
+               012063, 008072, 012063, 002150, 008023, 008072, 012063, 008072, 012063, 008023,
+               008072, 012063, 008072, 012063, 002150, 008023, 008072, 012063, 008072, 012063,
+               202000, 201000 ]
+"310014" = [  301072, 303041, 304011 ]
+"310015" = [  301072, 007024, 010002, 303041, 101003, 304032, 002152, 002024, 007004, 007004,
+               013003, 101003, 304033 ]
+"310016" = [  301072, 007024, 010002, 303041, 101012, 304032, 002152, 002024, 007004, 007004,
+               013003, 101012, 304033 ]
+"310018" = [  001007, 005040, 004001, 004043, 004004, 004005, 004006, 207002, 026030, 207000,
+               005002, 006002, 033072, 007025, 005022, 207002, 015001, 207000, 008003, 207001,
+               010004, 207000, 008003, 008003, 033042, 207001, 007004, 207000, 207002, 015001,
+               207000, 008003, 207002, 020081, 207000, 020065, 008029, 207004, 015030, 207000,
+               008075 ]
+"310019" = [  001007, 002019, 301011, 301013, 301023, 007025, 008021, 007025, 008021, 007025,
+               008021, 008029, 005040, 008075, 008003, 010004, 008003, 207002, 015001, 207000,
+               033070, 015030, 207002, 020081, 207000, 008003, 033042, 007004, 207002, 015001,
+               207000, 008003, 113021, 007004, 007004, 207002, 008021, 015005, 008021, 015005,
+               033007, 207000, 008026, 101020, 025143, 008026, 008043, 109015, 007004, 008090,
+               207006, 015008, 207000, 008090, 207002, 033007, 207000, 008043, 033071, 108008,
+               202124, 201107, 002071, 201000, 202000, 207002, 020081, 207000 ]
+"310020" = [  310022, 301011, 301013, 301021, 304034, 310021 ]
+"310021" = [  108000, 031001, 201131, 202129, 007004, 007004, 202000, 201000, 015020, 010002
+               ]
+"310022" = [  001007, 002019, 001033, 002172 ]
+"310023" = [  301072, 030021, 030022, 008012, 007024, 007025, 010002, 101012, 304032, 105002,
+               002152, 002024, 007004, 007004, 013003, 101012, 304033 ]
+"310024" = [  301072, 030021, 030022, 008012, 007024, 007025, 010002, 101003, 304032, 105002,
+               002152, 002024, 007004, 007004, 013003, 101003, 304033 ]
+"310025" = [  001007, 008021, 004001, 004002, 004003, 004004, 004005, 201138, 202131, 004006,
+               202000, 201000, 201132, 005041, 201000, 201129, 005043, 201000, 005002, 006002,
+               013040, 020029, 104024, 005042, 012163, 021083, 021084, 115003, 004001, 004002,
+               004003, 201142, 202131, 004026, 202000, 201000, 005001, 006001, 201138, 202129,
+               007001, 202000, 201000, 008021, 004001, 004002, 004003, 004004, 004005, 005040,
+               101003, 012070, 025054, 101004, 025055, 008007, 104028, 005002, 006002, 002111,
+               005021 ]
+"310026" = [  310022, 025060, 008021, 301011, 301012, 201138, 202131, 004006, 202000, 201000,
+               033039, 033007, 304030, 304031, 002020, 001050, 202127, 304030, 202000, 304031,
+               201133, 202131, 004016, 202000, 201000, 301021, 304030, 010035, 005021, 010036,
+               113000, 031002, 301021, 005021, 108000, 031001, 002121, 007040, 015037, 008023,
+               201125, 015037, 201000, 008023, 033007, 108000, 031002, 007007, 015036, 008023,
+               201123, 015036, 201000, 008023, 033007, 116000, 031002, 007009, 010004, 012001,
+               013001, 008023, 201120, 010004, 201000, 201122, 012001, 201000, 201123, 013001,
+               201000, 008023, 033007, 008003, 007009, 010004, 008023, 201120, 010004, 201000,
+               008023, 033007 ]
+"310027" = [  301071, 301011, 301013, 301021, 030021, 030022, 010002, 304036, 002152, 002167,
+               101011, 304035 ]
+"310028" = [  301071, 301011, 301013, 301021, 030021, 030022, 010002, 304036, 002152, 002167,
+               101011, 304037 ]
+"310029" = [  110000, 031001, 201138, 202130, 007004, 007004, 202000, 201000, 015020, 010002,
+               012101, 013098 ]
+"310030" = [  310022, 301011, 301013, 301021, 304034, 310029 ]
+"310050" = [  310051, 310052, 101000, 031002, 310053, 101004, 310054, 020010, 310052, 101015,
+               310053, 310052, 101005, 310053 ]
+"310051" = [  001007, 005040, 201133, 005041, 201000, 201132, 025070, 201000, 202126, 007001,
+               202000, 007025, 005022, 102009, 002151, 012064 ]
+"310052" = [  002019, 301011, 301012, 202131, 201138, 004006, 201000, 202000, 301021, 007024,
+               005021, 005043 ]
+"310053" = [  201134, 005042, 201000, 025076, 033032, 012163 ]
+"310054" = [  201134, 005042, 201000, 025076, 033032, 201131, 202129, 102002, 008023, 014027,
+               008023, 202000, 201000 ]
+"310055" = [  310051, 310052, 102020, 025076, 025052, 101000, 031002, 025050 ]
+"310060" = [  001007, 001033, 002019, 002020, 301011, 301012, 207003, 004006, 207000, 304030,
+               301021, 007024, 005021, 007025, 005022, 008075, 201133, 005041, 201000, 005045,
+               005043, 005040, 010001, 201129, 007002, 201000, 202127, 201125, 021166, 201000,
+               202000, 008012, 020010, 020014, 002165, 033075, 107003, 008076, 006029, 006029,
+               025140, 025141, 033076, 033077, 008076, 033078, 033003, 104000, 031002, 201133,
+               005042, 201000, 014044 ]
+"310061" = [  001007, 001033, 001034, 002019, 002020, 301011, 301012, 207003, 004006, 207000,
+               005040, 005041, 005043, 033079, 033080, 033078, 301021, 201129, 007002, 201000,
+               007024, 005021, 007025, 005022, 025075, 111000, 031002, 005042, 202131, 002153,
+               002154, 202000, 002104, 012066, 012163, 012158, 012159, 033081 ]
+"310062" = [  001007, 001033, 001034, 002019, 002020, 301011, 301012, 207003, 004006, 207000,
+               005040, 201133, 005041, 005043, 201000, 008076, 033082, 301021, 201129, 007002,
+               201000, 007024, 005021, 007025, 005022, 008072, 008029, 105000, 031002, 005042,
+               002155, 033083, 014043, 015042 ]
+"310063" = [  001007, 001033, 001034, 002019, 002020, 301011, 301012, 207003, 004006, 207000,
+               005040, 201133, 005041, 005043, 201000, 033082, 301021, 201129, 007002, 201000,
+               007024, 005021, 007025, 005022, 008075, 008013, 008072, 033084, 007062, 033086,
+               022043, 007062, 007062, 033086, 022043 ]
+"310064" = [  001007, 001033, 001034, 002019, 002020, 301011, 301012, 207003, 004006, 207000,
+               005040, 201133, 005041, 005043, 201000, 033082, 301021, 201129, 007002, 201000,
+               007024, 005021, 007025, 005022, 008075, 008029, 008046, 033085, 033086, 015049,
+               033086, 102011, 002155, 015062 ]
+"310065" = [  001007, 001033, 001034, 002019, 002020, 301011, 301012, 207003, 004006, 207000,
+               005040, 033082, 301021, 201129, 007002, 201000, 007024, 005021, 007025, 005022,
+               008075, 033071, 033070, 020021, 015045, 015046, 008065, 033087, 008003, 010004,
+               008003, 207002, 015001, 207000, 105012, 010040, 010004, 207003, 015005, 207000,
+               008046, 107019, 010040, 010004, 008090, 207006, 015008, 207000, 008090 ]
+"310066" = [  001007, 001033, 001034, 002019, 002020, 301011, 301012, 207003, 004006, 207000,
+               005040, 033082, 301021, 201129, 007002, 201000, 007024, 005021, 007025, 005022,
+               008075, 020081, 207004, 015030, 207000, 020065, 015041, 033086, 033087, 033088,
+               008003, 207001, 007004, 207000, 008003, 207002, 015001, 207000, 008003, 033042,
+               207001, 007004, 207000, 207002, 015001, 207000, 008003, 001032, 207002, 015001,
+               207000 ]
+"310067" = [  001033, 001034, 025061, 025062, 001007, 002153, 001012, 201138, 002026, 002027,
+               201000, 002028, 002029, 002161, 002164, 002023, 008012, 008013, 001124, 005001,
+               006001, 004001, 004002, 004003, 004004, 004005, 004006, 004086, 011001, 011002,
+               011003, 011004, 002162, 007004, 012001, 020014, 007024, 001023, 104000, 031001,
+               002162, 007004, 012001, 020014, 113000, 031001, 004086, 002020, 001007, 002019,
+               005042, 002153, 005040, 007024, 005021, 002162, 007004, 012001, 020014, 119000,
+               031001, 004086, 004086, 005001, 006001, 011003, 011004, 011113, 025148, 103000,
+               031001, 008023, 011003, 011004, 008023, 103000, 031001, 020111, 020112, 020114,
+               001033, 008021, 011095, 011096, 007004, 008021, 011095, 011096, 007004, 008021,
+               008086, 011095, 011096, 007004, 008086, 102004, 001032, 033007, 008092, 011003,
+               011004, 007004, 008092, 033066, 020081, 020012, 020056, 117000, 031001, 008023,
+               020016, 008092, 008003, 012001, 008003, 020016, 008092, 025149, 020016, 020014,
+               013093, 013109, 040038, 008011, 014050, 008011, 008023 ]
+"310068" = [  008070, 001033, 001034, 001007, 002019, 012064, 005040, 201136, 005041, 201000,
+               005043, 301011, 301012, 201138, 202131, 004006, 202000, 201000, 005001, 006001,
+               202126, 007001, 202000, 010007, 007024, 005021, 007025, 005022, 013040, 012101,
+               201131, 202129, 011011, 202000, 201000, 201130, 202129, 011012, 202000, 201000,
+               020029, 020010, 020014, 013162, 014050 ]
+"310069" = [  005042, 201139, 002155, 201000, 025077, 025078, 033007, 201132, 202129, 012063,
+               202000, 201000 ]
+"310070" = [  310068, 101013, 310069 ]
+"310071" = [  310068, 101015, 310069 ]
+"310072" = [  310068, 101026, 310069 ]
+"310077" = [  001033, 001034, 025061, 025062, 001007, 002153, 001012, 201138, 002026, 002027,
+               201000, 002028, 002029, 002161, 002164, 002023, 008012, 008013, 001124, 005001,
+               006001, 004001, 004002, 004003, 004004, 004005, 004006, 004086, 002162, 007004,
+               011001, 011002, 011003, 011004, 012001, 020014, 007024, 001023, 104000, 031001,
+               002162, 007004, 012001, 020014, 113000, 031001, 004086, 002020, 001007, 002019,
+               005042, 002153, 005040, 007024, 005021, 002162, 007004, 012001, 020014, 119000,
+               031001, 004086, 004086, 005001, 006001, 011003, 011004, 011113, 025148, 103000,
+               031001, 008023, 011003, 011004, 008023, 103000, 031001, 020111, 020112, 020114,
+               001033, 008021, 007004, 011095, 011096, 008021, 007004, 011095, 011096, 008021,
+               008086, 007004, 011095, 011096, 008086, 102004, 001044, 033007, 008092, 007004,
+               011003, 011004, 008092, 033066, 020081, 020012, 020056, 117000, 031001, 008023,
+               020016, 008092, 008003, 012001, 008003, 020016, 008092, 025149, 020016, 020014,
+               013093, 013109, 040038, 008011, 014050, 008011, 008023 ]
+"310078" = [  001007, 001016, 002019, 002020, 001033, 001034, 301011, 301013, 005040, 201132,
+               005041, 201000, 005043, 033079, 033080, 033078, 007002, 102003, 008097, 012164,
+               117000, 031001, 005001, 006001, 007024, 005021, 007025, 005022, 109000, 031001,
+               005042, 002153, 002154, 002104, 012066, 012163, 012158, 012159, 033094 ]
+"310080" = [  001033, 001034, 001007, 002019, 005040, 025061, 201133, 005041, 201000, 301011,
+               301012, 207003, 004006, 207000, 202126, 007001, 202000, 005063, 005064, 005066,
+               005077, 006043, 006041, 006042, 008098, 012101, 008098, 012101, 008098, 012101,
+               008098, 012101, 008098, 007074, 005076, 201124, 202127, 025084, 202000, 201000,
+               033100, 033102, 033104, 033105, 113007, 005078, 005001, 006001, 007024, 005021,
+               007025, 005022, 007073, 201132, 202129, 021166, 202000, 201000, 117003, 005042,
+               202131, 002153, 002154, 202000, 025077, 025078, 033101, 033103, 002104, 201131,
+               202136, 014045, 202000, 201000, 012158, 012159, 117002, 005042, 202131, 002153,
+               002154, 202000, 025077, 025078, 033101, 033103, 002104, 201132, 202136, 014045,
+               202000, 201000, 012158, 012159, 117003, 005042, 202131, 002153, 002154, 202000,
+               025077, 025078, 033101, 033103, 002104, 201133, 202136, 014045, 202000, 201000,
+               012158, 012159, 117003, 005042, 202131, 002153, 002154, 202000, 025077, 025078,
+               033101, 033103, 002104, 201133, 202136, 014045, 202000, 201000, 012158, 012159,
+               117002, 005042, 202131, 002153, 002154, 202000, 025077, 025078, 033101, 033103,
+               002104, 201131, 202135, 014045, 202000, 201000, 012158, 012159 ]
+"310081" = [  001033, 001034, 001007, 002019, 005040, 025061, 201133, 005041, 201000, 301011,
+               301012, 207003, 004006, 207000, 202126, 007001, 202000, 005063, 005064, 005066,
+               005077, 006043, 006041, 006042, 008098, 012101, 008098, 012101, 008098, 012101,
+               008098, 012101, 008098, 007074, 005076, 201124, 202127, 025084, 202000, 201000,
+               033095, 033097, 033106, 033099, 113008, 005078, 005001, 006001, 007024, 005021,
+               007025, 005022, 007073, 201132, 202129, 021166, 202000, 201000, 117002, 005042,
+               202131, 002153, 002154, 202000, 025077, 025078, 033096, 033098, 002104, 201131,
+               202138, 014045, 202000, 201000, 012158, 012159, 117002, 005042, 202131, 002153,
+               002154, 202000, 025077, 025078, 033096, 033098, 002104, 201132, 202138, 014045,
+               202000, 201000, 012158, 012159, 117002, 005042, 202131, 002153, 002154, 202000,
+               025077, 025078, 033096, 033098, 002104, 201132, 202138, 014045, 202000, 201000,
+               012158, 012159, 117008, 005042, 202131, 002153, 002154, 202000, 025077, 025078,
+               033096, 033098, 002104, 201131, 202137, 014045, 202000, 201000, 012158, 012159,
+               117002, 005042, 202131, 002153, 002154, 202000, 025077, 025078, 033096, 033098,
+               002104, 201132, 202137, 014045, 202000, 201000, 012158, 012159, 117004, 005042,
+               202131, 002153, 002154, 202000, 025077, 025078, 033096, 033098, 002104, 201133,
+               202137, 014045, 202000, 201000, 012158, 012159, 117001, 005042, 202131, 002153,
+               002154, 202000, 025077, 025078, 033096, 033098, 002104, 201131, 202136, 014045,
+               202000, 201000, 012158, 012159, 117005, 005042, 202131, 002153, 002154, 202000,
+               025077, 025078, 033096, 033098, 002104, 201131, 202136, 014045, 202000, 201000,
+               012158, 012159 ]
+"310082" = [  008070, 001033, 001034, 001007, 002019, 005040, 025061, 201133, 005041, 201000,
+               005043, 006042, 301011, 301012, 207003, 004006, 207000, 301021, 107002, 005080,
+               201132, 202129, 021166, 202000, 201000, 007007, 202126, 007001, 202000, 007024,
+               005021, 007025, 005022, 201124, 202127, 025084, 202000, 201000, 007073, 012070,
+               012064, 008098, 012101, 008098, 033107, 033108, 033109, 118024, 005042, 104004,
+               005079, 202130, 002154, 202000, 002104, 002153, 025077, 025078, 207002, 012063,
+               207000, 207001, 033089, 033090, 207000, 033110 ]
+"310083" = [  001033, 001034, 025060, 001007, 002019, 127012, 005040, 201130, 006034, 201000,
+               005034, 301021, 008012, 301011, 301012, 004007, 008085, 003030, 002104, 003030,
+               002104, 003029, 008075, 202129, 201131, 002111, 201000, 202000, 005021, 021062,
+               021026, 021027, 033111 ]
+"310084" = [  001033, 001034, 025060, 001007, 002019, 005040, 006034, 005034, 301021, 301011,
+               301012, 004007, 014058, 033112, 117005, 008085, 008012, 003030, 002104, 003030,
+               002104, 008075, 202129, 201131, 002111, 201000, 202000, 005021, 021062, 021026,
+               021027, 025056 ]
+"310085" = [  001007, 301005, 002019, 002020, 004001, 004002, 004003, 004004, 004005, 202131,
+               201138, 004006, 201000, 202000, 005001, 006001, 007024, 005021, 007025, 005022,
+               005043, 005040, 201133, 005041, 201000, 202126, 007001, 202000, 033113, 105170,
+               104100, 201137, 005042, 201000, 014046, 002019, 110007, 005060, 005061, 020083,
+               106020, 005042, 008023, 014044, 008023, 014044, 008023, 008072, 020083, 008029,
+               020083 ]
+"310086" = [  001007, 301005, 002019, 002020, 004001, 004002, 004003, 004004, 004005, 202131,
+               201138, 004006, 201000, 202000, 005001, 006001, 007024, 005021, 007025, 005022,
+               005043, 005040, 201133, 005041, 201000, 202126, 007001, 202000, 033113, 109004,
+               025140, 201129, 025141, 201000, 040026, 040016, 101000, 031002, 040017, 002019,
+               110007, 005060, 005061, 020083, 106020, 005042, 008023, 014044, 008023, 014044,
+               008023, 008072, 020083, 008029, 020083 ]
+"310087" = [  001007, 001031, 002019, 002020, 004001, 004002, 004003, 004004, 004005, 202131,
+               201138, 004006, 201000, 202000, 005001, 006001, 007024, 005021, 007025, 005022,
+               005043, 005040, 201133, 005041, 201000, 202126, 007001, 202000, 040052, 040047,
+               008065, 204004, 031021, 002019, 002019, 001030, 204000, 002019, 040046, 033116,
+               033117, 040080, 040051, 008003, 021166, 022046, 010001, 008023, 010001, 008023,
+               008003 ]
+"310088" = [  310087, 040053, 102003, 008071, 025149, 106000, 031000, 101000, 031002, 040076,
+               101000, 031002, 040075, 040067, 040066, 202126, 013098, 202000, 107101, 202131,
+               201138, 007004, 201000, 202000, 012101, 013001 ]
+"310089" = [  310087, 012083, 008043, 040044, 008043, 020056, 013109, 020056, 013109, 008003,
+               109002, 020056, 020081, 202131, 201138, 020016, 201000, 202000, 012101, 020131
+               ]
+"310090" = [  310087, 008003, 040067, 040066, 102012, 005042, 014050, 012001, 202131, 201138,
+               010004, 201000, 202000, 008003, 012083, 011012, 008043, 040044, 008043 ]
+"310091" = [  310087, 104003, 008043, 102007, 007004, 015021 ]
+"310092" = [  001007, 025060, 001031, 002019, 002020, 004001, 004002, 004003, 004004, 004005,
+               202131, 201138, 004006, 201000, 202000, 005001, 006001, 007024, 005021, 007025,
+               005022, 005043, 005040, 201133, 005041, 201000, 202126, 010007, 202000 ]
+"310093" = [  310092, 008046, 015021, 040056, 040058, 040059, 040060, 040057, 103019, 040061,
+               040062, 040063, 101190, 040065 ]
+"310094" = [  310092, 008046, 015021, 040056, 040058, 040059, 040060, 040057, 103041, 040061,
+               040062, 040063, 102021, 101041, 040065 ]
+"310095" = [  310092, 008046, 040068, 010073, 015007, 012169, 102005, 007004, 015007 ]
+"310096" = [  301005, 001007, 002019, 002020, 025060, 301011, 301013, 005040, 005001, 006001,
+               202126, 007001, 202000, 007024, 005021, 007025, 005022, 033028 ]
+"310097" = [  310096, 008011, 033007, 008011, 008072, 008029 ]
+"310098" = [  310096, 013094, 020016, 020014, 008093, 013094, 020016, 020014, 008093 ]
+"310099" = [  310096, 025144, 025145, 020139, 008029, 120002, 008002, 013094, 020016, 012001,
+               202131, 201139, 020131, 201000, 202000, 020014, 008093, 013094, 020016, 202131,
+               201139, 020131, 201000, 202000, 020014, 008093 ]
+"310100" = [  310096, 202129, 201132, 013060, 201000, 202000, 033118, 033119 ]
+"310191" = [  001007, 001033, 001034, 002019, 002020, 301011, 301012, 207003, 004006, 207000,
+               007024, 005021, 007025, 005022, 102002, 008076, 301021, 201131, 005041, 201000,
+               005045, 201133, 005043, 201000, 202126, 201132, 007001, 201000, 202000, 025182,
+               002165, 108002, 008076, 006029, 006029, 025140, 025141, 033076, 033077, 025187,
+               008076, 105000, 031002, 201133, 005042, 201000, 014044, 014049 ]
+"311001" = [  301051, 007002, 012001, 011001, 011002, 011031, 011032, 011033, 020041 ]
+"311002" = [  301065, 301066, 311003, 311004 ]
+"311003" = [  010070, 011001, 011002, 012001, 013002 ]
+"311004" = [  101000, 031000, 011034, 101000, 031000, 011035, 101000, 031000, 011075, 101000,
+               031000, 011076, 101000, 031000, 033025, 101000, 031000, 033026 ]
+"311005" = [  001008, 001023, 301021, 301011, 301013, 007010, 008009, 011001, 011002, 011031,
+               011036, 012101, 033025 ]
+"311006" = [  007010, 011001, 011002, 002064, 012101, 012103 ]
+"311007" = [  007010, 301021, 011001, 011002, 002064, 012101, 012103 ]
+"311008" = [  001008, 301011, 301013, 301021, 008004, 101000, 031001, 311006 ]
+"311009" = [  001008, 301011, 301013, 301021, 008004, 101000, 031001, 311007 ]
+"311010" = [  001008, 001023, 001006, 001110, 001111, 001112, 204002, 031021, 301011, 301013,
+               301021, 007010, 010053, 008009, 011001, 011002, 002064, 011100, 011101, 011102,
+               011103, 011104, 012101, 002170, 201144, 202133, 013002, 202000, 201000, 201135,
+               202130, 013003, 202000, 201000, 101000, 031000, 012103, 033026, 101000, 031000,
+               020042, 103000, 031000, 020043, 020044, 020045, 101000, 031000, 033025, 103000,
+               031001, 011075, 011076, 011039, 102000, 031000, 011037, 011077, 103000, 031000,
+               011034, 011035, 011036, 204000, 119000, 031001, 301011, 301013, 301021, 007007,
+               011105, 204007, 031021, 011076, 011075, 204000, 011106, 011107, 011108, 011109,
+               012101, 011001, 201130, 011084, 201000 ]
+"311011" = [  001023, 008004, 301011, 301013, 005002, 006002, 007004, 011001, 011002, 012101,
+               106000, 031001, 008046, 201139, 202126, 015026, 202000, 201000, 106000, 031001,
+               008046, 201138, 202130, 015026, 202000, 201000, 015052, 015053, 015054, 015055,
+               007004, 007004, 013099, 013100, 013101 ]
+"311012" = [  301150, 001008, 001111, 001112, 301011, 301013, 301021, 008004, 110000, 031002,
+               301011, 301013, 311007, 201144, 202133, 013002, 202000, 201000, 013003, 033026
+               ]
+"311013" = [  301150, 001008, 001095, 301011, 301013, 301021, 001013, 008009, 007010, 033003,
+               011001, 011002, 012101, 002170, 201144, 202133, 013002, 202000, 201000, 201135,
+               202130, 013003, 202000, 201000, 011073, 011075 ]
+"312001" = [  301043, 304001 ]
+"312002" = [  301043, 304002 ]
+"312003" = [  301042, 304003 ]
+"312004" = [  301042, 304004 ]
+"312005" = [  301042, 020014 ]
+"312006" = [  301044, 304005 ]
+"312007" = [  301042, 304006 ]
+"312010" = [  001007, 005040, 002021, 005041, 004001, 004043 ]
+"312011" = [  202131, 201149, 004006, 201000, 202126, 010002, 202000, 005043, 005053 ]
+"312012" = [  202129, 201132, 101019, 012063, 201000, 202000 ]
+"312013" = [  005042, 202129, 201135, 012063, 201000, 202000 ]
+"312014" = [  312010, 312011, 105056, 301023, 005042, 005052, 312012, 312013 ]
+"312015" = [  109011, 301023, 005042, 005052, 202129, 201132, 101004, 012063, 202000, 201000
+               ]
+"312016" = [  312010, 312011, 312015 ]
+"312017" = [  109008, 301023, 005042, 005052, 202129, 201132, 101003, 012063, 202000, 201000
+               ]
+"312018" = [  312010, 312011, 312017 ]
+"312019" = [  301047, 301048, 015015, 029002, 021076, 106012, 201129, 006030, 201000, 102012,
+               005030, 021075, 021066 ]
+"312020" = [  301047, 301048, 015015, 029002, 021076, 104012, 006030, 102012, 005030, 021075,
+               021066 ]
+"312021" = [  301047, 101003, 301049, 011012, 011011, 021067 ]
+"312022" = [  301047, 008022, 011012, 011050, 022070, 022026, 312041, 010050, 021068, 021071,
+               021072, 021073, 312042, 021062, 015011 ]
+"312023" = [  301047, 103003, 008022, 012061, 022050, 021069, 021085 ]
+"312024" = [  312020, 008060, 008022, 008060, 008022, 025014, 022101, 022097, 022098, 022099,
+               022100 ]
+"312025" = [  312019, 008060, 008022, 008060, 008022, 025014, 022101, 022097, 022098, 022099,
+               022100 ]
+"312026" = [  301046, 301011, 301013, 301023, 312031, 101004, 312030, 021110, 301023, 321027,
+               021111, 301023, 321027, 021112, 301023, 321027, 021113, 301023, 321027 ]
+"312027" = [  301047, 105009, 301023, 007021, 012061, 007021, 012061, 021085, 021070 ]
+"312028" = [  301046, 301011, 301013, 301023, 008025, 201136, 004006, 201000, 312031, 312032,
+               101004, 312030, 101002, 312033, 021110, 301023, 321028, 021111, 301023, 321028,
+               021112, 301023, 321028, 021113, 301023, 321028 ]
+"312029" = [  301046, 301011, 301013, 301023, 008025, 201136, 004006, 201000, 005034, 201129,
+               006034, 201000, 033055, 011081, 011082, 021101, 021102, 021103, 312032, 101004,
+               312030, 101002, 312033, 021110, 301023, 321028, 021111, 301023, 321028, 021112,
+               301023, 321028, 021113, 301023, 321028 ]
+"312030" = [  201130, 202129, 011012, 202000, 201000, 011052, 201135, 202130, 011011, 202000,
+               201000, 011053, 021104 ]
+"312031" = [  005034, 006034, 021109, 011081, 011082, 021101, 021102, 021103 ]
+"312032" = [  021120, 021121, 013055, 021122 ]
+"312033" = [  002104, 008022, 012063, 012065 ]
+"312034" = [  301046, 301011, 301013, 301023, 008025, 201136, 004006, 201000, 312031, 312032,
+               101004, 312030, 101002, 312033, 103018, 021110, 301023, 321028 ]
+"312035" = [  001007, 001031, 002048, 202124, 002026, 002027, 202000, 005040, 004001, 004002,
+               004003, 004004, 004005, 004006, 005002, 006002, 005034, 006031, 201129, 006034,
+               201000, 005021, 002111, 012063, 021095, 021096, 021097, 021030, 021105, 033056
+               ]
+"312041" = [  201141, 202130, 007001, 201000, 202000 ]
+"312042" = [  021077, 021078, 021079, 021080, 021081, 021082 ]
+"312045" = [  001007, 002019, 001096, 025061, 005040, 301011, 301013, 301021, 007002, 012180,
+               012181, 012182, 012183, 012184, 012185, 002174, 021086, 012186, 021087, 012187,
+               033043 ]
+"312050" = [  001007, 002019, 001096, 025061, 005040, 301011, 301013, 301021, 007025, 005022,
+               010080, 027080, 008003, 007004, 013093, 008003, 201131, 202129, 007004, 007004,
+               202000, 201000, 013095 ]
+"312051" = [  001007, 002019, 001096, 025061, 005040, 008075, 301011, 301013, 301021, 001012,
+               201131, 001013, 201000, 010032, 010033, 010034, 007002, 008012, 025110, 025111,
+               025102, 002104, 025103, 025104, 025105, 025106, 025107, 025108, 002111, 002121,
+               002026, 002027, 021130, 021131, 021132, 021133, 021064, 025014, 021134, 107018,
+               005030, 105024, 201130, 006030, 201000, 021135, 021136, 033044 ]
+"312052" = [  001007, 002019, 001096, 025061, 005040, 025120, 025121, 025124, 025125, 025122,
+               025123, 301011, 301013, 301021, 007002, 002119, 033047, 010081, 010082, 010083,
+               010084, 002116, 002117, 002118, 002156, 002157, 014055, 022150, 022151, 022152,
+               022153, 022154, 022155, 022156, 022157, 022158, 022159, 021137, 021138, 021139,
+               021140, 021141, 021142, 010085, 010086, 010087, 010088, 010089, 010090, 010091,
+               010092, 010093, 011002, 025126, 025127, 025128, 025129, 025130, 025131, 025132,
+               025133, 025134, 025135, 025136, 025137, 013096, 013097, 011095, 011096, 012188,
+               012189, 002158, 002159, 033052, 033053, 021143, 021144 ]
+"312053" = [  001007, 002019, 001096, 025061, 005040, 008075, 301011, 301013, 301021, 001012,
+               201131, 001013, 201000, 010032, 010033, 010034, 007002, 008012, 025110, 025111,
+               025102, 002104, 025103, 025104, 025105, 025106, 025107, 025108, 011001, 011002,
+               022160, 025138, 201130, 202129, 022021, 202000, 201000, 033048, 033049, 002026,
+               002027, 021130, 021131, 021132, 021133, 025014, 106036, 005030, 104024, 201130,
+               006030, 201000, 022161, 033044 ]
+"312055" = [  005033, 005040, 006034, 010095, 021157 ]
+"312056" = [  025060, 001032, 011082, 011081, 020095, 020096, 021155, 201133, 021101, 021102,
+               201000 ]
+"312057" = [  201130, 202129, 011012, 202000, 201000, 201131, 202129, 011011, 202000, 201000,
+               021156, 021104 ]
+"312058" = [  301125, 301011, 301013, 301021, 312055, 021150, 101003, 321030 ]
+"312059" = [  312056, 101000, 031001, 312057 ]
+"312060" = [  025060, 025062, 040001, 040002, 021062, 021151, 021152, 021153, 021154, 021062,
+               021088, 040003, 040004, 040005, 040006, 040007, 020065, 040008, 040009, 040010
+               ]
+"312061" = [  312058, 312060, 312059 ]
+"312062" = [  001007, 002019, 301011, 301013, 301021, 020065, 008023, 020065, 008023 ]
+"312070" = [  001007, 002019, 001144, 001124, 030010, 301011, 301013, 301021, 007012, 015012,
+               012165, 012166, 012167, 012168, 027010, 028010, 002099, 013048, 025081, 025082,
+               025083, 025084, 012080, 012081, 012082, 025174, 033028 ]
+"312071" = [  001007, 002019, 002139, 001096, 001040, 025061, 005040, 005044, 008075, 008077,
+               004001, 004002, 004003, 004004, 004005, 004006, 005001, 006001, 010081, 022156,
+               022142, 101020, 022149, 022143, 022144, 021137, 101020, 021181, 021138, 021180,
+               021177, 021178, 021179, 010079, 010085, 010086, 010087, 010089, 010090, 010091,
+               010092, 010093, 011097, 021093, 101020, 021182, 033053, 022151, 022145, 022148,
+               022146, 022147, 025126, 025128, 025127, 021176, 025132, 025133, 025182, 025183,
+               025180, 025184, 025181, 033080 ]
+"313009" = [  021001, 101000, 031001, 021001 ]
+"313010" = [  021036, 101000, 031001, 021036 ]
+"313031" = [  006002, 006012, 101000, 031002, 030001 ]
+"313032" = [  005002, 005012, 101000, 031002, 313031 ]
+"313041" = [  006002, 110000, 031001, 104000, 031001, 006012, 101000, 031012, 030001, 006012,
+               101000, 031001, 030001 ]
+"313042" = [  005002, 005012, 101000, 031002, 313041 ]
+"313043" = [  006002, 005002, 005012, 112000, 031001, 110000, 031001, 104000, 031001, 006012,
+               101000, 031011, 030001, 006012, 101000, 031001, 030001 ]
+"315001" = [  001011, 301011, 301012, 301023, 306001 ]
+"315002" = [  001011, 301011, 301012, 301023, 306004 ]
+"315003" = [  001087, 001085, 001086, 002036, 002148, 002149, 022055, 022056, 022067, 301011,
+               301012, 301021, 008080, 033050, 109000, 031002, 007065, 008080, 033050, 022045,
+               008080, 033050, 022064, 008080, 033050 ]
+"315004" = [  001079, 001011, 001103, 001087, 001019, 001080, 005036, 001036, 001013, 001012,
+               301011, 301012, 301021, 007032, 007033, 002002, 011002, 011001, 007032, 007033,
+               012101, 012103, 007032, 007033, 302021, 002031, 002030, 022005, 022032, 022063,
+               008080, 033050, 022178, 022177, 022067, 008041, 026021, 026022, 026023, 022068,
+               025061, 008041, 008080, 002171, 302090, 002171, 002032, 315005 ]
+"315005" = [  106000, 031002, 007063, 008080, 033050, 022043, 008080, 033050 ]
+"315006" = [  001079, 001011, 001103, 001087, 001019, 001080, 005036, 001036, 001013, 001012,
+               301011, 301012, 301021, 007032, 007033, 002002, 011002, 011001, 007032, 007033,
+               012101, 012103, 007032, 007033, 302021, 002031, 002030, 022005, 022032, 022063,
+               008080, 033050, 022178, 022177, 022067, 008041, 026021, 026022, 026023, 022068,
+               025061, 008041, 008080, 002171, 302090, 002171, 002032, 109000, 031002, 007063,
+               008080, 033050, 022043, 008080, 033050, 022064, 008080, 033050 ]
+"315007" = [  301003, 001019, 001103, 001087, 001036, 001115, 001080, 005036, 301011, 301012,
+               301021, 001079, 001023, 022063, 101000, 031000, 302001, 101000, 031000, 302021,
+               101000, 031000, 302052, 101000, 031000, 302059, 022067, 002171, 302090, 306033,
+               306034, 002171, 022067, 002038, 022067, 022068, 002171, 002033, 002032, 022056,
+               003011, 306035, 107000, 031000, 002032, 003010, 002031, 002040, 022056, 003011,
+               306036, 104000, 031000, 002032, 003012, 003011, 306037 ]
+"315008" = [  301126, 306038, 101000, 031000, 302091, 101000, 031000, 302082, 101000, 031000,
+               306039, 101000, 031000, 306040, 102000, 031000, 002005, 306041, 102000, 031000,
+               002005, 306004, 101000, 031000, 306005 ]
+"315009" = [  001087, 001019, 002149, 008021, 301011, 301012, 301021, 208016, 001051, 208000,
+               002148, 001012, 001014, 033022, 033023, 033027, 025026, 002034, 022060, 007070,
+               002190, 008021, 301011, 301012, 002005, 022043, 002033, 022059, 008029, 013115,
+               103000, 031000, 002005, 306004, 002005, 010004, 010051, 102000, 031000, 007033,
+               012101, 101000, 031000, 306042, 101000, 031000, 306039 ]
+"315010" = [  112000, 031001, 201144, 202133, 022080, 022096, 022069, 202000, 201000, 042011,
+               042012, 042013, 042014, 042015 ]
+"315011" = [  301150, 001087, 001036, 001085, 001086, 003001, 208032, 001079, 208000, 301011,
+               301012, 301021, 001012, 001014, 011104, 103000, 031000, 007031, 306038, 012161,
+               101000, 031000, 306034, 101000, 031000, 306039, 101000, 031000, 306033, 101000,
+               031000, 306041, 101000, 031000, 306004, 101000, 031000, 306005, 105000, 031000,
+               041001, 008043, 015028, 008043, 013080, 104000, 031000, 041005, 041003, 022188,
+               041002, 101000, 031000, 306040, 104000, 031000, 008021, 004025, 014017, 014018
+               ]
+"315012" = [  301150, 201129, 001087, 201000, 001019, 001036, 002148, 001085, 001086, 008021,
+               301011, 301013, 301021, 011104, 002169, 011002, 011001, 002169, 022032, 022005,
+               301011, 301013, 008021, 004025, 301021, 022031, 022004, 008021, 005068, 001079,
+               126000, 031001, 022056, 123000, 031002, 301011, 301013, 301021, 008080, 033050,
+               007062, 008080, 033050, 022065, 008080, 033050, 022045, 008080, 033050, 022066,
+               008080, 033050, 022064, 008080, 033050, 042016, 008080, 033050 ]
+"315013" = [  301150, 001087, 208032, 001019, 208000, 003001, 022067, 001051, 002148, 112000,
+               031001, 008021, 301011, 301012, 301021, 001012, 001014, 033022, 033023, 033027,
+               007063, 022045, 008021, 107000, 031001, 301011, 301012, 301021, 001079, 001023,
+               022056, 306035 ]
+"315023" = [  301150, 201129, 001087, 201000, 208032, 001019, 208000, 003001, 022067, 001051,
+               002148, 112000, 031001, 008021, 301011, 301012, 301021, 001012, 001014, 033022,
+               033023, 033027, 007063, 022045, 008021, 107000, 031001, 301011, 301012, 301021,
+               001079, 001023, 022056, 306035 ]
+"316001" = [  301011, 004004, 301023, 001021, 002041, 019001, 010051, 019002, 019003, 019004
+               ]
+"316002" = [  008021, 004001, 004002, 004003, 004004, 004005, 001033, 008021, 004001, 004002,
+               004003, 004004, 004005, 007002, 007002 ]
+"316003" = [  110000, 031001, 008011, 008007, 104000, 031001, 005002, 006002, 010002, 011002,
+               008007, 008011 ]
+"316004" = [  111000, 031001, 008011, 008007, 007002, 007002, 102000, 031001, 005002, 006002,
+               011031, 008007, 008011 ]
+"316005" = [  108000, 031001, 008005, 008007, 005002, 006002, 001026, 019001, 008007, 008005
+               ]
+"316006" = [  112000, 031001, 008011, 008007, 007002, 007002, 102000, 031001, 005002, 006002,
+               020011, 020012, 008007, 008011 ]
+"316007" = [  110000, 031001, 008011, 008007, 104000, 031001, 005002, 006002, 019005, 019006,
+               008007, 008011 ]
+"316008" = [  111000, 031001, 008001, 008007, 008023, 103000, 031001, 005002, 006002, 010002,
+               008023, 008007, 008001 ]
+"316009" = [  111000, 031001, 008011, 008007, 007002, 007002, 102000, 031001, 005002, 006002,
+               020041, 008007, 008011 ]
+"316010" = [  107000, 031001, 008011, 008007, 001022, 005002, 006002, 008007, 008011 ]
+"316011" = [  117000, 031001, 008011, 001022, 008007, 102000, 031001, 005002, 006002, 008021,
+               004001, 004002, 004003, 004004, 004005, 020090, 008021, 008007, 008011 ]
+"316020" = [  001033, 001025, 001027, 301011, 301012 ]
+"316021" = [  301023, 002041, 019001, 019007, 019005, 019006, 019008, 008005, 010004, 008005,
+               010004, 019007, 008005, 008021, 004075, 011040, 019007, 105004, 005021, 005021,
+               102002, 019003, 019004 ]
+"316022" = [  001032, 002041, 019001, 019010, 118000, 031001, 008021, 004014, 008005, 301023,
+               019005, 019006, 010004, 011041, 008021, 004075, 011040, 019008, 105004, 005021,
+               005021, 102002, 019003, 019004 ]
+"316026" = [  316020, 316021 ]
+"316027" = [  316020, 316022 ]
+"316030" = [  301014, 001037, 010064, 008019, 001062, 008019, 001065, 008019, 001062, 008019
+               ]
+"316031" = [  008021, 301011, 301012, 301027, 019005, 019006, 020028, 008021 ]
+"316032" = [  008021, 301011, 301012, 301027, 008021 ]
+"316033" = [  008021, 301011, 301012, 101000, 031001, 301027, 008021 ]
+"316034" = [  008079, 316030, 008011, 001022, 008007, 301023, 008007, 020090, 316031, 101000,
+               031000, 316032, 101000, 031001, 316033, 008011, 008079 ]
+"316035" = [  008079, 316030, 008011, 020023, 020021, 020008, 316031, 008011, 008079 ]
+"316036" = [  008079, 316030, 008011, 001027, 316031, 101000, 031000, 316032, 101000, 031001,
+               316033, 008011, 008079 ]
+"316037" = [  008079, 316030, 008011, 011031, 316031, 008011, 008079 ]
+"316038" = [  008079, 316030, 008011, 020041, 020021, 316031, 008011, 008079 ]
+"316039" = [  008079, 316030, 008011, 020024, 316031, 008011, 008079 ]
+"316040" = [  316030, 008079, 301014, 001037, 010064, 008079 ]
+"316050" = [  301001, 301011, 301012, 002160, 008005, 005002, 006002, 008005, 019100, 019005,
+               019006, 019101, 019102, 019103, 019104, 019105 ]
+"316052" = [  301005, 301011, 301012, 001007, 025150, 122000, 031001, 001027, 019150, 019106,
+               008005, 005002, 006002, 008005, 019107, 019005, 019006, 019108, 019109, 019110,
+               019111, 019112, 019113, 019114, 019115, 019116, 019117, 019118, 019119 ]
+"316060" = [  301011, 301012, 005002, 006002, 019005, 019006, 005002, 006002, 005002, 006002,
+               004074, 020048, 011041, 013055 ]
+"316061" = [  301011, 301012, 005002, 006002, 019005, 019006, 102000, 031001, 005002, 006002,
+               102000, 031001, 005002, 006002, 004074, 020048, 011041, 013055 ]
+"316071" = [  301014, 101000, 031002, 316075, 101000, 031002, 316076 ]
+"316072" = [  301014, 101000, 031002, 316077, 101000, 031002, 316078, 101000, 031002, 316079
+               ]
+"316073" = [  301014, 101000, 031002, 316080, 101000, 031002, 316081 ]
+"316074" = [  001039, 008021, 301014, 301027, 008021 ]
+"316075" = [  008079, 008041, 316074, 020006, 033042, 020013, 033042, 020001, 020025, 020026,
+               008041, 008079 ]
+"316076" = [  008079, 008041, 316074, 020006, 020025, 020026, 008041, 008079 ]
+"316077" = [  008079, 008011, 316074, 011031, 008011, 008079 ]
+"316078" = [  008079, 008041, 316074, 033042, 011012, 008041, 008079 ]
+"316079" = [  008079, 008011, 316074, 020023, 020024, 008011, 008079 ]
+"316080" = [  008079, 008011, 316074, 020041, 008011, 008079 ]
+"316081" = [  008079, 008041, 316074, 008041, 008079 ]
+"316082" = [  001033, 001034, 001032, 001025, 001027, 001090, 001091, 001092, 301011, 301012,
+               008005, 301023, 008005, 301023, 010051, 008005, 301023, 011012, 107003, 019003,
+               105004, 005021, 005021, 201131, 019004, 201000, 116000, 031001, 008021, 004024,
+               008005, 301023, 010051, 008005, 301023, 011012, 107003, 019003, 105004, 005021,
+               005021, 201131, 019004, 201000 ]
+"316083" = [  001033, 001034, 001032, 001130, 001027, 001030, 001090, 001091, 001092, 301011,
+               301012, 008005, 301023, 008005, 301023, 010051, 008005, 301023, 011012, 107004,
+               019003, 105004, 005021, 005021, 201131, 019004, 201000, 116000, 031001, 008021,
+               004024, 008005, 301023, 010051, 008005, 301023, 011012, 107004, 019003, 105004,
+               005021, 005021, 201131, 019004, 201000, 104000, 031001, 008055, 007004, 011024,
+               011025 ]
+"318001" = [  301025, 024011 ]
+"318003" = [  301026, 024005, 024004, 024021 ]
+"318004" = [  301025, 004023, 013011, 024005, 024004, 024022 ]
+"321001" = [  002101, 002114, 002105, 002106, 002107, 002121 ]
+"321003" = [  021051, 021014, 021017, 021030 ]
+"321004" = [  301031, 002003, 101000, 031001, 321003 ]
+"321005" = [  025004, 002121, 002122, 002123, 002124, 002125, 002126, 002127, 002128, 002129,
+               002130, 002131 ]
+"321006" = [  025001, 025002, 025003, 025005 ]
+"321007" = [  025009, 025010, 025011, 025012, 025013, 025015, 025016, 025017 ]
+"321008" = [  025006, 025007, 025008 ]
+"321009" = [  025018, 025019 ]
+"321010" = [  002101, 007002, 002102, 002103, 002104, 002105, 002106, 002107, 002108, 002109,
+               002110, 002132, 002133 ]
+"321011" = [  030031, 030032, 029002 ]
+"321012" = [  101000, 031001, 002135 ]
+"321021" = [  002003, 002101, 201130, 002106, 201000, 201132, 202130, 002121, 202000, 201000,
+               201133, 202129, 025001, 202000, 201000 ]
+"321022" = [  007007, 204001, 031021, 011001, 204000, 011002, 204001, 031021, 011006, 204000,
+               021030 ]
+"321023" = [  007007, 021091, 021030, 202129, 021014, 201129, 021017, 202000, 201000 ]
+"321024" = [  007007, 204001, 031021, 012007, 011006, 204000, 021030 ]
+"321025" = [  007007, 021091, 021030, 202129, 021014, 201129, 021017, 202000, 201000, 021092,
+               021030, 025092, 201129, 202129, 021017, 202000, 201000 ]
+"321026" = [  007007, 204001, 031021, 012007, 025091, 011071, 011072, 011073, 011074, 204000
+               ]
+"321027" = [  021118, 202129, 201132, 002112, 201000, 201131, 002111, 201000, 202000, 002104,
+               021105, 021106, 021107, 021114, 021115, 021116, 008018, 021117 ]
+"321028" = [  021118, 202129, 201132, 002112, 201000, 201131, 002111, 201000, 202000, 002104,
+               021123, 021106, 021107, 021114, 021115, 021116, 008018, 021117 ]
+"321030" = [  008085, 202129, 201131, 002111, 201000, 202000, 002134, 021062, 021063, 021158,
+               021159, 021160, 021161, 021162, 021163, 021164, 021165, 021166 ]
+"321031" = [  001007, 002019, 001033, 001034, 301011, 301013, 301021, 010033, 008043, 025139,
+               002153, 106000, 031002, 007071, 021007, 021008, 021009, 021010, 033003 ]
+"322001" = [  310022, 301011, 301013, 301021, 005041, 005043, 027080, 005022, 013040, 020010,
+               033085, 033115, 105002, 008099, 007024, 007025, 007075, 007076, 106000, 031001,
+               002071, 008043, 015024, 008043, 015024, 015042, 224000, 236000, 101000, 031002,
+               031031, 001033, 001032, 008023, 101000, 031002, 224255 ]
+"322028" = [  001007, 002019, 004001, 004002, 004003, 004004, 004005, 004006, 005001, 006001,
+               027001, 028001, 027001, 028001, 027001, 028001, 027001, 028001, 010001, 014019,
+               007025, 010080, 005023, 020010, 008003, 007004, 014026, 020014, 013093, 105000,
+               031001, 007004, 007004, 008043, 008044, 015021 ]
+"340001" = [  001007, 001031, 002019, 002020, 004001, 004002, 004003, 004004, 004005, 202131,
+               201138, 004006, 201000, 202000, 005001, 006001, 007024, 005021, 007025, 005022,
+               005043, 005040, 201133, 005041, 201000, 201132, 025070, 201000, 202126, 007001,
+               202000, 033060, 033061, 033062, 033063, 033064, 033065, 101010, 340002, 101087,
+               340003, 002019, 025051, 101007, 340004 ]
+"340002" = [  025140, 025141, 025142 ]
+"340003" = [  104100, 201136, 005042, 201000, 014046 ]
+"340004" = [  005060, 005061, 025085, 105006, 005042, 025142, 014047, 025142, 014048 ]
+"340005" = [  001007, 002019, 001096, 025061, 005044, 005040, 001030, 004001, 004002, 004003,
+               004004, 004005, 004007, 005001, 006001, 008029, 008074, 008077, 040011, 025097,
+               025095, 025098, 025099, 021144, 025096, 040012, 040013, 021169, 022151, 022162,
+               022163, 025160, 025133, 022156, 022164, 022165, 022166, 021137, 021138, 022167,
+               021139, 021118, 021145, 021146, 021147, 022168, 022169, 022170, 025161, 025162,
+               022171, 022172, 022173, 022174, 021170, 021171, 022175, 021172, 021118, 021173,
+               021174, 021175, 002153, 012063, 002153, 012063, 002153, 012063, 013090, 013091,
+               007002, 011097, 011098, 007002, 011095, 011096, 010096, 010081, 010082, 010083,
+               010101, 025132, 025163, 025126, 025128, 025164, 010085, 010097, 010086, 010087,
+               010092, 010088, 010089, 010098, 010099, 010090, 010100, 010093, 025127, 040014
+               ]
+"340007" = [  001007, 001031, 002019, 002020, 004001, 004002, 004003, 004004, 004005, 202131,
+               201138, 004006, 201000, 202000, 005001, 006001, 007024, 005021, 007025, 005022,
+               005043, 005040, 201133, 005041, 201000, 201132, 025070, 201000, 202126, 007001,
+               202000, 103003, 025140, 025141, 033060, 033061, 033062, 033063, 033064, 033065,
+               040020, 101010, 340002, 101087, 340003, 002019, 025051, 101007, 340004, 020081,
+               008029, 020083, 008029, 040018, 040019, 040021, 040022 ]
+"340008" = [  001007, 001031, 002019, 002020, 004001, 004002, 004003, 004004, 004005, 202131,
+               201138, 004006, 201000, 202000, 005001, 006001, 007024, 005021, 007025, 005022,
+               005043, 005040, 201133, 005041, 201000, 201132, 025070, 201000, 202126, 007001,
+               202000, 103003, 025140, 025141, 033060, 033061, 033062, 033063, 033064, 033065,
+               040020, 101010, 340002, 104000, 031002, 201136, 005042, 201000, 014046, 108003,
+               025140, 025141, 040026, 040016, 025062, 101000, 031002, 040017, 002019, 025051,
+               101007, 340004, 020081, 008029, 020083, 008029, 040018, 040019, 040021, 040022
+               ]
+"340009" = [  001007, 001031, 002019, 002020, 301011, 301013, 005040, 201136, 005041, 201000,
+               025071, 005001, 005001, 006001, 006001, 107064, 106032, 008012, 008013, 008065,
+               008072, 013039, 040015 ]
+"340010" = [  001007, 002019, 001096, 025061, 005044, 005040, 001030, 004001, 004002, 004003,
+               004004, 004005, 004007, 005001, 006001, 008029, 008074, 008077, 040011, 025097,
+               025095, 025098, 025099, 021144, 025096, 040012, 040013, 021169, 040023, 040024,
+               040025, 022151, 022162, 022163, 025160, 025133, 022156, 022164, 022165, 022166,
+               021137, 021138, 022167, 021139, 021118, 021145, 021146, 021147, 022168, 022169,
+               022170, 025161, 025162, 022171, 022172, 022173, 022174, 021170, 021171, 022175,
+               021172, 021118, 021173, 021174, 021175, 002153, 012063, 002153, 012063, 002153,
+               012063, 013090, 013091, 007002, 011097, 011098, 007002, 011095, 011096, 010096,
+               010081, 010082, 010083, 010101, 025132, 025163, 025126, 025128, 025164, 010085,
+               010097, 010086, 010087, 010092, 010088, 010089, 010098, 010099, 010090, 010100,
+               010093, 025127, 040014, 010102 ]
+"340011" = [  001007, 002019, 001096, 025061, 005044, 005040, 001030, 004001, 004002, 004003,
+               004004, 004005, 004007, 005001, 006001, 008029, 008077, 040011, 025097, 025112,
+               025113, 021148, 021169, 040024, 040025, 002153, 022189, 022191, 022130, 025167,
+               025166, 022190, 022131, 022132, 022133, 021183, 021184, 022134, 021185, 021118,
+               021186, 021187, 021188, 002153, 012063, 002153, 012063, 013090, 013160, 007002,
+               011097, 007002, 011095, 011096, 010096, 010081, 010082, 010083, 010101, 002153,
+               025165, 025126, 025128, 025164, 010085, 010086, 010087, 010092, 010088, 010089,
+               010098, 010099, 010090, 010100, 010093, 025127, 040014, 010102 ]
+"340012" = [  001007, 002019, 008091, 005001, 006001, 007002, 005063, 005064, 005066, 005041,
+               005067, 301011, 301012, 004007, 008091, 005001, 006001, 107000, 031001, 005042,
+               002153, 002104, 040028, 007024, 040027, 012063 ]
+"340013" = [  001007, 002019, 001033, 001034, 004001, 004002, 004003, 004004, 004005, 004007,
+               005068, 005070, 005069, 040036, 008091, 005001, 006001, 004016, 008091, 005001,
+               006001, 004016, 008091, 005001, 006001, 004016, 008091, 007071, 005021, 007021,
+               040035, 008091, 007071, 005021, 007021, 040035, 008091, 007071, 005021, 007021,
+               040035, 040029, 040030, 040031, 025187, 010004, 012001, 040037, 040032, 040033,
+               040034 ]
+"340015" = [  001007, 002019, 301011, 301012, 004007, 201133, 005041, 201000, 201130, 005043,
+               201000, 207001, 005002, 006002, 207000, 040027, 013040, 021120, 207003, 102003,
+               002186, 013155, 207000, 033003 ]
+"340016" = [  301129, 301130, 301131, 202134, 007001, 202000, 101000, 031002, 340002, 101000,
+               031002, 304039, 101000, 031002, 304040 ]
+"340017" = [  001007, 002019, 005044, 001096, 005040, 001040, 025061, 025182, 025183, 025181,
+               025184, 301011, 301013, 004007, 301021, 005063, 005064, 005066, 010081, 010082,
+               008075, 025090, 008029, 201137, 202129, 006021, 202000, 201000, 010087, 025096,
+               040012, 008077, 104002, 002153, 012063, 012065, 040013, 007002, 011098, 013090,
+               013091, 025164, 025095, 040023, 025113, 008074, 025190, 021144, 025191, 021143,
+               013055, 021169, 010101, 015012, 007002, 011097, 040024, 007002, 025126, 025128,
+               040011, 007002, 011095, 011096, 010088, 010089, 010090, 010092, 010093, 010098,
+               010099, 010100, 025127, 040014, 010085, 010086, 010096, 010103, 010102, 022080,
+               008076, 022189, 022191, 022130, 025165, 025166, 025167, 021183, 021184, 022134,
+               021122, 022190, 022131, 022132, 022133, 021186, 021187, 021188, 021185, 025112,
+               025113, 033092, 008076, 022189, 022191, 022130, 025165, 025166, 025167, 021183,
+               021184, 022134, 021122, 022190, 022131, 022132, 022133, 021186, 021187, 021188,
+               021185, 025112, 025113, 033092, 025190, 011097, 013090, 013091, 021143, 021184,
+               025128, 025163, 025164, 010102, 022189, 022191, 022130, 025166, 021183, 021184,
+               022134, 022190, 022131, 022132, 025112, 025113, 033092, 008049, 022080, 134021,
+               301011, 301013, 004007, 301021, 010081, 010082, 008029, 201137, 202129, 006021,
+               202000, 201000, 025191, 021071, 010085, 040011, 010102, 022189, 022146, 025165,
+               025167, 021183, 022190, 022133, 021177, 021185, 013164, 202126, 022046, 202000,
+               013117, 013013, 025112, 033092 ]
+"340018" = [  301129, 301130, 301131, 007072, 040074, 104000, 031002, 201136, 005042, 201000,
+               014044 ]
+"340019" = [  340020, 340021, 340022, 340023 ]
+"340020" = [  001007, 002019, 005044, 001096, 005040, 001040, 025061, 025182, 025183, 025181,
+               025184, 008075, 025090, 301011, 301013, 004007, 301021, 005063, 005064, 005066,
+               010081, 010082 ]
+"340021" = [  040012, 008077, 104000, 031001, 002153, 012063, 012065, 040013, 007002, 011098
+               ]
+"340022" = [  008029, 201137, 202129, 006021, 202000, 201000, 010087, 040024, 007002, 025126,
+               025128, 040011, 007002, 011095, 011096, 010088, 010089, 010090, 010092, 010093,
+               010098, 010099, 010100, 025127, 040014, 001030, 010085, 001030, 010085, 010086,
+               010096, 010103, 021169, 013055, 025165 ]
+"340023" = [  025095, 040023, 008074, 340024, 340024, 340024, 340025 ]
+"340024" = [  022080, 008076, 025190, 010102, 022189, 022191, 022130, 025167, 025163, 015012,
+               025164, 013090, 013091, 025166, 007002, 011097, 021183, 021184, 022134, 021122,
+               021186, 021187, 021188, 201131, 021185, 201000, 022179, 022131, 022132, 022133,
+               021144, 025191, 021143, 010101, 025112, 025113, 033092 ]
+"340025" = [  008049, 022080, 008076, 025190, 146021, 301011, 301013, 004007, 301021, 010081,
+               010082, 008029, 201137, 202129, 006021, 202000, 201000, 025191, 021071, 001030,
+               010085, 001030, 010085, 040011, 010088, 010089, 025164, 007002, 025126, 025128,
+               010102, 022189, 025167, 025163, 021183, 201131, 021185, 201000, 022179, 022133,
+               022146, 021189, 013163, 202126, 022046, 202000, 013117, 013013, 025112, 025113,
+               033092 ]
+"340026" = [  001007, 002019, 001033, 001034, 301011, 301013, 301021, 010033, 008043, 025139,
+               002155, 112000, 031002, 007071, 033003, 201136, 015074, 015066, 015075, 015068,
+               201000, 015076, 015070, 015078, 015072, 107003, 005069, 104000, 031002, 201135,
+               015073, 015064, 201000 ]
+"340027" = [  001007, 002019, 002020, 005077, 006043, 001033, 001034, 301011, 301012, 004007,
+               301021, 033003, 008090, 020140, 008090, 020141 ]
+"340028" = [  008070, 001033, 001034, 001007, 002019, 005040, 025075, 005041, 005043, 301011,
+               301013, 005001, 006001, 201133, 007071, 201000, 007024, 005021, 007025, 005022,
+               110000, 031001, 005042, 033002, 025076, 025077, 025078, 201143, 012163, 201000,
+               012158, 012159 ]
diff --git a/definitions/create_def.pl b/definitions/create_def.pl
index 4d624e58f..4320249cd 100755
--- a/definitions/create_def.pl
+++ b/definitions/create_def.pl
@@ -23,7 +23,7 @@ my $dbh  = DBI->connect("dbi:mysql(RaiseError=>1):database=$db;host=$host",$user
 #my $tarfilesflag = 0;
 
 sub create_cfName {
-    my $p; my %seen; 
+    my $p; my %seen;
     my ($key) = "cfName";
     my $field = "cf.name";
 
@@ -47,7 +47,7 @@ EOF
     my $qh=$dbh->prepare($query);
     $qh->execute();
 
-    # file containing the list of grib api parameters files we want to tar and 
+    # file containing the list of grib api parameters files we want to tar and
     # distribute to users for them to download and update their list of parameter
     # to the latest
     #open(TAR,$tarfilesflag ? ">>" : ">","tarfiles.txt") or die "Count not open file tarfiles.txt: $!";
@@ -82,7 +82,7 @@ EOF
         }
         $seen{$attribute}=1;
         print "($key=$keyval) $edition,$centre,$shortName,$paramId,$name,$attribute,$value\n";
-        # we need to allow strings in the attribute_value field 
+        # we need to allow strings in the attribute_value field
         # for the moment we apply a patch here
         if ($attribute =~ /stepType/ ) {
             $value="\"accum\"";
@@ -101,7 +101,7 @@ EOF
 }
 
 sub create_cfName_legacy {
-    my $p; my %seen; 
+    my $p; my %seen;
     my ($key) = "cfName";
     my $field = "cf.name";
 
@@ -124,7 +124,7 @@ EOF
     my $qh=$dbh->prepare($query);
     $qh->execute();
 
-    # file containing the list of grib api parameters files we want to tar and 
+    # file containing the list of grib api parameters files we want to tar and
     # distribute to users for them to download and update their list of parameter
     # to the latest
     #open(TAR,$tarfilesflag ? ">>" : ">","tarfiles.txt") or die "Count not open file tarfiles.txt: $!";
@@ -159,7 +159,7 @@ EOF
         }
         $seen{$attribute}=1;
         print "($key=$keyval) $edition,$centre,$shortName,$paramId,$name,$attribute,$value\n";
-        # we need to allow strings in the attribute_value field 
+        # we need to allow strings in the attribute_value field
         # for the moment we apply a patch here
         if ($attribute =~ /stepType/ ) {
             $value="\"accum\"";
@@ -178,13 +178,13 @@ EOF
 }
 
 sub create_def {
-    my $p; my %seen; 
+    my $p; my %seen;
     my ($key) =@_;
     my $field=$key;
 
-    if ($key =~ /paramId/) { $field="param.id"; } 
-    if ($key =~ /name/) { $field="param.name"; } 
-    if ($key =~ /units/) { $field="units.name"; } 
+    if ($key =~ /paramId/) { $field="param.id"; }
+    if ($key =~ /name/) { $field="param.name"; }
+    if ($key =~ /units/) { $field="units.name"; }
 
     my $query= <<"EOF";
         select $field,force128,edition,
@@ -205,7 +205,7 @@ EOF
     my $qh=$dbh->prepare($query);
     $qh->execute();
 
-    # file containing the list of grib api parameters files we want to tar and 
+    # file containing the list of grib api parameters files we want to tar and
     # distribute to users for them to download and update their list of parameter
     # to the latest
     #open(TAR,$tarfilesflag ? ">>" : ">","tarfiles.txt") or die "Count not open file tarfiles.txt: $!";
@@ -225,9 +225,9 @@ EOF
                 close $out;
             }
             $filebase="$basedir/grib$edition$conceptDir";
-            mkpath($filebase); 
+            mkpath($filebase);
 
-            #copy("$filebase/$key.def","$filebase/$key.def.bkp") 
+            #copy("$filebase/$key.def","$filebase/$key.def.bkp")
             #  or die ("unable to copy $filebase/$key.def");
 
             print TAR "grib$edition$conceptDir/$key.def\n";
@@ -246,7 +246,7 @@ EOF
         }
         $seen{$attribute}=1;
         print "($key=$keyval) $edition,$centre,$shortName,$paramId,$name,$attribute,$value\n";
-        # we need to allow strings in the attribute_value field 
+        # we need to allow strings in the attribute_value field
         # for the moment we apply a patch here
         if ($attribute =~ /stepType/ ) {
             $value="\"accum\"";
@@ -265,13 +265,13 @@ EOF
 }
 
 sub create_def_legacy {
-    my $p; my %seen; 
+    my $p; my %seen;
     my ($key) =@_;
     my $field=$key;
 
-    if ($key =~ /paramId/) { $field="param.id"; } 
-    if ($key =~ /name/) { $field="param.name"; } 
-    if ($key =~ /units/) { $field="units.name"; } 
+    if ($key =~ /paramId/) { $field="param.id"; }
+    if ($key =~ /name/) { $field="param.name"; }
+    if ($key =~ /units/) { $field="units.name"; }
 
     my $query= <<"EOF";
         select $field,force128,edition,
@@ -291,7 +291,7 @@ EOF
     my $qh=$dbh->prepare($query);
     $qh->execute();
 
-    # file containing the list of grib api parameters files we want to tar and 
+    # file containing the list of grib api parameters files we want to tar and
     # distribute to users for them to download and update their list of parameter
     # to the latest
     #open(TAR,$tarfilesflag ? ">>" : ">","tarfiles.txt") or die "Count not open file tarfiles.txt: $!";
@@ -311,9 +311,9 @@ EOF
                 close $out;
             }
             $filebase="$basedir/grib$edition$conceptDir";
-            mkpath($filebase); 
+            mkpath($filebase);
 
-            #copy("$filebase/$key.def","$filebase/$key.def.bkp") 
+            #copy("$filebase/$key.def","$filebase/$key.def.bkp")
             #  or die ("unable to copy $filebase/$key.def");
 
             print TAR "grib$edition$conceptDir/$key.legacy.def\n";
@@ -332,7 +332,7 @@ EOF
         }
         $seen{$attribute}=1;
         print "($key=$keyval) $edition,$centre,$shortName,$paramId,$name,$attribute,$value\n";
-        # we need to allow strings in the attribute_value field 
+        # we need to allow strings in the attribute_value field
         # for the moment we apply a patch here
         if ($attribute =~ /stepType/ ) {
             $value="\"accum\"";
@@ -349,9 +349,95 @@ EOF
 
     close(TAR);
 }
- 
+
+sub create_cfVarName {
+    my $p; my %seen;
+    my ($key) =@_;
+    my $field=$key;
+
+    #if ($key =~ /paramId/) { $field="param.id"; }
+    #if ($key =~ /name/) { $field="param.name"; }
+    #if ($key =~ /units/) { $field="units.name"; }
+    if ($key =~ /cfVarName/) { $field="cfVarName"; }
+
+    my $query= <<"EOF";
+        select $field,force128,edition,
+        centre.abbreviation,param_id,attribute.name,attribute_value,param.name,param.shortName
+        from param,grib_encoding,grib,attribute,centre,units where
+        param.hide_def=0 and
+        grib_encoding.id=grib.encoding_id and
+        param.id=grib_encoding.param_id and
+        attribute.id=grib.attribute_id and
+        centre.id=grib_encoding.centre_id and
+        units.id=param.units_id
+        and cfVarName IS NOT NULL
+        order by edition,centre_id,param.o,param.id,grib_encoding.param_version,attribute.o;
+EOF
+
+    my $qh=$dbh->prepare($query);
+    $qh->execute();
+
+    # file containing the list of grib api parameters files we want to tar and
+    # distribute to users for them to download and update their list of parameter
+    # to the latest
+    #open(TAR,$tarfilesflag ? ">>" : ">","tarfiles.txt") or die "Count not open file tarfiles.txt: $!";
+    #$tarfilesflag=1;
+
+    while (my ($keyval,$force128,$edition,$centre,$paramId,$attribute,$value,$name,$shortName)=$qh->fetchrow_array )
+    {
+        if ($centre eq "wmo" ) { $conceptDir=""; }
+        else { $conceptDir="/localConcepts/$centre"; }
+        #if ($key =~ /paramId/ && $force128==1 && $keyval >1000) {
+        #  $keyval= $keyval % 1000;
+        #}
+
+        if ($filebase ne "$basedir/grib$edition$conceptDir") {
+            if ($filebase) {
+                print $out "}\n";
+                close $out;
+            }
+            $filebase="$basedir/grib$edition$conceptDir";
+            mkpath($filebase);
+
+            #copy("$filebase/$key.def","$filebase/$key.def.bkp")
+            #  or die ("unable to copy $filebase/$key.def");
+
+            print TAR "grib$edition$conceptDir/$key.def\n";
+            #system("cp -f $filebase/$key.def $filebase/$key.def.orig");
+            open($out,"> $filebase/$key.def")
+                or die "unable to open $filebase/$key.def";
+            print $out "# Automatically generated by $0, do not edit\n";
+            $p=();
+        }
+        if ($p ne $paramId || exists($seen{$attribute}) ) {
+           if ($p) { print $out "\t}\n"; }
+           print $out "#$name\n" ;
+           print $out "\'".$keyval."\' = {\n" ;
+           $p=$paramId;
+           %seen=();
+        }
+        $seen{$attribute}=1;
+        print "($key=$keyval) $edition,$centre,$shortName,$paramId,$name,$attribute,$value\n";
+        # we need to allow strings in the attribute_value field
+        # for the moment we apply a patch here
+        if ($attribute =~ /stepType/ ) {
+            $value="\"accum\"";
+        }
+        if ($value eq '') {
+            $value="missing()";
+        }
+        print $out "\t $attribute = $value ;\n" ;
+    }
+    if ($filebase) {
+       print $out "}\n";
+       close $out;
+    }
+
+    close(TAR);
+}
+
 sub create_paramId_def {
-    my $p; my %seen; 
+    my $p; my %seen;
 
     my $query="select edition,centre.abbreviation,param_id,attribute.name,attribute_value,param.name,param.shortName
     from param,grib_encoding,grib,attribute,centre where
@@ -378,9 +464,9 @@ sub create_paramId_def {
                 close $out;
             }
             $filebase="$basedir/grib$edition$conceptDir";
-            mkpath($filebase); 
+            mkpath($filebase);
 
-            copy("$filebase/paramId.def","$filebase/paramId.def.bkp") 
+            copy("$filebase/paramId.def","$filebase/paramId.def.bkp")
                 or die ("unable to copy $filebase/paramId.def");
             open($out,"> $filebase/paramId.def")
                 or die "unable to open $filebase/paramId.def";
@@ -403,7 +489,7 @@ sub create_paramId_def {
        close $out;
     }
 }
- 
+
 sub create_def_old {
     my ($key,$query)=@_;
 
@@ -420,9 +506,9 @@ sub create_def_old {
                 close $out;
             }
             $filebase="$basedir/grib$edition$conceptDir";
-            mkpath($filebase); 
+            mkpath($filebase);
 
-            copy("$filebase/$key.def","$filebase/$key.def.bkp") 
+            copy("$filebase/$key.def","$filebase/$key.def.bkp")
                 or die ("unable to copy $filebase/$key.def");
             open($out,"> $filebase/$key.def")
                 or die "unable to open $filebase/$key.def";
@@ -443,35 +529,36 @@ create_def("name");
 create_def_legacy("name");
 create_def("units");
 create_def_legacy("units");
+create_cfVarName("cfVarName");
 create_cfName("cfName");
 create_cfName_legacy("cfName");
 
 # #create_paramId_def();
 
 # $query="select distinct edition,centre.abbreviation,param_id,param.shortName from param,grib_encoding,centre where
-#  param.hide_def=0 and 
-#  param.id=grib_encoding.param_id and 
-#  centre.id=grib_encoding.centre_id and 
+#  param.hide_def=0 and
+#  param.id=grib_encoding.param_id and
+#  centre.id=grib_encoding.centre_id and
 #  shortName!='~' order by abbreviation,edition,param.o,param.id,shortName";
 
 
-# #select distinct edition,centre.abbreviation,param_id,param.shortName 
-# #from param,grib_encoding,grib,centre where param.hide_def=0 and param.id=grib.param_id and 
-# #centre.id=grib_encoding.centre_id and shortName!='~' 
+# #select distinct edition,centre.abbreviation,param_id,param.shortName
+# #from param,grib_encoding,grib,centre where param.hide_def=0 and param.id=grib.param_id and
+# #centre.id=grib_encoding.centre_id and shortName!='~'
 # #order by centre,edition,param.o,param_id";
 
 # #create_def("shortName",$query);
 
-# $query="select distinct edition,centre.abbreviation,param_id,param.name 
-# from param,grib,centre where param.hide_def=0 and param.id=grib.param_id and 
-# centre.id=grib.centre and shortName!='~' 
+# $query="select distinct edition,centre.abbreviation,param_id,param.name
+# from param,grib,centre where param.hide_def=0 and param.id=grib.param_id and
+# centre.id=grib.centre and shortName!='~'
 # order by centre,edition,param.o,param_id";
 
 # #create_def("name",$query);
 
-# $query="select distinct edition,centre.abbreviation,param_id,units.name 
+# $query="select distinct edition,centre.abbreviation,param_id,units.name
 # from param,grib,centre,units where param.hide_def=0 and param.id=grib.param_id and units.id=param.units_id
-# and centre.id=grib.centre and shortName!='~' 
+# and centre.id=grib.centre and shortName!='~'
 # order by centre,edition,param.o,param_id";
 
 # #create_def("units",$query);
diff --git a/definitions/grib1/localConcepts/ecmf/cfVarName.def b/definitions/grib1/localConcepts/ecmf/cfVarName.def
index e36c36372..90347cbff 100644
--- a/definitions/grib1/localConcepts/ecmf/cfVarName.def
+++ b/definitions/grib1/localConcepts/ecmf/cfVarName.def
@@ -189,6 +189,11 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 7 ;
 	}
+#100 metre wind speed anomaly
+'sia100' = {
+	 table2Version = 171 ;
+	 indicatorOfParameter = 8 ;
+	}
 #2 metre specific humidity
 'sh2' = {
 	 table2Version = 174 ;
diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def
index b5a90ffca..341173e1e 100644
--- a/definitions/grib1/localConcepts/ecmf/name.def
+++ b/definitions/grib1/localConcepts/ecmf/name.def
@@ -3774,6 +3774,11 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 7 ;
 	}
+#100 metre wind speed anomaly
+'100 metre wind speed anomaly' = {
+	 table2Version = 171 ;
+	 indicatorOfParameter = 8 ;
+	}
 #Lake mix-layer temperature anomaly
 'Lake mix-layer temperature anomaly' = {
 	 table2Version = 171 ;
@@ -3794,13 +3799,13 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 122 ;
 	}
-#Mean surface runoff rate
-'Mean surface runoff rate' = {
+#Time-mean surface runoff rate
+'Time-mean surface runoff rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 8 ;
 	}
-#Mean sub-surface runoff rate
-'Mean sub-surface runoff rate' = {
+#Time-mean sub-surface runoff rate
+'Time-mean sub-surface runoff rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 9 ;
 	}
@@ -14914,18 +14919,18 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 50 ;
 	}
-#Mean large-scale precipitation rate
-'Mean large-scale precipitation rate' = {
+#Time-mean large-scale precipitation rate
+'Time-mean large-scale precipitation rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 142 ;
 	}
-#Mean convective precipitation rate
-'Mean convective precipitation rate' = {
+#Time-mean convective precipitation rate
+'Time-mean convective precipitation rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 143 ;
 	}
-#Mean total snowfall rate
-'Mean total snowfall rate' = {
+#Time-mean total snowfall rate
+'Time-mean total snowfall rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 144 ;
 	}
@@ -14934,68 +14939,68 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 145 ;
 	}
-#Mean surface sensible heat flux
-'Mean surface sensible heat flux' = {
+#Time-mean surface sensible heat flux
+'Time-mean surface sensible heat flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 146 ;
 	}
-#Mean surface latent heat flux
-'Mean surface latent heat flux' = {
+#Time-mean surface latent heat flux
+'Time-mean surface latent heat flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 147 ;
 	}
-#Mean short-wave heating rate
-'Mean short-wave heating rate' = {
+#Time-mean short-wave (solar) heating rate
+'Time-mean short-wave (solar) heating rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 153 ;
 	}
-#Mean long-wave heating rate
-'Mean long-wave heating rate' = {
+#Time-mean long-wave (thermal) heating rate
+'Time-mean long-wave (thermal) heating rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 154 ;
 	}
-#Mean surface downward solar radiation flux
-'Mean surface downward solar radiation flux' = {
+#Time-mean surface downward short-wave (solar) radiation flux
+'Time-mean surface downward short-wave (solar) radiation flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Mean surface downward thermal radiation flux
-'Mean surface downward thermal radiation flux' = {
+#Time-mean surface downward long-wave (thermal) radiation flux
+'Time-mean surface downward long-wave (thermal) radiation flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Mean surface net solar radiation flux
-'Mean surface net solar radiation flux' = {
+#Time-mean surface net short-wave (solar) radiation flux
+'Time-mean surface net short-wave (solar) radiation flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Mean surface net thermal radiation flux
-'Mean surface net thermal radiation flux' = {
+#Time-mean surface net long-wave (thermal) radiation flux
+'Time-mean surface net long-wave (thermal) radiation flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Mean top net solar radiation flux
-'Mean top net solar radiation flux' = {
+#Time-mean top net short-wave (solar) radiation flux
+'Time-mean top net short-wave (solar) radiation flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Mean top net thermal radiation flux
-'Mean top net thermal radiation flux' = {
+#Time-mean top net long-wave (thermal) radiation flux
+'Time-mean top net long-wave (thermal) radiation flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 179 ;
 	}
-#East-West surface stress rate of accumulation
-'East-West surface stress rate of accumulation' = {
+#Time-mean eastward turbulent surface stress
+'Time-mean eastward turbulent surface stress' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 180 ;
 	}
-#North-South surface stress rate of accumulation
-'North-South surface stress rate of accumulation' = {
+#Time-mean northward turbulent surface stress
+'Time-mean northward turbulent surface stress' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 181 ;
 	}
-#Evaporation
-'Evaporation' = {
+#Time-mean evaporation rate
+'Time-mean evaporation rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 182 ;
 	}
@@ -15019,48 +15024,48 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 197 ;
 	}
-#Mean runoff rate
-'Mean runoff rate' = {
+#Time-mean runoff rate
+'Time-mean runoff rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 205 ;
 	}
-#Top net solar radiation, clear sky
-'Top net solar radiation, clear sky' = {
+#Time-mean top net short-wave (solar) radiation flux, clear sky
+'Time-mean top net short-wave (solar) radiation flux, clear sky' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 208 ;
 	}
-#Top net thermal radiation, clear sky
-'Top net thermal radiation, clear sky' = {
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
+'Time-mean top net long-wave (thermal) radiation flux, clear sky' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net solar radiation, clear sky
-'Surface net solar radiation, clear sky' = {
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
+'Time-mean surface net short-wave (solar) radiation flux, clear sky' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net thermal radiation, clear sky
-'Surface net thermal radiation, clear sky' = {
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
+'Time-mean surface net long-wave (thermal) radiation flux, clear sky' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 211 ;
 	}
-#Solar insolation rate of accumulation
-'Solar insolation rate of accumulation' = {
+#Time-mean short-wave (solar) insolation rate
+'Time-mean short-wave (solar) insolation rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 212 ;
 	}
-#Mean total precipitation rate
-'Mean total precipitation rate' = {
+#Time-mean total precipitation rate
+'Time-mean total precipitation rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 228 ;
 	}
-#Convective snowfall
-'Convective snowfall' = {
+#Time-mean convective snowfall rate
+'Time-mean convective snowfall rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 239 ;
 	}
-#Large scale snowfall
-'Large scale snowfall' = {
+#Time-mean large-scale snowfall rate
+'Time-mean large-scale snowfall rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 240 ;
 	}
diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def
index 9a4be679c..7a6c1ec49 100644
--- a/definitions/grib1/localConcepts/ecmf/paramId.def
+++ b/definitions/grib1/localConcepts/ecmf/paramId.def
@@ -3774,6 +3774,11 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 7 ;
 	}
+#100 metre wind speed anomaly
+'171008' = {
+	 table2Version = 171 ;
+	 indicatorOfParameter = 8 ;
+	}
 #Lake mix-layer temperature anomaly
 '171024' = {
 	 table2Version = 171 ;
@@ -3794,12 +3799,12 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 122 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 '172008' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 8 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 '172009' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 9 ;
@@ -14914,17 +14919,17 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 50 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 '172142' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 142 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 '172143' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 143 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 '172144' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 144 ;
@@ -14934,67 +14939,67 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 145 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
 '172146' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 146 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
 '172147' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 147 ;
 	}
-#Mean short-wave heating rate
+#Time-mean short-wave (solar) heating rate
 '172153' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 153 ;
 	}
-#Mean long-wave heating rate
+#Time-mean long-wave (thermal) heating rate
 '172154' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 154 ;
 	}
-#Mean surface downward solar radiation flux
+#Time-mean surface downward short-wave (solar) radiation flux
 '172169' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Mean surface downward thermal radiation flux
+#Time-mean surface downward long-wave (thermal) radiation flux
 '172175' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Mean surface net solar radiation flux
+#Time-mean surface net short-wave (solar) radiation flux
 '172176' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Mean surface net thermal radiation flux
+#Time-mean surface net long-wave (thermal) radiation flux
 '172177' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Mean top net solar radiation flux
+#Time-mean top net short-wave (solar) radiation flux
 '172178' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Mean top net thermal radiation flux
+#Time-mean top net long-wave (thermal) radiation flux
 '172179' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 179 ;
 	}
-#East-West surface stress rate of accumulation
+#Time-mean eastward turbulent surface stress
 '172180' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 180 ;
 	}
-#North-South surface stress rate of accumulation
+#Time-mean northward turbulent surface stress
 '172181' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 181 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 '172182' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 182 ;
@@ -15019,47 +15024,47 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 197 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 '172205' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 205 ;
 	}
-#Top net solar radiation, clear sky
+#Time-mean top net short-wave (solar) radiation flux, clear sky
 '172208' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 208 ;
 	}
-#Top net thermal radiation, clear sky
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
 '172209' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net solar radiation, clear sky
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
 '172210' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net thermal radiation, clear sky
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
 '172211' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 211 ;
 	}
-#Solar insolation rate of accumulation
+#Time-mean short-wave (solar) insolation rate
 '172212' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 212 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 '172228' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 228 ;
 	}
-#Convective snowfall
+#Time-mean convective snowfall rate
 '172239' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 239 ;
 	}
-#Large scale snowfall
+#Time-mean large-scale snowfall rate
 '172240' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 240 ;
diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def
index 307dea7b6..7b3d8b742 100644
--- a/definitions/grib1/localConcepts/ecmf/shortName.def
+++ b/definitions/grib1/localConcepts/ecmf/shortName.def
@@ -3774,6 +3774,11 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 7 ;
 	}
+#100 metre wind speed anomaly
+'100sia' = {
+	 table2Version = 171 ;
+	 indicatorOfParameter = 8 ;
+	}
 #Lake mix-layer temperature anomaly
 'lmlta' = {
 	 table2Version = 171 ;
@@ -3794,12 +3799,12 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 122 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'msror' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 8 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'mssror' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 9 ;
@@ -6225,7 +6230,7 @@
 	 indicatorOfParameter = 221 ;
 	}
 #Cosine of solar zenith angle
-'uvcossza' = {
+'cossza' = {
 	 table2Version = 214 ;
 	 indicatorOfParameter = 1 ;
 	}
@@ -10460,7 +10465,7 @@
 	 indicatorOfParameter = 49 ;
 	}
 #Time-mean top net long-wave radiation flux, clear sky
-'avg_tnlwrcs' = {
+'avg_tnlwrfcs' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 50 ;
 	}
@@ -10470,7 +10475,7 @@
 	 indicatorOfParameter = 51 ;
 	}
 #Time-mean surface net long-wave radiation flux, clear sky
-'avg_snlwrcs' = {
+'avg_snlwrfcs' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 52 ;
 	}
@@ -14914,17 +14919,17 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 50 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'mlsprt' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 142 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'cprate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 143 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'mtsfr' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 144 ;
@@ -14934,67 +14939,67 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 145 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
 'msshfl' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 146 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
 'mslhfl' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 147 ;
 	}
-#Mean short-wave heating rate
+#Time-mean short-wave (solar) heating rate
 'mswhr' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 153 ;
 	}
-#Mean long-wave heating rate
+#Time-mean long-wave (thermal) heating rate
 'mlwhr' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 154 ;
 	}
-#Mean surface downward solar radiation flux
+#Time-mean surface downward short-wave (solar) radiation flux
 'msdsrf' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Mean surface downward thermal radiation flux
+#Time-mean surface downward long-wave (thermal) radiation flux
 'msdtrf' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Mean surface net solar radiation flux
+#Time-mean surface net short-wave (solar) radiation flux
 'msnsrf' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Mean surface net thermal radiation flux
+#Time-mean surface net long-wave (thermal) radiation flux
 'msntrf' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Mean top net solar radiation flux
+#Time-mean top net short-wave (solar) radiation flux
 'mtnsrf' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Mean top net thermal radiation flux
+#Time-mean top net long-wave (thermal) radiation flux
 'mtntrf' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 179 ;
 	}
-#East-West surface stress rate of accumulation
+#Time-mean eastward turbulent surface stress
 'ewssra' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 180 ;
 	}
-#North-South surface stress rate of accumulation
+#Time-mean northward turbulent surface stress
 'nsssra' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 181 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'erate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 182 ;
@@ -15019,47 +15024,47 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 197 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'mrort' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 205 ;
 	}
-#Top net solar radiation, clear sky
+#Time-mean top net short-wave (solar) radiation flux, clear sky
 '~' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 208 ;
 	}
-#Top net thermal radiation, clear sky
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
 '~' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net solar radiation, clear sky
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
 '~' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net thermal radiation, clear sky
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
 '~' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 211 ;
 	}
-#Solar insolation rate of accumulation
+#Time-mean short-wave (solar) insolation rate
 'soira' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 212 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'tprate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 228 ;
 	}
-#Convective snowfall
+#Time-mean convective snowfall rate
 '~' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 239 ;
 	}
-#Large scale snowfall
+#Time-mean large-scale snowfall rate
 '~' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 240 ;
diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def
index c84516ada..ecd258f62 100644
--- a/definitions/grib1/localConcepts/ecmf/units.def
+++ b/definitions/grib1/localConcepts/ecmf/units.def
@@ -3774,6 +3774,11 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 7 ;
 	}
+#100 metre wind speed anomaly
+'m s**-1' = {
+	 table2Version = 171 ;
+	 indicatorOfParameter = 8 ;
+	}
 #Lake mix-layer temperature anomaly
 'K' = {
 	 table2Version = 171 ;
@@ -3794,12 +3799,12 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 122 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'm s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 8 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'm s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 9 ;
@@ -6225,7 +6230,7 @@
 	 indicatorOfParameter = 221 ;
 	}
 #Cosine of solar zenith angle
-'~' = {
+'Numeric' = {
 	 table2Version = 214 ;
 	 indicatorOfParameter = 1 ;
 	}
@@ -14914,17 +14919,17 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 50 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'm s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 142 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'm s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 143 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'm of water equivalent s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 144 ;
@@ -14934,67 +14939,67 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 145 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 146 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 147 ;
 	}
-#Mean short-wave heating rate
+#Time-mean short-wave (solar) heating rate
 'K s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 153 ;
 	}
-#Mean long-wave heating rate
+#Time-mean long-wave (thermal) heating rate
 'K s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 154 ;
 	}
-#Mean surface downward solar radiation flux
+#Time-mean surface downward short-wave (solar) radiation flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Mean surface downward thermal radiation flux
+#Time-mean surface downward long-wave (thermal) radiation flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Mean surface net solar radiation flux
+#Time-mean surface net short-wave (solar) radiation flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Mean surface net thermal radiation flux
+#Time-mean surface net long-wave (thermal) radiation flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Mean top net solar radiation flux
+#Time-mean top net short-wave (solar) radiation flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Mean top net thermal radiation flux
+#Time-mean top net long-wave (thermal) radiation flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 179 ;
 	}
-#East-West surface stress rate of accumulation
+#Time-mean eastward turbulent surface stress
 'N m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 180 ;
 	}
-#North-South surface stress rate of accumulation
+#Time-mean northward turbulent surface stress
 'N m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 181 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'm of water equivalent s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 182 ;
@@ -15019,47 +15024,47 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 197 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'm s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 205 ;
 	}
-#Top net solar radiation, clear sky
+#Time-mean top net short-wave (solar) radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 208 ;
 	}
-#Top net thermal radiation, clear sky
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net solar radiation, clear sky
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net thermal radiation, clear sky
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 211 ;
 	}
-#Solar insolation rate of accumulation
+#Time-mean short-wave (solar) insolation rate
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 212 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'm s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 228 ;
 	}
-#Convective snowfall
+#Time-mean convective snowfall rate
 'm of water equivalent s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 239 ;
 	}
-#Large scale snowfall
+#Time-mean large-scale snowfall rate
 'm of water equivalent s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 240 ;
diff --git a/definitions/grib1/localConcepts/edzw/name.def b/definitions/grib1/localConcepts/edzw/name.def
index 6abae509f..40ab4ab2c 100644
--- a/definitions/grib1/localConcepts/edzw/name.def
+++ b/definitions/grib1/localConcepts/edzw/name.def
@@ -1,4 +1,4 @@
-# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE, do not edit! 2023-07-18 16:26
+# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@OFC1MIR.DWD.DE, do not edit! 2024-09-17 11:09
 #paramId: 500000
 #Pressure (S) (not reduced)
 'Pressure (S) (not reduced)' = {
diff --git a/definitions/grib1/localConcepts/edzw/paramId.def b/definitions/grib1/localConcepts/edzw/paramId.def
index c26e8f4b9..0af5e8fbc 100644
--- a/definitions/grib1/localConcepts/edzw/paramId.def
+++ b/definitions/grib1/localConcepts/edzw/paramId.def
@@ -1,4 +1,4 @@
-# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE,do not edit! 2023-07-18 16:26
+# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@OFC1MIR.DWD.DE,do not edit! 2024-09-17 11:09
 #paramId: 500000
 #Pressure (S) (not reduced)
 '500000' = {
diff --git a/definitions/grib1/localConcepts/edzw/shortName.def b/definitions/grib1/localConcepts/edzw/shortName.def
index e71934309..28795b4e0 100644
--- a/definitions/grib1/localConcepts/edzw/shortName.def
+++ b/definitions/grib1/localConcepts/edzw/shortName.def
@@ -1,4 +1,4 @@
-# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE, do not edit! 2023-07-18 16:26
+# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@OFC1MIR.DWD.DE, do not edit! 2024-09-17 11:09
 #paramId: 500000
 #Pressure (S) (not reduced)
 'PS' = {
diff --git a/definitions/grib1/localConcepts/edzw/units.def b/definitions/grib1/localConcepts/edzw/units.def
index 73fe51891..b759cdb4a 100644
--- a/definitions/grib1/localConcepts/edzw/units.def
+++ b/definitions/grib1/localConcepts/edzw/units.def
@@ -1,4 +1,4 @@
-# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE, do not edit! 2023-07-18 16:26
+# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@OFC1MIR.DWD.DE, do not edit! 2024-09-17 11:09
 #paramId: 500000
 #Pressure (S) (not reduced)
 'Pa' = {
diff --git a/definitions/grib2/boot.def b/definitions/grib2/boot.def
index 240428358..680954f2c 100644
--- a/definitions/grib2/boot.def
+++ b/definitions/grib2/boot.def
@@ -9,9 +9,9 @@
 
 # This gets updated twice a year by WMO.
 # See https://community.wmo.int/en/wis/latest-version
-constant tablesVersionLatestOfficial = 33 : edition_specific;
+constant tablesVersionLatestOfficial = 34 : edition_specific;
 # If this is different from the official version, then it is the pre-operational version
-constant tablesVersionLatest = 33 : edition_specific;
+constant tablesVersionLatest = 34 : edition_specific;
 
 # See ECC-1426
 # GRIB messages with tablesVersion greater than or equal will have paramId and chemId
diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def
index 3a0da3422..7d1d589cd 100644
--- a/definitions/grib2/cfVarName.def
+++ b/definitions/grib2/cfVarName.def
@@ -119,34 +119,6 @@
 	 scaleFactorOfLowerLimit = 0 ;
 	 probabilityType = 3 ;
 	}
-#Time-mean 2D wave spectra (single)
-'avg_2dfd' = {
-	 discipline = 10 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 86 ;
-	 typeOfStatisticalProcessing = 0 ;
-	}
-#Time-maximum 2D wave spectra (single)
-'max_2dfd' = {
-	 discipline = 10 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 86 ;
-	 typeOfStatisticalProcessing = 2 ;
-	}
-#Time-minimum 2D wave spectra (single)
-'min_2dfd' = {
-	 discipline = 10 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 86 ;
-	 typeOfStatisticalProcessing = 3 ;
-	}
-#Time-standard-deviation 2D wave spectra (single)
-'std_2dfd' = {
-	 discipline = 10 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 86 ;
-	 typeOfStatisticalProcessing = 6 ;
-	}
 #2 metre specific humidity
 'sh2' = {
 	 discipline = 0 ;
@@ -214,6 +186,26 @@
 	 scaledValueOfFirstFixedSurface = 100 ;
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	}
+#Time-maximum 2 metre relative humidity
+'mx2r' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-minimum 2 metre relative humidity
+'mn2r' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
 #Time-mean sea ice area fraction
 'avg_ci' = {
 	 discipline = 10 ;
diff --git a/definitions/grib2/destine_activity.table b/definitions/grib2/destine_activity.table
index b7c3e8d86..060f28c88 100644
--- a/definitions/grib2/destine_activity.table
+++ b/definitions/grib2/destine_activity.table
@@ -3,4 +3,6 @@
 2 ScenarioMIP Scenario Model Intercomparison Project
 3 HighResMIP High Resolution Model Intercomparison Project
 4 story-nudging Climate storylines by nudging to reanalysis
+5 baseline Baseline simulations for climate model evaluation
+6 projections Future climate projections
 65535 65535 Missing
diff --git a/definitions/grib2/destine_experiment.table b/definitions/grib2/destine_experiment.table
index 864ef9260..1bb7c36d5 100644
--- a/definitions/grib2/destine_experiment.table
+++ b/definitions/grib2/destine_experiment.table
@@ -11,4 +11,5 @@
 10 Tplus2.0K Warmer world at 2.0 degrees K above pre-industrial temperatures
 11 Tplus3.0K Warmer world at 3.0 degrees K above pre-industrial temperatures
 12 Tplus4.0K Warmer world at 4.0 degrees K above pre-industrial temperatures
+13 abrupt4xco2 CO2 abruptly quadrupled and then held constant
 65535 65535 Missing
diff --git a/definitions/grib2/destine_model.table b/definitions/grib2/destine_model.table
index 1e33fbac1..48c7b676d 100644
--- a/definitions/grib2/destine_model.table
+++ b/definitions/grib2/destine_model.table
@@ -2,5 +2,5 @@
 1 IFS IFS with no ocean model
 2 IFS-NEMO IFS with NEMO ocean model
 3 IFS-FESOM IFS with FESOM ocean model
-4 ICON ICON with no ocean model
+4 ICON ICON-A with ICON-O ocean model
 65535 65535 Missing
diff --git a/definitions/grib2/local.98.300.def b/definitions/grib2/local.98.300.def
index af4d5b866..360163434 100644
--- a/definitions/grib2/local.98.300.def
+++ b/definitions/grib2/local.98.300.def
@@ -1,7 +1,7 @@
 # Local definition 300: Multi-dimensional parameters
 # Warning: This is now DEPRECATED. See ECC-1440
 
-codetable[1] dimensionType "grib2/dimensionType.table"=0;
+codetable[1] dimensionType "grib2/dimensionType.table" = "layer" : string_type;
 
 # The n-th dimension (out of total number of dimensions)
 unsigned[2] dimensionNumber;
diff --git a/definitions/grib2/local.destine.on-demand-extremes-dt.def b/definitions/grib2/local.destine.on-demand-extremes-dt.def
new file mode 100644
index 000000000..1d7e8ff81
--- /dev/null
+++ b/definitions/grib2/local.destine.on-demand-extremes-dt.def
@@ -0,0 +1,6 @@
+# DestinE MARS On-Demand ExtremesDT keywords
+
+# Default is lat,long 0.0,0.0 to 8 chars precision from geolib
+
+ascii[8] georef = "s0000000" : dump ;
+alias mars.georef = georef;
diff --git a/definitions/grib2/local/ecmf/section4_extras.def b/definitions/grib2/local/ecmf/section4_extras.def
index 49351d8b9..c1315beaf 100644
--- a/definitions/grib2/local/ecmf/section4_extras.def
+++ b/definitions/grib2/local/ecmf/section4_extras.def
@@ -1,12 +1,13 @@
 # (C) Copyright 2005- ECMWF.
 
 # See ECC-1846
-if (centre is "ecmf" or datasetForLocal is "era6") {
- concept modelName(unknown, "modelNameConcept.def", conceptsMasterDir, conceptsLocalDirAll): no_copy, dump, read_only;
+# This is only read when centre=ecmf, so can remove if statement that was here
+# This is ecmf local so we shouldn't use MasterDir. Instead we look for pseudocentre (conceptsDir2) then centre (conceptsLocalDirAll)
 
- if (modelName isnot "unknown") {
-    concept modelVersion(unknown, "modelVersionConcept.[modelName].def", conceptsMasterDir, conceptsLocalDirAll): no_copy, dump, read_only;
-    # alias ls.model = modelName;
-    # alias mars.model = modelName;
- }
+concept modelName(unknown, "modelNameConcept.def", conceptsDir2, conceptsLocalDirAll): no_copy, dump, read_only;
+
+if (modelName isnot "unknown") {
+   concept modelVersion(unknown, "modelVersionConcept.[modelName].def", conceptsDir2, conceptsLocalDirAll): no_copy, dump, read_only;
+   # alias ls.model = modelName;
+   # alias mars.model = modelName;
 }
diff --git a/definitions/grib2/localConcepts/cerise/name.def b/definitions/grib2/localConcepts/cerise/name.def
index 3d758e137..e2206e835 100644
--- a/definitions/grib2/localConcepts/cerise/name.def
+++ b/definitions/grib2/localConcepts/cerise/name.def
@@ -125,8 +125,8 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 193 ;
 	}
-#Mean surface runoff rate
-'Mean surface runoff rate' = {
+#Time-mean surface runoff rate
+'Time-mean surface runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -134,8 +134,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
-'Mean sub-surface runoff rate' = {
+#Time-mean sub-surface runoff rate
+'Time-mean sub-surface runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -206,8 +206,8 @@
 	 parameterNumber = 193 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean large-scale precipitation rate
-'Mean large-scale precipitation rate' = {
+#Time-mean large-scale precipitation rate
+'Time-mean large-scale precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -215,8 +215,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
-'Mean convective precipitation rate' = {
+#Time-mean convective precipitation rate
+'Time-mean convective precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -224,8 +224,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
-'Mean total snowfall rate' = {
+#Time-mean total snowfall rate
+'Time-mean total snowfall rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -233,8 +233,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
-'Evaporation' = {
+#Time-mean evaporation rate
+'Time-mean evaporation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -242,8 +242,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
-'Mean runoff rate' = {
+#Time-mean runoff rate
+'Time-mean runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -251,8 +251,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
-'Mean total precipitation rate' = {
+#Time-mean total precipitation rate
+'Time-mean total precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
diff --git a/definitions/grib2/localConcepts/cerise/paramId.def b/definitions/grib2/localConcepts/cerise/paramId.def
index a3f2a3407..101a4c3f1 100644
--- a/definitions/grib2/localConcepts/cerise/paramId.def
+++ b/definitions/grib2/localConcepts/cerise/paramId.def
@@ -125,7 +125,7 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 193 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 '172008' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -134,7 +134,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 '172009' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -206,7 +206,7 @@
 	 parameterNumber = 193 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 '172142' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -215,7 +215,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 '172143' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -224,7 +224,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 '172144' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -233,7 +233,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 '172182' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -242,7 +242,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 '172205' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -251,7 +251,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 '172228' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/cerise/shortName.def b/definitions/grib2/localConcepts/cerise/shortName.def
index 9d88fb46e..e97fb8d55 100644
--- a/definitions/grib2/localConcepts/cerise/shortName.def
+++ b/definitions/grib2/localConcepts/cerise/shortName.def
@@ -125,7 +125,7 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 193 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'msror' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -134,7 +134,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'mssror' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -206,7 +206,7 @@
 	 parameterNumber = 193 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'mlsprt' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -215,7 +215,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'cprate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -224,7 +224,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'mtsfr' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -233,7 +233,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'erate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -242,7 +242,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'mrort' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -251,7 +251,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'tprate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/cerise/units.def b/definitions/grib2/localConcepts/cerise/units.def
index d5215c398..225cdc32c 100644
--- a/definitions/grib2/localConcepts/cerise/units.def
+++ b/definitions/grib2/localConcepts/cerise/units.def
@@ -125,7 +125,7 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 193 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -134,7 +134,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -206,7 +206,7 @@
 	 parameterNumber = 193 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -215,7 +215,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -224,7 +224,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'm of water equivalent s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -233,7 +233,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'm of water equivalent s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -242,7 +242,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -251,7 +251,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/destine/cfName.def b/definitions/grib2/localConcepts/destine/cfName.def
index acde985fd..08659ca3c 100644
--- a/definitions/grib2/localConcepts/destine/cfName.def
+++ b/definitions/grib2/localConcepts/destine/cfName.def
@@ -1,4 +1,40 @@
 # Automatically generated by ./create_def.pl, do not edit
+#U component of wind
+'eastward_wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'eastward_wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'northward_wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'northward_wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
 #Carbon dioxide mass mixing ratio
 'mass_fraction_of_carbon_dioxide_in_air' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/destine/modelNameConcept.def b/definitions/grib2/localConcepts/destine/modelNameConcept.def
new file mode 100644
index 000000000..94f0797e4
--- /dev/null
+++ b/definitions/grib2/localConcepts/destine/modelNameConcept.def
@@ -0,0 +1,18 @@
+'IFS' = {
+    backgroundProcess = 255;
+}
+'AIFS' = {
+    backgroundProcess = 1;
+}
+'ICON' = {
+    backgroundProcess = 2;
+}
+'ALARO' = {
+    backgroundProcess = 3;
+}
+'AROME' = {
+    backgroundProcess = 4;
+}
+'HARMONIE-AROME' = {
+    backgroundProcess = 5;
+}
\ No newline at end of file
diff --git a/definitions/grib2/localConcepts/destine/modelVersionConcept.AIFS.def b/definitions/grib2/localConcepts/destine/modelVersionConcept.AIFS.def
new file mode 100644
index 000000000..b06e75f21
--- /dev/null
+++ b/definitions/grib2/localConcepts/destine/modelVersionConcept.AIFS.def
@@ -0,0 +1,2 @@
+'v1' = { generatingProcessIdentifier = 1; }
+'v2' = { generatingProcessIdentifier = 2; } 
diff --git a/definitions/grib2/localConcepts/destine/modelVersionConcept.ALARO.def b/definitions/grib2/localConcepts/destine/modelVersionConcept.ALARO.def
new file mode 100644
index 000000000..742d5c1bb
--- /dev/null
+++ b/definitions/grib2/localConcepts/destine/modelVersionConcept.ALARO.def
@@ -0,0 +1,3 @@
+'cy49t2' = { generatingProcessIdentifier = 3; } 
+'cy48t3' = { generatingProcessIdentifier = 2; }
+'cy46h1' = { generatingProcessIdentifier = 1; }
diff --git a/definitions/grib2/localConcepts/destine/modelVersionConcept.AROME.def b/definitions/grib2/localConcepts/destine/modelVersionConcept.AROME.def
new file mode 100644
index 000000000..742d5c1bb
--- /dev/null
+++ b/definitions/grib2/localConcepts/destine/modelVersionConcept.AROME.def
@@ -0,0 +1,3 @@
+'cy49t2' = { generatingProcessIdentifier = 3; } 
+'cy48t3' = { generatingProcessIdentifier = 2; }
+'cy46h1' = { generatingProcessIdentifier = 1; }
diff --git a/definitions/grib2/localConcepts/destine/modelVersionConcept.HARMONIE-AROME.def b/definitions/grib2/localConcepts/destine/modelVersionConcept.HARMONIE-AROME.def
new file mode 100644
index 000000000..742d5c1bb
--- /dev/null
+++ b/definitions/grib2/localConcepts/destine/modelVersionConcept.HARMONIE-AROME.def
@@ -0,0 +1,3 @@
+'cy49t2' = { generatingProcessIdentifier = 3; } 
+'cy48t3' = { generatingProcessIdentifier = 2; }
+'cy46h1' = { generatingProcessIdentifier = 1; }
diff --git a/definitions/grib2/localConcepts/destine/modelVersionConcept.IFS.def b/definitions/grib2/localConcepts/destine/modelVersionConcept.IFS.def
new file mode 100644
index 000000000..2bbe0ee20
--- /dev/null
+++ b/definitions/grib2/localConcepts/destine/modelVersionConcept.IFS.def
@@ -0,0 +1,18 @@
+'cy50r3' = { generatingProcessIdentifier = 163; }
+'cy50r2' = { generatingProcessIdentifier = 162; }
+'cy50r1' = { generatingProcessIdentifier = 161; }
+'cy49r3' = { generatingProcessIdentifier = 160; }
+'cy49r2' = { generatingProcessIdentifier = 159; }
+'cy49r1' = { generatingProcessIdentifier = 158; }
+'cy48r3' = { generatingProcessIdentifier = 157; }
+'climatedt' = { generatingProcessIdentifier = 156; }
+'cy48r2' = { generatingProcessIdentifier = 155; }
+'cy48r1' = { generatingProcessIdentifier = 154; }
+'cy47r3' = { generatingProcessIdentifier = 153; }
+'cy47r2' = { generatingProcessIdentifier = 152; }
+'cy47r1' = { generatingProcessIdentifier = 151; }
+'cy46r1' = { generatingProcessIdentifier = 150; }
+'cy45r1' = { generatingProcessIdentifier = 149; }
+'cy43r3' = { generatingProcessIdentifier = 148; }
+'cy43r1' = { generatingProcessIdentifier = 147; }
+'cy41r2' = { generatingProcessIdentifier = 146; }
\ No newline at end of file
diff --git a/definitions/grib2/localConcepts/destine/name.def b/definitions/grib2/localConcepts/destine/name.def
index a00484536..e3d0d179b 100644
--- a/definitions/grib2/localConcepts/destine/name.def
+++ b/definitions/grib2/localConcepts/destine/name.def
@@ -1,4 +1,127 @@
 # Automatically generated by ./create_def.pl, do not edit
+#Wind speed
+'Wind speed' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Wind speed
+'Wind speed' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'U component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'U component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'V component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'V component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Time-mean wind speed
+'Time-mean wind speed' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean wind speed
+'Time-mean wind speed' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'Time-mean U component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'Time-mean U component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'Time-mean V component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'Time-mean V component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total cloud cover
+'Time-mean total cloud cover' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Carbon dioxide mass mixing ratio
 'Carbon dioxide mass mixing ratio' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/destine/paramId.def b/definitions/grib2/localConcepts/destine/paramId.def
index e9080e6d4..cb70ca6f2 100644
--- a/definitions/grib2/localConcepts/destine/paramId.def
+++ b/definitions/grib2/localConcepts/destine/paramId.def
@@ -1,4 +1,127 @@
 # Automatically generated by ./create_def.pl, do not edit
+#Wind speed
+'10' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Wind speed
+'10' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'131' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'131' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'132' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'132' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Time-mean wind speed
+'235097' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean wind speed
+'235097' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'235131' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'235131' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'235132' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'235132' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total cloud cover
+'235288' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Carbon dioxide mass mixing ratio
 '210061' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/destine/shortName.def b/definitions/grib2/localConcepts/destine/shortName.def
index 8c26930a3..c1a52bd34 100644
--- a/definitions/grib2/localConcepts/destine/shortName.def
+++ b/definitions/grib2/localConcepts/destine/shortName.def
@@ -1,4 +1,127 @@
 # Automatically generated by ./create_def.pl, do not edit
+#Wind speed
+'ws' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Wind speed
+'ws' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'u' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'u' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'v' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'v' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Time-mean wind speed
+'avg_ws' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean wind speed
+'avg_ws' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'avg_u' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'avg_u' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'avg_v' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'avg_v' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total cloud cover
+'avg_tcc' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Carbon dioxide mass mixing ratio
 'co2' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/destine/units.def b/definitions/grib2/localConcepts/destine/units.def
index b7edf253c..6c33a49ba 100644
--- a/definitions/grib2/localConcepts/destine/units.def
+++ b/definitions/grib2/localConcepts/destine/units.def
@@ -1,4 +1,127 @@
 # Automatically generated by ./create_def.pl, do not edit
+#Wind speed
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Wind speed
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Time-mean wind speed
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean wind speed
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total cloud cover
+'%' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Carbon dioxide mass mixing ratio
 'kg kg**-1' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/destinegen1/destineOriginConcept.def b/definitions/grib2/localConcepts/destinegen1/destineOriginConcept.def
new file mode 100644
index 000000000..aabe1dca6
--- /dev/null
+++ b/definitions/grib2/localConcepts/destinegen1/destineOriginConcept.def
@@ -0,0 +1,10 @@
+# Concept destineOrigin
+"DWD"                                       = { centre=98; subCentre=78; }
+"Meteo-France"                              = { centre=98; subCentre=84; }
+"Meteo-France"                              = { centre=98; subCentre=85; }
+"MPI-M"                                     = { centre=98; subCentre=252; }
+"AWI"                                       = { centre=98; subCentre=253; }
+"BSC"                                       = { centre=98; subCentre=1000; }
+"CSC"                                       = { centre=98; subCentre=1001; }
+"DKRZ"                                      = { centre=98; subCentre=1002; }
+"Climate DT consortium (CSC,AWI,BSC,MPI-M)" = { centre=98; subCentre=1003; }
diff --git a/definitions/grib2/localConcepts/destinegen1/gridSpecificationConcept.def b/definitions/grib2/localConcepts/destinegen1/gridSpecificationConcept.def
new file mode 100644
index 000000000..1ae35446d
--- /dev/null
+++ b/definitions/grib2/localConcepts/destinegen1/gridSpecificationConcept.def
@@ -0,0 +1,13 @@
+# Concept gridSpecification
+'H16' = {numberOfDataPoints=3072; gridDefinitionTemplateNumber=150; Nside=16;}
+'H32' = {numberOfDataPoints=12288; gridDefinitionTemplateNumber=150; Nside=32;}
+'H64' = {numberOfDataPoints=49152; gridDefinitionTemplateNumber=150; Nside=64;}
+'H128' = {numberOfDataPoints=196608; gridDefinitionTemplateNumber=150; Nside=128;}
+'H256' = {numberOfDataPoints=786432; gridDefinitionTemplateNumber=150; Nside=256;}
+'H512' = {numberOfDataPoints=3145728; gridDefinitionTemplateNumber=150; Nside=512;}
+'H1024' = {numberOfDataPoints=12582912; gridDefinitionTemplateNumber=150; Nside=1024;}
+'O1280' = {numberOfDataPoints=6599680; gridDefinitionTemplateNumber=40; Nj=2560;}
+'O2560' = {numberOfDataPoints=26306560; gridDefinitionTemplateNumber=40; Nj=5120;}
+'O8000' = {numberOfDataPoints=256288000; gridDefinitionTemplateNumber=40; Nj=16000;}
+'F90' = {numberOfDataPoints=65160; gridDefinitionTemplateNumber=0; Ni=360; Nj=181; }
+'F360' = {numberOfDataPoints=1038240; gridDefinitionTemplateNumber=0; Ni=1440; Nj=721; }
diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.def b/definitions/grib2/localConcepts/ecmf/cfVarName.def
index 57020b521..21e27e784 100644
--- a/definitions/grib2/localConcepts/ecmf/cfVarName.def
+++ b/definitions/grib2/localConcepts/ecmf/cfVarName.def
@@ -1,4 +1,10 @@
 # Automatically generated by ./create_def.pl, do not edit
+#Sea ice area fraction
+'siconc' = {
+	 discipline = 192 ;
+	 parameterCategory = 128 ;
+	 parameterNumber = 31 ;
+	}
 #Maximum temperature at 2 metres in the last 24 hours
 'mx2t24' = {
 	 discipline = 0 ;
@@ -95,6 +101,18 @@
 	 typeOfStatisticalProcessing = 3 ;
 	 lengthOfTimeRange = 3 ;
 	}
+#Maximum 10 metre wind gust in the last 3 hours
+'fg310' = {
+	 discipline = 192 ;
+	 parameterCategory = 228 ;
+	 parameterNumber = 28 ;
+	}
+#100 metre wind speed
+'si100' = {
+	 discipline = 192 ;
+	 parameterCategory = 228 ;
+	 parameterNumber = 249 ;
+	}
 #10 metre wind gust gradient
 'fggrd10' = {
 	 discipline = 192 ;
@@ -343,6 +361,24 @@
 	 parameterCategory = 140 ;
 	 parameterNumber = 250 ;
 	}
+#2D wave spectra (single)
+'d2fd' = {
+	 discipline = 192 ;
+	 parameterCategory = 140 ;
+	 parameterNumber = 251 ;
+	}
+#Eastward surface sea water velocity
+'uoe' = {
+	 discipline = 192 ;
+	 parameterCategory = 151 ;
+	 parameterNumber = 131 ;
+	}
+#Northward surface sea water velocity
+'von' = {
+	 discipline = 192 ;
+	 parameterCategory = 151 ;
+	 parameterNumber = 132 ;
+	}
 #10 metre wind gust during averaging time
 'fgrea10' = {
 	 discipline = 192 ;
@@ -397,9 +433,33 @@
 	 parameterCategory = 200 ;
 	 parameterNumber = 168 ;
 	}
+#Time-mean 2 metre temperature
+'avg_2t' = {
+	 discipline = 192 ;
+	 parameterCategory = 228 ;
+	 parameterNumber = 4 ;
+	}
+#Time-mean 10 metre wind speed
+'avg_10ws' = {
+	 discipline = 192 ;
+	 parameterCategory = 228 ;
+	 parameterNumber = 5 ;
+	}
 #2 metre temperature significance
 't2s' = {
 	 discipline = 192 ;
 	 parameterCategory = 234 ;
 	 parameterNumber = 167 ;
+	}
+#100 metre U wind component
+'u100' = {
+	 discipline = 192 ;
+	 parameterCategory = 228 ;
+	 parameterNumber = 246 ;
+	}
+#100 metre V wind component
+'v100' = {
+	 discipline = 192 ;
+	 parameterCategory = 228 ;
+	 parameterNumber = 247 ;
 }
diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def
index 5e73d783e..fcd9d3b83 100644
--- a/definitions/grib2/localConcepts/ecmf/name.def
+++ b/definitions/grib2/localConcepts/ecmf/name.def
@@ -2497,8 +2497,8 @@
 	 parameterCategory = 171 ;
 	 parameterNumber = 122 ;
 	}
-#Mean surface runoff rate
-'Mean surface runoff rate' = {
+#Time-mean surface runoff rate
+'Time-mean surface runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -2506,8 +2506,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
-'Mean sub-surface runoff rate' = {
+#Time-mean sub-surface runoff rate
+'Time-mean sub-surface runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -5293,12 +5293,6 @@
 	 parameterCategory = 213 ;
 	 parameterNumber = 221 ;
 	}
-#Cosine of solar zenith angle
-'Cosine of solar zenith angle' = {
-	 discipline = 192 ;
-	 parameterCategory = 214 ;
-	 parameterNumber = 1 ;
-	}
 #UV biologically effective dose
 'UV biologically effective dose' = {
 	 discipline = 192 ;
@@ -18702,8 +18696,8 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 45 ;
 	}
-#Mean large-scale precipitation rate
-'Mean large-scale precipitation rate' = {
+#Time-mean large-scale precipitation rate
+'Time-mean large-scale precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -18711,8 +18705,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
-'Mean convective precipitation rate' = {
+#Time-mean convective precipitation rate
+'Time-mean convective precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -18720,8 +18714,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
-'Mean total snowfall rate' = {
+#Time-mean total snowfall rate
+'Time-mean total snowfall rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -18729,20 +18723,20 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean short-wave heating rate
-'Mean short-wave heating rate' = {
+#Time-mean short-wave (solar) heating rate
+'Time-mean short-wave (solar) heating rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 153 ;
 	}
-#Mean long-wave heating rate
-'Mean long-wave heating rate' = {
+#Time-mean long-wave (thermal) heating rate
+'Time-mean long-wave (thermal) heating rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 154 ;
 	}
-#Evaporation
-'Evaporation' = {
+#Time-mean evaporation rate
+'Time-mean evaporation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -18750,8 +18744,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
-'Mean runoff rate' = {
+#Time-mean runoff rate
+'Time-mean runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -18759,8 +18753,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
-'Mean total precipitation rate' = {
+#Time-mean total precipitation rate
+'Time-mean total precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -18768,14 +18762,14 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Convective snowfall
-'Convective snowfall' = {
+#Time-mean convective snowfall rate
+'Time-mean convective snowfall rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 239 ;
 	}
-#Large scale snowfall
-'Large scale snowfall' = {
+#Time-mean large-scale snowfall rate
+'Time-mean large-scale snowfall rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 240 ;
diff --git a/definitions/grib2/localConcepts/ecmf/name.legacy.def b/definitions/grib2/localConcepts/ecmf/name.legacy.def
index 33971fa01..31acd0c03 100644
--- a/definitions/grib2/localConcepts/ecmf/name.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/name.legacy.def
@@ -629,6 +629,12 @@
 	 parameterCategory = 210 ;
 	 parameterNumber = 197 ;
 	}
+#Cosine of solar zenith angle
+'Cosine of solar zenith angle' = {
+	 discipline = 192 ;
+	 parameterCategory = 214 ;
+	 parameterNumber = 1 ;
+	}
 #Ammonia mass mixing ratio
 'Ammonia mass mixing ratio' = {
 	 discipline = 192 ;
@@ -1448,128 +1454,128 @@
 	 parameterCategory = 162 ;
 	 parameterNumber = 215 ;
 	}
-#Mean large-scale precipitation rate
-'Mean large-scale precipitation rate' = {
+#Time-mean large-scale precipitation rate
+'Time-mean large-scale precipitation rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 142 ;
 	}
-#Mean convective precipitation rate
-'Mean convective precipitation rate' = {
+#Time-mean convective precipitation rate
+'Time-mean convective precipitation rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 143 ;
 	}
-#Mean total snowfall rate
-'Mean total snowfall rate' = {
+#Time-mean total snowfall rate
+'Time-mean total snowfall rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 144 ;
 	}
-#Mean surface sensible heat flux
-'Mean surface sensible heat flux' = {
+#Time-mean surface sensible heat flux
+'Time-mean surface sensible heat flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 146 ;
 	}
-#Mean surface latent heat flux
-'Mean surface latent heat flux' = {
+#Time-mean surface latent heat flux
+'Time-mean surface latent heat flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 147 ;
 	}
-#Mean surface downward solar radiation flux
-'Mean surface downward solar radiation flux' = {
+#Time-mean surface downward short-wave (solar) radiation flux
+'Time-mean surface downward short-wave (solar) radiation flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 169 ;
 	}
-#Mean surface downward thermal radiation flux
-'Mean surface downward thermal radiation flux' = {
+#Time-mean surface downward long-wave (thermal) radiation flux
+'Time-mean surface downward long-wave (thermal) radiation flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 175 ;
 	}
-#Mean surface net solar radiation flux
-'Mean surface net solar radiation flux' = {
+#Time-mean surface net short-wave (solar) radiation flux
+'Time-mean surface net short-wave (solar) radiation flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 176 ;
 	}
-#Mean surface net thermal radiation flux
-'Mean surface net thermal radiation flux' = {
+#Time-mean surface net long-wave (thermal) radiation flux
+'Time-mean surface net long-wave (thermal) radiation flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 177 ;
 	}
-#Mean top net solar radiation flux
-'Mean top net solar radiation flux' = {
+#Time-mean top net short-wave (solar) radiation flux
+'Time-mean top net short-wave (solar) radiation flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 178 ;
 	}
-#Mean top net thermal radiation flux
-'Mean top net thermal radiation flux' = {
+#Time-mean top net long-wave (thermal) radiation flux
+'Time-mean top net long-wave (thermal) radiation flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 179 ;
 	}
-#East-West surface stress rate of accumulation
-'East-West surface stress rate of accumulation' = {
+#Time-mean eastward turbulent surface stress
+'Time-mean eastward turbulent surface stress' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 180 ;
 	}
-#North-South surface stress rate of accumulation
-'North-South surface stress rate of accumulation' = {
+#Time-mean northward turbulent surface stress
+'Time-mean northward turbulent surface stress' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 181 ;
 	}
-#Evaporation
-'Evaporation' = {
+#Time-mean evaporation rate
+'Time-mean evaporation rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 182 ;
 	}
-#Mean runoff rate
-'Mean runoff rate' = {
+#Time-mean runoff rate
+'Time-mean runoff rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 205 ;
 	}
-#Top net solar radiation, clear sky
-'Top net solar radiation, clear sky' = {
+#Time-mean top net short-wave (solar) radiation flux, clear sky
+'Time-mean top net short-wave (solar) radiation flux, clear sky' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 208 ;
 	}
-#Top net thermal radiation, clear sky
-'Top net thermal radiation, clear sky' = {
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
+'Time-mean top net long-wave (thermal) radiation flux, clear sky' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 209 ;
 	}
-#Surface net solar radiation, clear sky
-'Surface net solar radiation, clear sky' = {
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
+'Time-mean surface net short-wave (solar) radiation flux, clear sky' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 210 ;
 	}
-#Surface net thermal radiation, clear sky
-'Surface net thermal radiation, clear sky' = {
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
+'Time-mean surface net long-wave (thermal) radiation flux, clear sky' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 211 ;
 	}
-#Solar insolation rate of accumulation
-'Solar insolation rate of accumulation' = {
+#Time-mean short-wave (solar) insolation rate
+'Time-mean short-wave (solar) insolation rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 212 ;
 	}
-#Mean total precipitation rate
-'Mean total precipitation rate' = {
+#Time-mean total precipitation rate
+'Time-mean total precipitation rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 228 ;
diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def
index 9411982e5..a93efea82 100644
--- a/definitions/grib2/localConcepts/ecmf/paramId.def
+++ b/definitions/grib2/localConcepts/ecmf/paramId.def
@@ -2497,7 +2497,7 @@
 	 parameterCategory = 171 ;
 	 parameterNumber = 122 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 '172008' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -2506,7 +2506,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 '172009' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -5293,12 +5293,6 @@
 	 parameterCategory = 213 ;
 	 parameterNumber = 221 ;
 	}
-#Cosine of solar zenith angle
-'214001' = {
-	 discipline = 192 ;
-	 parameterCategory = 214 ;
-	 parameterNumber = 1 ;
-	}
 #UV biologically effective dose
 '214002' = {
 	 discipline = 192 ;
@@ -18702,7 +18696,7 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 45 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 '172142' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18711,7 +18705,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 '172143' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18720,7 +18714,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 '172144' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18729,19 +18723,19 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean short-wave heating rate
+#Time-mean short-wave (solar) heating rate
 '172153' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 153 ;
 	}
-#Mean long-wave heating rate
+#Time-mean long-wave (thermal) heating rate
 '172154' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 154 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 '172182' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18750,7 +18744,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 '172205' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -18759,7 +18753,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 '172228' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18768,13 +18762,13 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Convective snowfall
+#Time-mean convective snowfall rate
 '172239' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 239 ;
 	}
-#Large scale snowfall
+#Time-mean large-scale snowfall rate
 '172240' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
diff --git a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def
index 1d86d2098..83ad3cdf6 100644
--- a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def
@@ -629,6 +629,12 @@
 	 parameterCategory = 210 ;
 	 parameterNumber = 197 ;
 	}
+#Cosine of solar zenith angle
+'214001' = {
+	 discipline = 192 ;
+	 parameterCategory = 214 ;
+	 parameterNumber = 1 ;
+	}
 #Ammonia mass mixing ratio
 '217019' = {
 	 discipline = 192 ;
@@ -1448,127 +1454,127 @@
 	 parameterCategory = 162 ;
 	 parameterNumber = 215 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 '172142' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 142 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 '172143' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 143 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 '172144' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 144 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
 '172146' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 146 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
 '172147' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 147 ;
 	}
-#Mean surface downward solar radiation flux
+#Time-mean surface downward short-wave (solar) radiation flux
 '172169' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 169 ;
 	}
-#Mean surface downward thermal radiation flux
+#Time-mean surface downward long-wave (thermal) radiation flux
 '172175' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 175 ;
 	}
-#Mean surface net solar radiation flux
+#Time-mean surface net short-wave (solar) radiation flux
 '172176' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 176 ;
 	}
-#Mean surface net thermal radiation flux
+#Time-mean surface net long-wave (thermal) radiation flux
 '172177' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 177 ;
 	}
-#Mean top net solar radiation flux
+#Time-mean top net short-wave (solar) radiation flux
 '172178' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 178 ;
 	}
-#Mean top net thermal radiation flux
+#Time-mean top net long-wave (thermal) radiation flux
 '172179' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 179 ;
 	}
-#East-West surface stress rate of accumulation
+#Time-mean eastward turbulent surface stress
 '172180' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 180 ;
 	}
-#North-South surface stress rate of accumulation
+#Time-mean northward turbulent surface stress
 '172181' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 181 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 '172182' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 182 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 '172205' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 205 ;
 	}
-#Top net solar radiation, clear sky
+#Time-mean top net short-wave (solar) radiation flux, clear sky
 '172208' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 208 ;
 	}
-#Top net thermal radiation, clear sky
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
 '172209' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 209 ;
 	}
-#Surface net solar radiation, clear sky
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
 '172210' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 210 ;
 	}
-#Surface net thermal radiation, clear sky
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
 '172211' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 211 ;
 	}
-#Solar insolation rate of accumulation
+#Time-mean short-wave (solar) insolation rate
 '172212' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 212 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 '172228' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def
index 9fa4d99ac..acf8f681a 100644
--- a/definitions/grib2/localConcepts/ecmf/shortName.def
+++ b/definitions/grib2/localConcepts/ecmf/shortName.def
@@ -2497,7 +2497,7 @@
 	 parameterCategory = 171 ;
 	 parameterNumber = 122 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'msror' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -2506,7 +2506,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'mssror' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -5293,12 +5293,6 @@
 	 parameterCategory = 213 ;
 	 parameterNumber = 221 ;
 	}
-#Cosine of solar zenith angle
-'uvcossza' = {
-	 discipline = 192 ;
-	 parameterCategory = 214 ;
-	 parameterNumber = 1 ;
-	}
 #UV biologically effective dose
 'uvbed' = {
 	 discipline = 192 ;
@@ -18702,7 +18696,7 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 45 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'mlsprt' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18711,7 +18705,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'cprate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18720,7 +18714,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'mtsfr' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18729,19 +18723,19 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean short-wave heating rate
+#Time-mean short-wave (solar) heating rate
 'mswhr' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 153 ;
 	}
-#Mean long-wave heating rate
+#Time-mean long-wave (thermal) heating rate
 'mlwhr' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 154 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'erate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18750,7 +18744,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'mrort' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -18759,7 +18753,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'tprate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18768,13 +18762,13 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Convective snowfall
+#Time-mean convective snowfall rate
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 239 ;
 	}
-#Large scale snowfall
+#Time-mean large-scale snowfall rate
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
diff --git a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def
index f5ca4014c..ade73cfa8 100644
--- a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def
@@ -629,6 +629,12 @@
 	 parameterCategory = 210 ;
 	 parameterNumber = 197 ;
 	}
+#Cosine of solar zenith angle
+'cossza' = {
+	 discipline = 192 ;
+	 parameterCategory = 214 ;
+	 parameterNumber = 1 ;
+	}
 #Ammonia mass mixing ratio
 'nh3' = {
 	 discipline = 192 ;
@@ -1448,127 +1454,127 @@
 	 parameterCategory = 162 ;
 	 parameterNumber = 215 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'mlsprt' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 142 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'cprate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 143 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'mtsfr' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 144 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
 'msshfl' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 146 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
 'mslhfl' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 147 ;
 	}
-#Mean surface downward solar radiation flux
+#Time-mean surface downward short-wave (solar) radiation flux
 'msdsrf' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 169 ;
 	}
-#Mean surface downward thermal radiation flux
+#Time-mean surface downward long-wave (thermal) radiation flux
 'msdtrf' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 175 ;
 	}
-#Mean surface net solar radiation flux
+#Time-mean surface net short-wave (solar) radiation flux
 'msnsrf' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 176 ;
 	}
-#Mean surface net thermal radiation flux
+#Time-mean surface net long-wave (thermal) radiation flux
 'msntrf' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 177 ;
 	}
-#Mean top net solar radiation flux
+#Time-mean top net short-wave (solar) radiation flux
 'mtnsrf' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 178 ;
 	}
-#Mean top net thermal radiation flux
+#Time-mean top net long-wave (thermal) radiation flux
 'mtntrf' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 179 ;
 	}
-#East-West surface stress rate of accumulation
+#Time-mean eastward turbulent surface stress
 'ewssra' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 180 ;
 	}
-#North-South surface stress rate of accumulation
+#Time-mean northward turbulent surface stress
 'nsssra' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 181 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'erate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 182 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'mrort' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 205 ;
 	}
-#Top net solar radiation, clear sky
+#Time-mean top net short-wave (solar) radiation flux, clear sky
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 208 ;
 	}
-#Top net thermal radiation, clear sky
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 209 ;
 	}
-#Surface net solar radiation, clear sky
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 210 ;
 	}
-#Surface net thermal radiation, clear sky
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 211 ;
 	}
-#Solar insolation rate of accumulation
+#Time-mean short-wave (solar) insolation rate
 'soira' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 212 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'tprate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def
index 2e2b221f3..d77a6a1fd 100644
--- a/definitions/grib2/localConcepts/ecmf/units.def
+++ b/definitions/grib2/localConcepts/ecmf/units.def
@@ -2497,7 +2497,7 @@
 	 parameterCategory = 171 ;
 	 parameterNumber = 122 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -2506,7 +2506,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -5293,12 +5293,6 @@
 	 parameterCategory = 213 ;
 	 parameterNumber = 221 ;
 	}
-#Cosine of solar zenith angle
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 214 ;
-	 parameterNumber = 1 ;
-	}
 #UV biologically effective dose
 '~' = {
 	 discipline = 192 ;
@@ -18702,7 +18696,7 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 45 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18711,7 +18705,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18720,7 +18714,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'm of water equivalent s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18729,19 +18723,19 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean short-wave heating rate
+#Time-mean short-wave (solar) heating rate
 'K s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 153 ;
 	}
-#Mean long-wave heating rate
+#Time-mean long-wave (thermal) heating rate
 'K s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 154 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'm of water equivalent s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18750,7 +18744,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -18759,7 +18753,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18768,13 +18762,13 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Convective snowfall
+#Time-mean convective snowfall rate
 'm of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 239 ;
 	}
-#Large scale snowfall
+#Time-mean large-scale snowfall rate
 'm of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
diff --git a/definitions/grib2/localConcepts/ecmf/units.legacy.def b/definitions/grib2/localConcepts/ecmf/units.legacy.def
index 9bea85e67..703ac9e7f 100644
--- a/definitions/grib2/localConcepts/ecmf/units.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/units.legacy.def
@@ -629,6 +629,12 @@
 	 parameterCategory = 210 ;
 	 parameterNumber = 197 ;
 	}
+#Cosine of solar zenith angle
+'Numeric' = {
+	 discipline = 192 ;
+	 parameterCategory = 214 ;
+	 parameterNumber = 1 ;
+	}
 #Ammonia mass mixing ratio
 'kg kg**-1' = {
 	 discipline = 192 ;
@@ -1448,127 +1454,127 @@
 	 parameterCategory = 162 ;
 	 parameterNumber = 215 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'm s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 142 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'm s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 143 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'm of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 144 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 146 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 147 ;
 	}
-#Mean surface downward solar radiation flux
+#Time-mean surface downward short-wave (solar) radiation flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 169 ;
 	}
-#Mean surface downward thermal radiation flux
+#Time-mean surface downward long-wave (thermal) radiation flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 175 ;
 	}
-#Mean surface net solar radiation flux
+#Time-mean surface net short-wave (solar) radiation flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 176 ;
 	}
-#Mean surface net thermal radiation flux
+#Time-mean surface net long-wave (thermal) radiation flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 177 ;
 	}
-#Mean top net solar radiation flux
+#Time-mean top net short-wave (solar) radiation flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 178 ;
 	}
-#Mean top net thermal radiation flux
+#Time-mean top net long-wave (thermal) radiation flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 179 ;
 	}
-#East-West surface stress rate of accumulation
+#Time-mean eastward turbulent surface stress
 'N m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 180 ;
 	}
-#North-South surface stress rate of accumulation
+#Time-mean northward turbulent surface stress
 'N m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 181 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'm of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 182 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'm s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 205 ;
 	}
-#Top net solar radiation, clear sky
+#Time-mean top net short-wave (solar) radiation flux, clear sky
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 208 ;
 	}
-#Top net thermal radiation, clear sky
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 209 ;
 	}
-#Surface net solar radiation, clear sky
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 210 ;
 	}
-#Surface net thermal radiation, clear sky
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 211 ;
 	}
-#Solar insolation rate of accumulation
+#Time-mean short-wave (solar) insolation rate
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 212 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'm s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
diff --git a/definitions/grib2/localConcepts/edzw/modelName.def b/definitions/grib2/localConcepts/edzw/modelName.def
new file mode 100644
index 000000000..5af6fb6e6
--- /dev/null
+++ b/definitions/grib2/localConcepts/edzw/modelName.def
@@ -0,0 +1,107 @@
+# modelName: Contribution from Daniel Lee @ DWD
+
+# definitions for Offenbach
+'cosmo_eu' = {
+    generatingProcessIdentifier=131;
+}
+'cosmo_eu' = {
+    generatingProcessIdentifier=132;
+}
+'cosmo_eu' = {
+    generatingProcessIdentifier=134;
+}
+'cosmo_eu' = {
+    generatingProcessIdentifier=135;
+}
+'cosmo_de' = {
+    generatingProcessIdentifier=137;
+}
+'cosmo_de' = {
+    generatingProcessIdentifier=138;
+}
+'cosmo_de-eps' = {
+    generatingProcessIdentifier=137;
+    typeOfEnsembleForecast=192;
+}
+'cosmo_de-eps' = {
+    generatingProcessIdentifier=138;
+    typeOfEnsembleForecast=192;
+}
+
+#DWD model names for ICON
+'icogl' = {
+    gridDefinitionTemplateNumber=101;
+    generatingProcessIdentifier=1;
+}
+'icogl130' = {
+    numberOfGridUsed=26;
+    generatingProcessIdentifier=1;
+}
+'icogl130l90' = {
+    numberOfGridUsed=26;
+    nlev=91;
+    generatingProcessIdentifier=1;
+}
+'icogl130p' = {
+    numberOfGridUsed=26;
+    typeOfFirstFixedSurface=100;
+    generatingProcessIdentifier=1;
+}
+'icoeu'= {
+    gridDefinitionTemplateNumber=101;
+    generatingProcessIdentifier=2;
+}
+'icoeu065' = {
+    numberOfGridUsed=27;
+    generatingProcessIdentifier=2;
+}
+'icoeu065l60' = {
+    numberOfGridUsed=27;
+    nlev=61;
+    generatingProcessIdentifier=2;
+}
+'icreu' = {
+    gridDefinitionTemplateNumber=0;
+    generatingProcessIdentifier=2;
+}
+'icreu_0.625' = {
+    gridDefinitionTemplateNumber=0;
+    Dx=62500;
+    Dy=62500;
+    generatingProcessIdentifier=2;
+}
+'icreu_0.625l60' = {
+    gridDefinitionTemplateNumber=0;
+    Dx=62500;
+    Dy=62500;
+    nlev=61;
+    generatingProcessIdentifier=2;
+}
+'icreu_0.625p' = {
+    gridDefinitionTemplateNumber=0;
+    Dx=62500;
+    Dy=62500;
+    typeOfFirstFixedSurface=100;
+    generatingProcessIdentifier=2;
+}
+'icreu_0.625z' = {
+    gridDefinitionTemplateNumber=0;
+    Dx=62500;
+    Dy=62500;
+    typeOfFirstFixedSurface=102;
+    generatingProcessIdentifier=2;
+}
+'icrde' = {
+    gridDefinitionTemplateNumber=0;
+    generatingProcessIdentifier=3;
+}
+'icrgl' = {
+    gridDefinitionTemplateNumber=0;
+    generatingProcessIdentifier=1;
+}
+'icrgl_0.25' = {
+    gridDefinitionTemplateNumber=0;
+    Dx=250000;
+    Dy=250000;
+    generatingProcessIdentifier=1;
+}
diff --git a/definitions/grib2/localConcepts/edzw/name.def b/definitions/grib2/localConcepts/edzw/name.def
index 08b716bcb..6732f856b 100644
--- a/definitions/grib2/localConcepts/edzw/name.def
+++ b/definitions/grib2/localConcepts/edzw/name.def
@@ -1,4 +1,4 @@
-# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE, do not edit! 2023-08-17 13:41
+# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@OFC1MIR.DWD.DE, do not edit! 2024-09-17 11:09
 #paramId: 500000
 #Pressure (S) (not reduced)
 'Pressure (S) (not reduced)' = {
@@ -8964,6 +8964,186 @@
 	 parameterNumber = 21 ;
 	}
 
+#paramId: 503722
+#Diagnostic total column of mass concentration of mineral dust aerosol
+'Diagnostic total column of mass concentration of mineral dust aerosol' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 10 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503723
+#Diagnostic vertical maximum total mass concentration of mineral dust aerosol in a layer
+'Diagnostic vertical maximum total mass concentration of mineral dust aerosol in a layer' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 61 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503724
+#Diagnostic temporal maximum activity concentration of Caesium 137 in a time range
+'Diagnostic temporal maximum activity concentration of Caesium 137 in a time range' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 10 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30172 ;
+	}
+
+#paramId: 503725
+#Diagnostic temporal maximum activity concentration of Iodine 131 in a time range
+'Diagnostic temporal maximum activity concentration of Iodine 131 in a time range' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 10 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30137 ;
+	}
+
+#paramId: 503726
+#Diagnostic temporal maximum activity concentration of Caesium 137 in a time range and vertical maximum in a layer
+'Diagnostic temporal maximum activity concentration of Caesium 137 in a time range and vertical maximum in a layer' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 15 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30172 ;
+	}
+
+#paramId: 503727
+#Diagnostic temporal maximum activity concentration of Iodine 131 in a time range and vertical maximum in a layer
+'Diagnostic temporal maximum activity concentration of Iodine 131 in a time range and vertical maximum in a layer' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 15 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30137 ;
+	}
+
+#paramId: 503728
+#Total accumulated dry deposition (surface) of dust (sum of all modes)
+'Total accumulated dry deposition (surface) of dust (sum of all modes)' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 6 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503729
+#Total accumulated dust emission (sum of all modes)
+'Total accumulated dust emission (sum of all modes)' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503730
+#Total accumulated sedimentation of dust (sum of all modes)
+'Total accumulated sedimentation of dust (sum of all modes)' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 11 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503731
+#Total accumulated wet deposition of dust (sum of all modes)
+'Total accumulated wet deposition of dust (sum of all modes)' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 7 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503737
+#Maximum total precipitation rate
+'Maximum total precipitation rate' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 52 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+
+#paramId: 503738
+#Top of persistent contrails
+'Top of persistent contrails' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 48 ;
+	}
+
+#paramId: 503739
+#Base of persistent contrails
+'Base of persistent contrails' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 49 ;
+	}
+
+#paramId: 503743
+#U-component of 10m wind - time average
+'U-component of 10m wind - time average' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	}
+
+#paramId: 503744
+#V-component of 10m wind - time average
+'V-component of 10m wind - time average' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	}
+
+#paramId: 503759
+#Zonal component of sea water velocity (west-east direction counted positive)
+'Zonal component of sea water velocity (west-east direction counted positive)' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 23 ;
+	}
+
+#paramId: 503760
+#Meridional component of sea water velocity (south-north direction counted positive)
+'Meridional component of sea water velocity (south-north direction counted positive)' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 24 ;
+	}
+
+#paramId: 503763
+#Mixed layer depth in ocean
+'Mixed layer depth in ocean' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 52 ;
+	}
+
+#paramId: 503764
+#Normal component of sea water velocity (normal in relation to local grid cell edge)
+'Normal component of sea water velocity (normal in relation to local grid cell edge)' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 53 ;
+	}
+
 #paramId: 500092
 #Solar radiation heating rate
 'Solar radiation heating rate' = {
@@ -15268,3 +15448,240 @@
 	 parameterNumber = 243 ;
 	}
 
+#paramId: 503732
+#NowCastMIX-AutoWARN (Warnpolygone: Gewitter, Starkregen, Schnee, gefrierender Regen)
+'NowCastMIX-AutoWARN (Warnpolygone: Gewitter, Starkregen, Schnee, gefrierender Regen)' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 220 ;
+	}
+
+#paramId: 503733
+#NowCastMIX-AutoWARN (Schneepolygon-Attribute)
+'NowCastMIX-AutoWARN (Schneepolygon-Attribute)' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 221 ;
+	}
+
+#paramId: 503734
+#NowCastMIX-Aviation (Konvektiver Status, Radolan-Gebiet)
+'NowCastMIX-Aviation (Konvektiver Status, Radolan-Gebiet)' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 222 ;
+	}
+
+#paramId: 503735
+#NowCastMIX-Aviation (Konvektiver Status, EuCOM-Gebiet)
+'NowCastMIX-Aviation (Konvektiver Status, EuCOM-Gebiet)' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 223 ;
+	}
+
+#paramId: 503736
+#NowCastMIX-Winterwetter (Schnee, gefrierender Regen, Radolan-Gebiet)
+'NowCastMIX-Winterwetter (Schnee, gefrierender Regen, Radolan-Gebiet)' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 224 ;
+	}
+
+#paramId: 503740
+#NowCastMIX-AutoWARN (Gewitter-Warnkeulen mit variablen L??ngen)
+'NowCastMIX-AutoWARN (Gewitter-Warnkeulen mit variablen L??ngen)' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 225 ;
+	}
+
+#paramId: 503741
+#NowCastMIX-Aviation (Starkregen, Radolan-Gebiet)
+'NowCastMIX-Aviation (Starkregen, Radolan-Gebiet)' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 226 ;
+	}
+
+#paramId: 503742
+#NowCastMIX-AutoWARN (Schneefallgrenze)
+'NowCastMIX-AutoWARN (Schneefallgrenze)' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 227 ;
+	}
+
+#paramId: 503745
+#Net short wave radiation flux at surface on horizontal plane including orographic shading
+'Net short wave radiation flux at surface on horizontal plane including orographic shading' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503746
+#Net short wave radiation flux at surface on tangent plane to terrain including orographic shading
+'Net short wave radiation flux at surface on tangent plane to terrain including orographic shading' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503747
+#Upward diffusive short wave radiation flux at surface on horizontal plane including orographic shading
+'Upward diffusive short wave radiation flux at surface on horizontal plane including orographic shading' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503748
+#Upward diffusive short wave radiation flux at surface on tangent plane to terrain including orographic shading
+'Upward diffusive short wave radiation flux at surface on tangent plane to terrain including orographic shading' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503749
+#Photosynthetically active radiation at surface on tangent plane to terrain including orographic shading
+'Photosynthetically active radiation at surface on tangent plane to terrain including orographic shading' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 10 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503750
+#Net short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'Net short wave radiation flux at surface on horizontal plane including orographic shading - time average' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503751
+#Net short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'Net short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503752
+#Downward direct short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'Downward direct short wave radiation flux at surface on horizontal plane including orographic shading - time average' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 198 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503753
+#Downward direct short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'Downward direct short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 198 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503754
+#Downward short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'Downward short wave radiation flux at surface on horizontal plane including orographic shading - time average' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 7 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503755
+#Downward short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'Downward short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 7 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503756
+#Upward diffusive short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'Upward diffusive short wave radiation flux at surface on horizontal plane including orographic shading - time average' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503757
+#Upward diffusive short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'Upward diffusive short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503758
+#Photosynthetically active radiation at surface on tangent plane to terrain including orographic shading - time average
+'Photosynthetically active radiation at surface on tangent plane to terrain including orographic shading - time average' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 10 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503761
+#Snow depth over sea ice (total depth)
+'Snow depth over sea ice (total depth)' = {
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	}
+
+#paramId: 503762
+#Stretching factor of rescaled height coordinate zstar - ocean modelling
+'Stretching factor of rescaled height coordinate zstar - ocean modelling' = {
+	 discipline = 10 ;
+	 parameterCategory = 192 ;
+	 parameterNumber = 20 ;
+	}
+
+#paramId: 503765
+#Temperature in lowest model layer - time-filtered assimilation increment, daytime weighting
+'Temperature in lowest model layer - time-filtered assimilation increment, daytime weighting' = {
+	 discipline = 0 ;
+	 parameterCategory = 210 ;
+	 parameterNumber = 0 ;
+	 typeOfSecondFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 typeOfGeneratingProcess = 207 ;
+	}
+
+#paramId: 503766
+#Relative Humidity in lowest model layer - time-filtered assimilation increment, daytime weighting
+'Relative Humidity in lowest model layer - time-filtered assimilation increment, daytime weighting' = {
+	 discipline = 0 ;
+	 parameterCategory = 210 ;
+	 parameterNumber = 1 ;
+	 typeOfSecondFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 typeOfGeneratingProcess = 207 ;
+	}
+
diff --git a/definitions/grib2/localConcepts/edzw/paramId.def b/definitions/grib2/localConcepts/edzw/paramId.def
index 09e15e295..2f444ada3 100644
--- a/definitions/grib2/localConcepts/edzw/paramId.def
+++ b/definitions/grib2/localConcepts/edzw/paramId.def
@@ -1,4 +1,4 @@
-# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE, do not edit! 2023-08-17 13:41
+# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@OFC1MIR.DWD.DE, do not edit! 2024-09-17 11:09
 #paramId: 500000
 #Pressure (S) (not reduced)
 '500000' = {
@@ -15807,3 +15807,420 @@
 	 parameterNumber = 243 ;
 	}
 
+#paramId: 503722
+#Diagnostic total column of mass concentration of mineral dust aerosol
+'503722' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 10 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503723
+#Diagnostic vertical maximum total mass concentration of mineral dust aerosol in a layer
+'503723' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 61 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503724
+#Diagnostic temporal maximum activity concentration of Caesium 137 in a time range
+'503724' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 10 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30172 ;
+	}
+
+#paramId: 503725
+#Diagnostic temporal maximum activity concentration of Iodine 131 in a time range
+'503725' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 10 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30137 ;
+	}
+
+#paramId: 503726
+#Diagnostic temporal maximum activity concentration of Caesium 137 in a time range and vertical maximum in a layer
+'503726' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 15 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30172 ;
+	}
+
+#paramId: 503727
+#Diagnostic temporal maximum activity concentration of Iodine 131 in a time range and vertical maximum in a layer
+'503727' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 15 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30137 ;
+	}
+
+#paramId: 503728
+#Total accumulated dry deposition (surface) of dust (sum of all modes)
+'503728' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 6 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503729
+#Total accumulated dust emission (sum of all modes)
+'503729' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503730
+#Total accumulated sedimentation of dust (sum of all modes)
+'503730' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 11 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503731
+#Total accumulated wet deposition of dust (sum of all modes)
+'503731' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 7 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503732
+#NowCastMIX-AutoWARN (Warnpolygone: Gewitter, Starkregen, Schnee, gefrierender Regen)
+'503732' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 220 ;
+	}
+
+#paramId: 503733
+#NowCastMIX-AutoWARN (Schneepolygon-Attribute)
+'503733' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 221 ;
+	}
+
+#paramId: 503734
+#NowCastMIX-Aviation (Konvektiver Status, Radolan-Gebiet)
+'503734' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 222 ;
+	}
+
+#paramId: 503735
+#NowCastMIX-Aviation (Konvektiver Status, EuCOM-Gebiet)
+'503735' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 223 ;
+	}
+
+#paramId: 503736
+#NowCastMIX-Winterwetter (Schnee, gefrierender Regen, Radolan-Gebiet)
+'503736' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 224 ;
+	}
+
+#paramId: 503737
+#Maximum total precipitation rate
+'503737' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 52 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+
+#paramId: 503738
+#Top of persistent contrails
+'503738' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 48 ;
+	}
+
+#paramId: 503739
+#Base of persistent contrails
+'503739' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 49 ;
+	}
+
+#paramId: 503740
+#NowCastMIX-AutoWARN (Gewitter-Warnkeulen mit variablen L??ngen)
+'503740' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 225 ;
+	}
+
+#paramId: 503741
+#NowCastMIX-Aviation (Starkregen, Radolan-Gebiet)
+'503741' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 226 ;
+	}
+
+#paramId: 503742
+#NowCastMIX-AutoWARN (Schneefallgrenze)
+'503742' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 227 ;
+	}
+
+#paramId: 503743
+#U-component of 10m wind - time average
+'503743' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	}
+
+#paramId: 503744
+#V-component of 10m wind - time average
+'503744' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	}
+
+#paramId: 503745
+#Net short wave radiation flux at surface on horizontal plane including orographic shading
+'503745' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503746
+#Net short wave radiation flux at surface on tangent plane to terrain including orographic shading
+'503746' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503747
+#Upward diffusive short wave radiation flux at surface on horizontal plane including orographic shading
+'503747' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503748
+#Upward diffusive short wave radiation flux at surface on tangent plane to terrain including orographic shading
+'503748' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503749
+#Photosynthetically active radiation at surface on tangent plane to terrain including orographic shading
+'503749' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 10 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503750
+#Net short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'503750' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503751
+#Net short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'503751' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503752
+#Downward direct short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'503752' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 198 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503753
+#Downward direct short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'503753' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 198 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503754
+#Downward short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'503754' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 7 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503755
+#Downward short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'503755' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 7 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503756
+#Upward diffusive short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'503756' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503757
+#Upward diffusive short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'503757' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503758
+#Photosynthetically active radiation at surface on tangent plane to terrain including orographic shading - time average
+'503758' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 10 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503759
+#Zonal component of sea water velocity (west-east direction counted positive)
+'503759' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 23 ;
+	}
+
+#paramId: 503760
+#Meridional component of sea water velocity (south-north direction counted positive)
+'503760' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 24 ;
+	}
+
+#paramId: 503761
+#Snow depth over sea ice (total depth)
+'503761' = {
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	}
+
+#paramId: 503762
+#Stretching factor of rescaled height coordinate zstar - ocean modelling
+'503762' = {
+	 discipline = 10 ;
+	 parameterCategory = 192 ;
+	 parameterNumber = 20 ;
+	}
+
+#paramId: 503763
+#Mixed layer depth in ocean
+'503763' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 52 ;
+	}
+
+#paramId: 503764
+#Normal component of sea water velocity (normal in relation to local grid cell edge)
+'503764' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 53 ;
+	}
+
+#paramId: 503765
+#Temperature in lowest model layer - time-filtered assimilation increment, daytime weighting
+'503765' = {
+	 discipline = 0 ;
+	 parameterCategory = 210 ;
+	 parameterNumber = 0 ;
+	 typeOfSecondFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 typeOfGeneratingProcess = 207 ;
+	}
+
+#paramId: 503766
+#Relative Humidity in lowest model layer - time-filtered assimilation increment, daytime weighting
+'503766' = {
+	 discipline = 0 ;
+	 parameterCategory = 210 ;
+	 parameterNumber = 1 ;
+	 typeOfSecondFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 typeOfGeneratingProcess = 207 ;
+	}
+
diff --git a/definitions/grib2/localConcepts/edzw/shortName.def b/definitions/grib2/localConcepts/edzw/shortName.def
index 37150d10c..02fbe19a0 100644
--- a/definitions/grib2/localConcepts/edzw/shortName.def
+++ b/definitions/grib2/localConcepts/edzw/shortName.def
@@ -1,4 +1,4 @@
-# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE, do not edit! 2023-08-17 13:41
+# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@OFC1MIR.DWD.DE, do not edit! 2024-09-17 11:09
 #paramId: 500000
 #Pressure (S) (not reduced)
 'PS' = {
@@ -8964,6 +8964,186 @@
 	 parameterNumber = 21 ;
 	}
 
+#paramId: 503722
+#Diagnostic total column of mass concentration of mineral dust aerosol
+'DUST_TOTAL_MC_VI' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 10 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503723
+#Diagnostic vertical maximum total mass concentration of mineral dust aerosol in a layer
+'DUST_MAX_TOTAL_MC_LAYER' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 61 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503724
+#Diagnostic temporal maximum activity concentration of Caesium 137 in a time range
+'MAXCs-137' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 10 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30172 ;
+	}
+
+#paramId: 503725
+#Diagnostic temporal maximum activity concentration of Iodine 131 in a time range
+'MAXI-131' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 10 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30137 ;
+	}
+
+#paramId: 503726
+#Diagnostic temporal maximum activity concentration of Caesium 137 in a time range and vertical maximum in a layer
+'MAXCs-137_LMAX' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 15 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30172 ;
+	}
+
+#paramId: 503727
+#Diagnostic temporal maximum activity concentration of Iodine 131 in a time range and vertical maximum in a layer
+'MAXI-131_LMAX' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 15 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30137 ;
+	}
+
+#paramId: 503728
+#Total accumulated dry deposition (surface) of dust (sum of all modes)
+'TOT_ACCDRYDEPO_DUST' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 6 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503729
+#Total accumulated dust emission (sum of all modes)
+'TOT_ACCEMISS_DUST' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503730
+#Total accumulated sedimentation of dust (sum of all modes)
+'TOT_ACCSEDIM_DUST' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 11 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503731
+#Total accumulated wet deposition of dust (sum of all modes)
+'TOT_ACCWETDEPO_DUST' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 7 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503737
+#Maximum total precipitation rate
+'TOT_PR_MAX' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 52 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+
+#paramId: 503738
+#Top of persistent contrails
+'PERSCONTT' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 48 ;
+	}
+
+#paramId: 503739
+#Base of persistent contrails
+'PERSCONTB' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 49 ;
+	}
+
+#paramId: 503743
+#U-component of 10m wind - time average
+'U_10M_AV' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	}
+
+#paramId: 503744
+#V-component of 10m wind - time average
+'V_10M_AV' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	}
+
+#paramId: 503759
+#Zonal component of sea water velocity (west-east direction counted positive)
+'USEA' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 23 ;
+	}
+
+#paramId: 503760
+#Meridional component of sea water velocity (south-north direction counted positive)
+'VSEA' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 24 ;
+	}
+
+#paramId: 503763
+#Mixed layer depth in ocean
+'MLD_SEA' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 52 ;
+	}
+
+#paramId: 503764
+#Normal component of sea water velocity (normal in relation to local grid cell edge)
+'VNSEA' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 53 ;
+	}
+
 #paramId: 500092
 #Solar radiation heating rate
 'SOHR_RAD' = {
@@ -15268,3 +15448,240 @@
 	 parameterNumber = 243 ;
 	}
 
+#paramId: 503732
+#NowCastMIX-AutoWARN (Warnpolygone: Gewitter, Starkregen, Schnee, gefrierender Regen)
+'NCM_AW_WP' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 220 ;
+	}
+
+#paramId: 503733
+#NowCastMIX-AutoWARN (Schneepolygon-Attribute)
+'NCM_AW_SPA' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 221 ;
+	}
+
+#paramId: 503734
+#NowCastMIX-Aviation (Konvektiver Status, Radolan-Gebiet)
+'NCM_A_RADOLAN' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 222 ;
+	}
+
+#paramId: 503735
+#NowCastMIX-Aviation (Konvektiver Status, EuCOM-Gebiet)
+'NCM_A_EUCOM' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 223 ;
+	}
+
+#paramId: 503736
+#NowCastMIX-Winterwetter (Schnee, gefrierender Regen, Radolan-Gebiet)
+'NCM_A_WINTER_W' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 224 ;
+	}
+
+#paramId: 503740
+#NowCastMIX-AutoWARN (Gewitter-Warnkeulen mit variablen L??ngen)
+'NCM_AW_WKVL' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 225 ;
+	}
+
+#paramId: 503741
+#NowCastMIX-Aviation (Starkregen, Radolan-Gebiet)
+'NCM_A_STARKREGEN' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 226 ;
+	}
+
+#paramId: 503742
+#NowCastMIX-AutoWARN (Schneefallgrenze)
+'NCM_AW_SFG' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 227 ;
+	}
+
+#paramId: 503745
+#Net short wave radiation flux at surface on horizontal plane including orographic shading
+'SOBS_RAD_OS' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503746
+#Net short wave radiation flux at surface on tangent plane to terrain including orographic shading
+'SOBS_RAD_TAN_OS' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503747
+#Upward diffusive short wave radiation flux at surface on horizontal plane including orographic shading
+'SWDIFUS_RAD_OS' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503748
+#Upward diffusive short wave radiation flux at surface on tangent plane to terrain including orographic shading
+'SWDIFUS_RAD_TAN_OS' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503749
+#Photosynthetically active radiation at surface on tangent plane to terrain including orographic shading
+'PABS_RAD_TAN_OS' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 10 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503750
+#Net short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'ASOB_S_OS' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503751
+#Net short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'ASOB_S_TAN_OS' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503752
+#Downward direct short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'ASWDIR_S_OS' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 198 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503753
+#Downward direct short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'ASWDIR_S_TAN_OS' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 198 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503754
+#Downward short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'ASOD_S_OS' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 7 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503755
+#Downward short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'ASOD_S_TAN_OS' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 7 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503756
+#Upward diffusive short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'ASWDIFU_S_OS' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503757
+#Upward diffusive short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'ASWDIFU_S_TAN_OS' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503758
+#Photosynthetically active radiation at surface on tangent plane to terrain including orographic shading - time average
+'APAB_S_TAN_OS' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 10 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503761
+#Snow depth over sea ice (total depth)
+'H_SNOW_SEAICE' = {
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	}
+
+#paramId: 503762
+#Stretching factor of rescaled height coordinate zstar - ocean modelling
+'HSTRF_SEA' = {
+	 discipline = 10 ;
+	 parameterCategory = 192 ;
+	 parameterNumber = 20 ;
+	}
+
+#paramId: 503765
+#Temperature in lowest model layer - time-filtered assimilation increment, daytime weighting
+'T_LML_DTWGT_FILTINC' = {
+	 discipline = 0 ;
+	 parameterCategory = 210 ;
+	 parameterNumber = 0 ;
+	 typeOfSecondFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 typeOfGeneratingProcess = 207 ;
+	}
+
+#paramId: 503766
+#Relative Humidity in lowest model layer - time-filtered assimilation increment, daytime weighting
+'RELHUM_LML_DTWGT_FILTINC' = {
+	 discipline = 0 ;
+	 parameterCategory = 210 ;
+	 parameterNumber = 1 ;
+	 typeOfSecondFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 typeOfGeneratingProcess = 207 ;
+	}
+
diff --git a/definitions/grib2/localConcepts/edzw/units.def b/definitions/grib2/localConcepts/edzw/units.def
index 7f652d7df..8e4d05a47 100644
--- a/definitions/grib2/localConcepts/edzw/units.def
+++ b/definitions/grib2/localConcepts/edzw/units.def
@@ -1,4 +1,4 @@
-# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE, do not edit! 2023-08-17 13:41
+# Automatically generated by get_definitionsALL.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@OFC1MIR.DWD.DE, do not edit! 2024-09-17 11:09
 #paramId: 500000
 #Pressure (S) (not reduced)
 'Pa' = {
@@ -8964,6 +8964,186 @@
 	 parameterNumber = 21 ;
 	}
 
+#paramId: 503722
+#Diagnostic total column of mass concentration of mineral dust aerosol
+'kg m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 10 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503723
+#Diagnostic vertical maximum total mass concentration of mineral dust aerosol in a layer
+'kg m-3' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 61 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503724
+#Diagnostic temporal maximum activity concentration of Caesium 137 in a time range
+'Bq m-3' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 10 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30172 ;
+	}
+
+#paramId: 503725
+#Diagnostic temporal maximum activity concentration of Iodine 131 in a time range
+'Bq m-3' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 10 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30137 ;
+	}
+
+#paramId: 503726
+#Diagnostic temporal maximum activity concentration of Caesium 137 in a time range and vertical maximum in a layer
+'Bq m-3' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 15 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30172 ;
+	}
+
+#paramId: 503727
+#Diagnostic temporal maximum activity concentration of Iodine 131 in a time range and vertical maximum in a layer
+'Bq m-3' = {
+	 discipline = 0 ;
+	 parameterCategory = 18 ;
+	 parameterNumber = 15 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 constituentType = 30137 ;
+	}
+
+#paramId: 503728
+#Total accumulated dry deposition (surface) of dust (sum of all modes)
+'kg m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 6 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503729
+#Total accumulated dust emission (sum of all modes)
+'kg m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503730
+#Total accumulated sedimentation of dust (sum of all modes)
+'kg m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 11 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503731
+#Total accumulated wet deposition of dust (sum of all modes)
+'kg m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 7 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 constituentType = 62001 ;
+	}
+
+#paramId: 503737
+#Maximum total precipitation rate
+'kg m-2 s-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 52 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+
+#paramId: 503738
+#Top of persistent contrails
+'m' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 48 ;
+	}
+
+#paramId: 503739
+#Base of persistent contrails
+'m' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 49 ;
+	}
+
+#paramId: 503743
+#U-component of 10m wind - time average
+'m s-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	}
+
+#paramId: 503744
+#V-component of 10m wind - time average
+'m s-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	}
+
+#paramId: 503759
+#Zonal component of sea water velocity (west-east direction counted positive)
+'m s-1' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 23 ;
+	}
+
+#paramId: 503760
+#Meridional component of sea water velocity (south-north direction counted positive)
+'m s-1' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 24 ;
+	}
+
+#paramId: 503763
+#Mixed layer depth in ocean
+'m' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 52 ;
+	}
+
+#paramId: 503764
+#Normal component of sea water velocity (normal in relation to local grid cell edge)
+'m s-1' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 53 ;
+	}
+
 #paramId: 500092
 #Solar radiation heating rate
 'K s-1' = {
@@ -15268,3 +15448,240 @@
 	 parameterNumber = 243 ;
 	}
 
+#paramId: 503732
+#NowCastMIX-AutoWARN (Warnpolygone: Gewitter, Starkregen, Schnee, gefrierender Regen)
+'numeric' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 220 ;
+	}
+
+#paramId: 503733
+#NowCastMIX-AutoWARN (Schneepolygon-Attribute)
+'numeric' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 221 ;
+	}
+
+#paramId: 503734
+#NowCastMIX-Aviation (Konvektiver Status, Radolan-Gebiet)
+'numeric' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 222 ;
+	}
+
+#paramId: 503735
+#NowCastMIX-Aviation (Konvektiver Status, EuCOM-Gebiet)
+'numeric' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 223 ;
+	}
+
+#paramId: 503736
+#NowCastMIX-Winterwetter (Schnee, gefrierender Regen, Radolan-Gebiet)
+'numeric' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 224 ;
+	}
+
+#paramId: 503740
+#NowCastMIX-AutoWARN (Gewitter-Warnkeulen mit variablen L??ngen)
+'numeric' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 225 ;
+	}
+
+#paramId: 503741
+#NowCastMIX-Aviation (Starkregen, Radolan-Gebiet)
+'numeric' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 226 ;
+	}
+
+#paramId: 503742
+#NowCastMIX-AutoWARN (Schneefallgrenze)
+'m' = {
+	 discipline = 0 ;
+	 parameterCategory = 15 ;
+	 parameterNumber = 227 ;
+	}
+
+#paramId: 503745
+#Net short wave radiation flux at surface on horizontal plane including orographic shading
+'W m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503746
+#Net short wave radiation flux at surface on tangent plane to terrain including orographic shading
+'W m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503747
+#Upward diffusive short wave radiation flux at surface on horizontal plane including orographic shading
+'W m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503748
+#Upward diffusive short wave radiation flux at surface on tangent plane to terrain including orographic shading
+'W m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503749
+#Photosynthetically active radiation at surface on tangent plane to terrain including orographic shading
+'W m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 10 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503750
+#Net short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'W m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503751
+#Net short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'W m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503752
+#Downward direct short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'W m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 198 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503753
+#Downward direct short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'W m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 198 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503754
+#Downward short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'W m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 7 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503755
+#Downward short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'W m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 7 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503756
+#Upward diffusive short wave radiation flux at surface on horizontal plane including orographic shading - time average
+'W m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 208 ;
+	}
+
+#paramId: 503757
+#Upward diffusive short wave radiation flux at surface on tangent plane to terrain including orographic shading - time average
+'W m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503758
+#Photosynthetically active radiation at surface on tangent plane to terrain including orographic shading - time average
+'W m-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 10 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 typeOfFirstFixedSurface = 209 ;
+	}
+
+#paramId: 503761
+#Snow depth over sea ice (total depth)
+'m' = {
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	}
+
+#paramId: 503762
+#Stretching factor of rescaled height coordinate zstar - ocean modelling
+'Numeric' = {
+	 discipline = 10 ;
+	 parameterCategory = 192 ;
+	 parameterNumber = 20 ;
+	}
+
+#paramId: 503765
+#Temperature in lowest model layer - time-filtered assimilation increment, daytime weighting
+'K' = {
+	 discipline = 0 ;
+	 parameterCategory = 210 ;
+	 parameterNumber = 0 ;
+	 typeOfSecondFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 typeOfGeneratingProcess = 207 ;
+	}
+
+#paramId: 503766
+#Relative Humidity in lowest model layer - time-filtered assimilation increment, daytime weighting
+'Proportion' = {
+	 discipline = 0 ;
+	 parameterCategory = 210 ;
+	 parameterNumber = 1 ;
+	 typeOfSecondFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 typeOfGeneratingProcess = 207 ;
+	}
+
diff --git a/definitions/grib2/localConcepts/era/cfName.def b/definitions/grib2/localConcepts/era/cfName.def
index 8292efdd2..1ab53a5ca 100644
--- a/definitions/grib2/localConcepts/era/cfName.def
+++ b/definitions/grib2/localConcepts/era/cfName.def
@@ -34,6 +34,40 @@
 	 parameterNumber = 12 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow depth
+'lwe_thickness_of_surface_snow_amount' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	}
+#Large-scale precipitation
+'lwe_thickness_of_stratiform_precipitation_amount' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 196 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Convective precipitation
+'lwe_thickness_of_convective_precipitation_amount' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 195 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snowfall
+'lwe_thickness_of_snowfall_amount' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Divergence
 'divergence_of_wind' = {
 	 discipline = 0 ;
@@ -41,6 +75,32 @@
 	 parameterNumber = 13 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Total cloud cover
+'cloud_area_fraction' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Albedo (climatological)
+'surface_albedo' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 193 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Evaporation
+'lwe_thickness_of_water_evaporation_amount' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Ozone mass mixing ratio
 'mass_fraction_of_ozone_in_air' = {
 	 discipline = 0 ;
@@ -48,6 +108,15 @@
 	 parameterNumber = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Total column ozone
+'atmosphere_mass_content_of_ozone' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 14 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
 #Snow depth
 'lwe_thickness_of_surface_snow_amount' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/era/name.def b/definitions/grib2/localConcepts/era/name.def
index 1ed54baae..7d728cd58 100644
--- a/definitions/grib2/localConcepts/era/name.def
+++ b/definitions/grib2/localConcepts/era/name.def
@@ -1,4 +1,79 @@
 # Automatically generated by ./create_def.pl, do not edit
+#Surface runoff
+'Surface runoff' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Sub-surface runoff
+'Sub-surface runoff' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 204 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#UV visible albedo for direct radiation (climatological)
+'UV visible albedo for direct radiation (climatological)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 193 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#UV visible albedo for diffuse radiation (climatological)
+'UV visible albedo for diffuse radiation (climatological)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 192 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation (climatological)
+'Near IR albedo for direct radiation (climatological)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 193 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for diffuse radiation (climatological)
+'Near IR albedo for diffuse radiation (climatological)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 192 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Snow albedo
+'Snow albedo' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 192 ;
+	}
+#Snow evaporation
+'Snow evaporation' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 197 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snowmelt
+'Snowmelt' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 203 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Specific rain water content
 'Specific rain water content' = {
 	 discipline = 0 ;
@@ -55,6 +130,40 @@
 	 parameterNumber = 12 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow depth
+'Snow depth' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	}
+#Large-scale precipitation
+'Large-scale precipitation' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 196 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Convective precipitation
+'Convective precipitation' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 195 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snowfall
+'Snowfall' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Logarithm of surface pressure
 'Logarithm of surface pressure' = {
 	 discipline = 0 ;
@@ -77,6 +186,60 @@
 	 parameterNumber = 13 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Total cloud cover
+'Total cloud cover' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Albedo (climatological)
+'Albedo (climatological)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 193 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Evaporation
+'Evaporation' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Low cloud cover
+'Low cloud cover' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
+	}
+#Medium cloud cover
+'Medium cloud cover' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
+	}
+#High cloud cover
+'High cloud cover' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
+	}
+#Skin reservoir content
+'Skin reservoir content' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 205 ;
+	}
 #Ozone mass mixing ratio
 'Ozone mass mixing ratio' = {
 	 discipline = 0 ;
@@ -84,6 +247,58 @@
 	 parameterNumber = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Runoff
+'Runoff' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 201 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total column ozone
+'Total column ozone' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 14 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Total precipitation
+'Total precipitation' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Convective snowfall
+'Convective snowfall' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 201 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Large-scale snowfall
+'Large-scale snowfall' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Forecast albedo
+'Forecast albedo' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 193 ;
+	}
 #Specific cloud liquid water content
 'Specific cloud liquid water content' = {
 	 discipline = 0 ;
@@ -148,6 +363,54 @@
 	 parameterNumber = 11 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#UV visible albedo for direct radiation, isotropic component (climatological)
+'UV visible albedo for direct radiation, isotropic component (climatological)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 195 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#UV visible albedo for direct radiation, volumetric component (climatological)
+'UV visible albedo for direct radiation, volumetric component (climatological)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 196 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#UV visible albedo for direct radiation, geometric component (climatological)
+'UV visible albedo for direct radiation, geometric component (climatological)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 194 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation, isotropic component (climatological)
+'Near IR albedo for direct radiation, isotropic component (climatological)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 195 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation, volumetric component (climatological)
+'Near IR albedo for direct radiation, volumetric component (climatological)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 196 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation, geometric component (climatological)
+'Near IR albedo for direct radiation, geometric component (climatological)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 194 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
 #Random pattern 1 for sppt
 'Random pattern 1 for sppt' = {
 	 discipline = 192 ;
@@ -526,6 +789,51 @@
 	 parameterCategory = 213 ;
 	 parameterNumber = 160 ;
 	}
+#Accumulated Carbon Dioxide Net Ecosystem Exchange
+'Accumulated Carbon Dioxide Net Ecosystem Exchange' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 59 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Accumulated Carbon Dioxide Gross Primary Production
+'Accumulated Carbon Dioxide Gross Primary Production' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 60 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Accumulated Carbon Dioxide Ecosystem Respiration
+'Accumulated Carbon Dioxide Ecosystem Respiration' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 61 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Carbon dioxide net ecosystem exchange flux
+'Carbon dioxide net ecosystem exchange flux' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 59 ;
+	 constituentType = 3 ;
+	}
+#Carbon dioxide gross primary production flux
+'Carbon dioxide gross primary production flux' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 60 ;
+	 constituentType = 3 ;
+	}
+#Carbon dioxide ecosystem respiration flux
+'Carbon dioxide ecosystem respiration flux' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 61 ;
+	 constituentType = 3 ;
+	}
 #Evaporation from the top of canopy
 'Evaporation from the top of canopy' = {
 	 discipline = 192 ;
@@ -550,6 +858,105 @@
 	 parameterCategory = 228 ;
 	 parameterNumber = 103 ;
 	}
+#Accumulated freezing rain
+'Accumulated freezing rain' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 194 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Potential evaporation
+'Potential evaporation' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 200 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated eastward ozone flux
+'Time-integrated total column vertically-integrated eastward ozone flux' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 78 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated northward ozone flux
+'Time-integrated total column vertically-integrated northward ozone flux' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 79 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated divergence of ozone flux
+'Time-integrated total column vertically-integrated divergence of ozone flux' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 80 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated net source of ozone
+'Time-integrated total column vertically-integrated net source of ozone' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 81 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-mean carbon dioxide net ecosystem exchange flux
+'Time-mean carbon dioxide net ecosystem exchange flux' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 59 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean carbon dioxide gross primary production flux
+'Time-mean carbon dioxide gross primary production flux' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 60 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean carbon dioxide ecosystem respiration flux
+'Time-mean carbon dioxide ecosystem respiration flux' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 61 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean logarithm of surface pressure
+'Time-mean logarithm of surface pressure' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 25 ;
+	 typeOfFirstFixedSurface = 105 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total cloud cover
+'Time-mean total cloud cover' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Precipitation type
 'Precipitation type' = {
 	 discipline = 0 ;
@@ -578,6 +985,44 @@
 	 parameterNumber = 4 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow thickness over sea ice
+'Snow thickness over sea ice' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	}
+#Sea ice salinity
+'Sea ice salinity' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 174 ;
+	 typeOfSecondFixedSurface = 176 ;
+	}
+#Time-mean snow thickness over sea ice
+'Time-mean snow thickness over sea ice' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean Sea ice salinity
+'Time-mean Sea ice salinity' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 174 ;
+	 typeOfSecondFixedSurface = 176 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Sea water potential temperature
 'Sea water potential temperature' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/era/paramId.def b/definitions/grib2/localConcepts/era/paramId.def
index 592523141..3e325e080 100644
--- a/definitions/grib2/localConcepts/era/paramId.def
+++ b/definitions/grib2/localConcepts/era/paramId.def
@@ -1,4 +1,79 @@
 # Automatically generated by ./create_def.pl, do not edit
+#Surface runoff
+'8' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Sub-surface runoff
+'9' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 204 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#UV visible albedo for direct radiation (climatological)
+'15' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 193 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#UV visible albedo for diffuse radiation (climatological)
+'16' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 192 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation (climatological)
+'17' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 193 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for diffuse radiation (climatological)
+'18' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 192 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Snow albedo
+'32' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 192 ;
+	}
+#Snow evaporation
+'44' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 197 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snowmelt
+'45' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 203 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Specific rain water content
 '75' = {
 	 discipline = 0 ;
@@ -55,6 +130,40 @@
 	 parameterNumber = 12 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow depth
+'141' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	}
+#Large-scale precipitation
+'142' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 196 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Convective precipitation
+'143' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 195 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snowfall
+'144' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Logarithm of surface pressure
 '152' = {
 	 discipline = 0 ;
@@ -77,6 +186,60 @@
 	 parameterNumber = 13 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Total cloud cover
+'164' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Albedo (climatological)
+'174' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 193 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Evaporation
+'182' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Low cloud cover
+'186' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
+	}
+#Medium cloud cover
+'187' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
+	}
+#High cloud cover
+'188' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
+	}
+#Skin reservoir content
+'198' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 205 ;
+	}
 #Ozone mass mixing ratio
 '203' = {
 	 discipline = 0 ;
@@ -84,6 +247,58 @@
 	 parameterNumber = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Runoff
+'205' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 201 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total column ozone
+'206' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 14 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Total precipitation
+'228' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Convective snowfall
+'239' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 201 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Large-scale snowfall
+'240' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Forecast albedo
+'243' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 193 ;
+	}
 #Specific cloud liquid water content
 '246' = {
 	 discipline = 0 ;
@@ -148,6 +363,54 @@
 	 parameterNumber = 11 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#UV visible albedo for direct radiation, isotropic component (climatological)
+'210186' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 195 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#UV visible albedo for direct radiation, volumetric component (climatological)
+'210187' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 196 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#UV visible albedo for direct radiation, geometric component (climatological)
+'210188' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 194 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation, isotropic component (climatological)
+'210189' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 195 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation, volumetric component (climatological)
+'210190' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 196 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation, geometric component (climatological)
+'210191' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 194 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
 #Random pattern 1 for sppt
 '213001' = {
 	 discipline = 192 ;
@@ -526,6 +789,51 @@
 	 parameterCategory = 213 ;
 	 parameterNumber = 160 ;
 	}
+#Accumulated Carbon Dioxide Net Ecosystem Exchange
+'228080' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 59 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Accumulated Carbon Dioxide Gross Primary Production
+'228081' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 60 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Accumulated Carbon Dioxide Ecosystem Respiration
+'228082' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 61 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Carbon dioxide net ecosystem exchange flux
+'228083' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 59 ;
+	 constituentType = 3 ;
+	}
+#Carbon dioxide gross primary production flux
+'228084' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 60 ;
+	 constituentType = 3 ;
+	}
+#Carbon dioxide ecosystem respiration flux
+'228085' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 61 ;
+	 constituentType = 3 ;
+	}
 #Evaporation from the top of canopy
 '228100' = {
 	 discipline = 192 ;
@@ -550,6 +858,105 @@
 	 parameterCategory = 228 ;
 	 parameterNumber = 103 ;
 	}
+#Accumulated freezing rain
+'228216' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 194 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Potential evaporation
+'228251' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 200 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated eastward ozone flux
+'233032' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 78 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated northward ozone flux
+'233033' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 79 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated divergence of ozone flux
+'233034' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 80 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated net source of ozone
+'233035' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 81 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-mean carbon dioxide net ecosystem exchange flux
+'235062' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 59 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean carbon dioxide gross primary production flux
+'235063' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 60 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean carbon dioxide ecosystem respiration flux
+'235064' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 61 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean logarithm of surface pressure
+'235152' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 25 ;
+	 typeOfFirstFixedSurface = 105 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total cloud cover
+'235288' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Precipitation type
 '260015' = {
 	 discipline = 0 ;
@@ -578,6 +985,44 @@
 	 parameterNumber = 4 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow thickness over sea ice
+'262002' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	}
+#Sea ice salinity
+'262023' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 174 ;
+	 typeOfSecondFixedSurface = 176 ;
+	}
+#Time-mean snow thickness over sea ice
+'263002' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean Sea ice salinity
+'263023' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 174 ;
+	 typeOfSecondFixedSurface = 176 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Sea water potential temperature
 '151129' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/era/shortName.def b/definitions/grib2/localConcepts/era/shortName.def
index 41390b397..93e2a1b52 100644
--- a/definitions/grib2/localConcepts/era/shortName.def
+++ b/definitions/grib2/localConcepts/era/shortName.def
@@ -1,4 +1,79 @@
 # Automatically generated by ./create_def.pl, do not edit
+#Surface runoff
+'sro' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Sub-surface runoff
+'ssro' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 204 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#UV visible albedo for direct radiation (climatological)
+'aluvp' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 193 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#UV visible albedo for diffuse radiation (climatological)
+'aluvd' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 192 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation (climatological)
+'alnip' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 193 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for diffuse radiation (climatological)
+'alnid' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 192 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Snow albedo
+'asn' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 192 ;
+	}
+#Snow evaporation
+'es' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 197 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snowmelt
+'smlt' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 203 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Specific rain water content
 'crwc' = {
 	 discipline = 0 ;
@@ -55,6 +130,40 @@
 	 parameterNumber = 12 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow depth
+'sd' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	}
+#Large-scale precipitation
+'lsp' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 196 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Convective precipitation
+'cp' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 195 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snowfall
+'sf' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Logarithm of surface pressure
 'lnsp' = {
 	 discipline = 0 ;
@@ -77,6 +186,60 @@
 	 parameterNumber = 13 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Total cloud cover
+'tcc' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Albedo (climatological)
+'al' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 193 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Evaporation
+'e' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Low cloud cover
+'lcc' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
+	}
+#Medium cloud cover
+'mcc' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
+	}
+#High cloud cover
+'hcc' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
+	}
+#Skin reservoir content
+'src' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 205 ;
+	}
 #Ozone mass mixing ratio
 'o3' = {
 	 discipline = 0 ;
@@ -84,6 +247,58 @@
 	 parameterNumber = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Runoff
+'ro' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 201 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total column ozone
+'tco3' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 14 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Total precipitation
+'tp' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Convective snowfall
+'csf' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 201 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Large-scale snowfall
+'lsf' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Forecast albedo
+'fal' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 193 ;
+	}
 #Specific cloud liquid water content
 'clwc' = {
 	 discipline = 0 ;
@@ -148,6 +363,54 @@
 	 parameterNumber = 11 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#UV visible albedo for direct radiation, isotropic component (climatological)
+'aluvpi' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 195 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#UV visible albedo for direct radiation, volumetric component (climatological)
+'aluvpv' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 196 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#UV visible albedo for direct radiation, geometric component (climatological)
+'aluvpg' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 194 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation, isotropic component (climatological)
+'alnipi' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 195 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation, volumetric component (climatological)
+'alnipv' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 196 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation, geometric component (climatological)
+'alnipg' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 194 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
 #Random pattern 1 for sppt
 'sppt1' = {
 	 discipline = 192 ;
@@ -526,6 +789,51 @@
 	 parameterCategory = 213 ;
 	 parameterNumber = 160 ;
 	}
+#Accumulated Carbon Dioxide Net Ecosystem Exchange
+'aco2nee' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 59 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Accumulated Carbon Dioxide Gross Primary Production
+'aco2gpp' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 60 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Accumulated Carbon Dioxide Ecosystem Respiration
+'aco2rec' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 61 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Carbon dioxide net ecosystem exchange flux
+'fco2nee' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 59 ;
+	 constituentType = 3 ;
+	}
+#Carbon dioxide gross primary production flux
+'fco2gpp' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 60 ;
+	 constituentType = 3 ;
+	}
+#Carbon dioxide ecosystem respiration flux
+'fco2rec' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 61 ;
+	 constituentType = 3 ;
+	}
 #Evaporation from the top of canopy
 'evatc' = {
 	 discipline = 192 ;
@@ -550,6 +858,105 @@
 	 parameterCategory = 228 ;
 	 parameterNumber = 103 ;
 	}
+#Accumulated freezing rain
+'fzra' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 194 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Potential evaporation
+'pev' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 200 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated eastward ozone flux
+'tvioze' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 78 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated northward ozone flux
+'tviozn' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 79 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated divergence of ozone flux
+'tviozd' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 80 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated net source of ozone
+'tvions' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 81 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-mean carbon dioxide net ecosystem exchange flux
+'avg_fco2nee' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 59 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean carbon dioxide gross primary production flux
+'avg_fco2gpp' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 60 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean carbon dioxide ecosystem respiration flux
+'avg_fco2rec' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 61 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean logarithm of surface pressure
+'avg_lnsp' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 25 ;
+	 typeOfFirstFixedSurface = 105 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total cloud cover
+'avg_tcc' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Precipitation type
 'ptype' = {
 	 discipline = 0 ;
@@ -578,6 +985,44 @@
 	 parameterNumber = 4 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow thickness over sea ice
+'sisnthick' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	}
+#Sea ice salinity
+'icesalt' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 174 ;
+	 typeOfSecondFixedSurface = 176 ;
+	}
+#Time-mean snow thickness over sea ice
+'avg_sisnthick' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean Sea ice salinity
+'avg_icesalt' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 174 ;
+	 typeOfSecondFixedSurface = 176 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Sea water potential temperature
 'thetao' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/era/units.def b/definitions/grib2/localConcepts/era/units.def
index 171b1f44d..8e813a4d4 100644
--- a/definitions/grib2/localConcepts/era/units.def
+++ b/definitions/grib2/localConcepts/era/units.def
@@ -1,4 +1,79 @@
 # Automatically generated by ./create_def.pl, do not edit
+#Surface runoff
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Sub-surface runoff
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 204 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#UV visible albedo for direct radiation (climatological)
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 193 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#UV visible albedo for diffuse radiation (climatological)
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 192 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation (climatological)
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 193 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for diffuse radiation (climatological)
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 192 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Snow albedo
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 192 ;
+	}
+#Snow evaporation
+'m of water equivalent' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 197 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snowmelt
+'m of water equivalent' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 203 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Specific rain water content
 'kg kg**-1' = {
 	 discipline = 0 ;
@@ -55,6 +130,40 @@
 	 parameterNumber = 12 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow depth
+'m of water equivalent' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	}
+#Large-scale precipitation
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 196 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Convective precipitation
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 195 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snowfall
+'m of water equivalent' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Logarithm of surface pressure
 'Numeric' = {
 	 discipline = 0 ;
@@ -77,6 +186,60 @@
 	 parameterNumber = 13 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Total cloud cover
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Albedo (climatological)
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 193 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Evaporation
+'m of water equivalent' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Low cloud cover
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
+	}
+#Medium cloud cover
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
+	}
+#High cloud cover
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
+	}
+#Skin reservoir content
+'m of water equivalent' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 205 ;
+	}
 #Ozone mass mixing ratio
 'kg kg**-1' = {
 	 discipline = 0 ;
@@ -84,6 +247,58 @@
 	 parameterNumber = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Runoff
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 201 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total column ozone
+'kg m**-2' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 14 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Total precipitation
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Convective snowfall
+'m of water equivalent' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 201 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Large-scale snowfall
+'m of water equivalent' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Forecast albedo
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 193 ;
+	}
 #Specific cloud liquid water content
 'kg kg**-1' = {
 	 discipline = 0 ;
@@ -148,6 +363,54 @@
 	 parameterNumber = 11 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#UV visible albedo for direct radiation, isotropic component (climatological)
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 195 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#UV visible albedo for direct radiation, volumetric component (climatological)
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 196 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#UV visible albedo for direct radiation, geometric component (climatological)
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 194 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation, isotropic component (climatological)
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 195 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation, volumetric component (climatological)
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 196 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
+#Near IR albedo for direct radiation, geometric component (climatological)
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 194 ;
+	 typeOfGeneratingProcess = 9 ;
+	}
 #Random pattern 1 for sppt
 'dimensionless' = {
 	 discipline = 192 ;
@@ -526,6 +789,51 @@
 	 parameterCategory = 213 ;
 	 parameterNumber = 160 ;
 	}
+#Accumulated Carbon Dioxide Net Ecosystem Exchange
+'kg m**-2' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 59 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Accumulated Carbon Dioxide Gross Primary Production
+'kg m**-2' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 60 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Accumulated Carbon Dioxide Ecosystem Respiration
+'kg m**-2' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 61 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Carbon dioxide net ecosystem exchange flux
+'kg m**-2 s**-1' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 59 ;
+	 constituentType = 3 ;
+	}
+#Carbon dioxide gross primary production flux
+'kg m**-2 s**-1' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 60 ;
+	 constituentType = 3 ;
+	}
+#Carbon dioxide ecosystem respiration flux
+'kg m**-2 s**-1' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 61 ;
+	 constituentType = 3 ;
+	}
 #Evaporation from the top of canopy
 'm of water equivalent' = {
 	 discipline = 192 ;
@@ -550,6 +858,105 @@
 	 parameterCategory = 228 ;
 	 parameterNumber = 103 ;
 	}
+#Accumulated freezing rain
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 194 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Potential evaporation
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 200 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated eastward ozone flux
+'kg m**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 78 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated northward ozone flux
+'kg m**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 79 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated divergence of ozone flux
+'kg m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 80 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated total column vertically-integrated net source of ozone
+'kg m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 81 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 constituentType = 0 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-mean carbon dioxide net ecosystem exchange flux
+'kg m**-2 s**-1' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 59 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean carbon dioxide gross primary production flux
+'kg m**-2 s**-1' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 60 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean carbon dioxide ecosystem respiration flux
+'kg m**-2 s**-1' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 61 ;
+	 constituentType = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean logarithm of surface pressure
+'Numeric' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 25 ;
+	 typeOfFirstFixedSurface = 105 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total cloud cover
+'%' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Precipitation type
 '(Code table 4.201)' = {
 	 discipline = 0 ;
@@ -578,6 +985,44 @@
 	 parameterNumber = 4 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow thickness over sea ice
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	}
+#Sea ice salinity
+'g kg**-1' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 174 ;
+	 typeOfSecondFixedSurface = 176 ;
+	}
+#Time-mean snow thickness over sea ice
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean Sea ice salinity
+'g kg**-1' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 174 ;
+	 typeOfSecondFixedSurface = 176 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Sea water potential temperature
 'deg C' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/era6/name.def b/definitions/grib2/localConcepts/era6/name.def
index 659e66a53..dfc11edd9 100644
--- a/definitions/grib2/localConcepts/era6/name.def
+++ b/definitions/grib2/localConcepts/era6/name.def
@@ -506,6 +506,15 @@
 	 typeOfFirstFixedSurface = 105 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean total cloud cover
+'Time-mean total cloud cover' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Snow thickness over sea ice
 'Snow thickness over sea ice' = {
 	 localTablesVersion = 1 ;
diff --git a/definitions/grib2/localConcepts/era6/paramId.def b/definitions/grib2/localConcepts/era6/paramId.def
index c7cfc54ca..91cc85c20 100644
--- a/definitions/grib2/localConcepts/era6/paramId.def
+++ b/definitions/grib2/localConcepts/era6/paramId.def
@@ -506,6 +506,15 @@
 	 typeOfFirstFixedSurface = 105 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean total cloud cover
+'235288' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Snow thickness over sea ice
 '262002' = {
 	 localTablesVersion = 1 ;
diff --git a/definitions/grib2/localConcepts/era6/shortName.def b/definitions/grib2/localConcepts/era6/shortName.def
index c43bb955b..edbbcf430 100644
--- a/definitions/grib2/localConcepts/era6/shortName.def
+++ b/definitions/grib2/localConcepts/era6/shortName.def
@@ -506,6 +506,15 @@
 	 typeOfFirstFixedSurface = 105 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean total cloud cover
+'avg_tcc' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Snow thickness over sea ice
 'sisnthick' = {
 	 localTablesVersion = 1 ;
diff --git a/definitions/grib2/localConcepts/era6/units.def b/definitions/grib2/localConcepts/era6/units.def
index 9fa492a36..2761972c9 100644
--- a/definitions/grib2/localConcepts/era6/units.def
+++ b/definitions/grib2/localConcepts/era6/units.def
@@ -506,6 +506,15 @@
 	 typeOfFirstFixedSurface = 105 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean total cloud cover
+'%' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Snow thickness over sea ice
 'm' = {
 	 localTablesVersion = 1 ;
diff --git a/definitions/grib2/localConcepts/nextgems/cfName.def b/definitions/grib2/localConcepts/nextgems/cfName.def
new file mode 100644
index 000000000..f6ce8d365
--- /dev/null
+++ b/definitions/grib2/localConcepts/nextgems/cfName.def
@@ -0,0 +1,71 @@
+# Automatically generated by ./create_def.pl, do not edit
+#U component of wind
+'eastward_wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'eastward_wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'northward_wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'northward_wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Snow depth
+'lwe_thickness_of_surface_snow_amount' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	}
+#Snowfall
+'lwe_thickness_of_snowfall_amount' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total cloud cover
+'cloud_area_fraction' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Evaporation
+'lwe_thickness_of_water_evaporation_amount' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+}
diff --git a/definitions/grib2/localConcepts/nextgems/marsLevtypeConcept.def b/definitions/grib2/localConcepts/nextgems/marsLevtypeConcept.def
new file mode 100644
index 000000000..17529e6cf
--- /dev/null
+++ b/definitions/grib2/localConcepts/nextgems/marsLevtypeConcept.def
@@ -0,0 +1,83 @@
+# Concept marsLevtype
+'sfc' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=8;}
+'o2d' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=9;}
+'sfc' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=162;}
+'sfc' = {typeOfFirstFixedSurface=2; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=7; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=8; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=17; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=18; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=19; typeOfSecondFixedSurface=255;}
+'o2d' = {discipline=10; typeOfFirstFixedSurface=20; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=20; typeOfSecondFixedSurface=255;}
+'pl'  = {typeOfFirstFixedSurface=100; typeOfSecondFixedSurface=255;}
+'pl'  = {typeOfFirstFixedSurface=100; typeOfSecondFixedSurface=100;}
+'sfc' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=100;
+         scaleFactorOfSecondFixedSurface=0; scaledValueOfSecondFixedSurface=80000;}
+'sfc' = {typeOfFirstFixedSurface=100; scaleFactorOfFirstFixedSurface=0; scaledValueOfFirstFixedSurface=80000;
+         typeOfSecondFixedSurface=100; scaleFactorOfSecondFixedSurface=0; scaledValueOfSecondFixedSurface=45000;}
+'sfc' = {typeOfFirstFixedSurface=100; scaleFactorOfFirstFixedSurface=0;
+         scaledValueOfFirstFixedSurface=45000; typeOfSecondFixedSurface=8;}
+'sfc' = {typeOfFirstFixedSurface=101; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=102; typeOfSecondFixedSurface=255;}
+'hl' = {typeOfFirstFixedSurface=103; typeOfSecondFixedSurface=255;}
+'hl' = {typeOfFirstFixedSurface=103; typeOfSecondFixedSurface=103;}
+'sfc' = {typeOfFirstFixedSurface=103; scaleFactorOfFirstFixedSurface=0; scaledValueOfFirstFixedSurface=0; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=103; scaleFactorOfFirstFixedSurface=0; scaledValueOfFirstFixedSurface=2; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=103; scaleFactorOfFirstFixedSurface=0; scaledValueOfFirstFixedSurface=10; typeOfSecondFixedSurface=255;}
+'ml'  = {typeOfFirstFixedSurface=105; typeOfSecondFixedSurface=255;}
+'ml'  = {typeOfFirstFixedSurface=105; typeOfSecondFixedSurface=105;}
+'sfc' = {typeOfFirstFixedSurface=106; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=106;typeOfSecondFixedSurface=106;}
+'pt'  = {typeOfFirstFixedSurface=107; typeOfSecondFixedSurface=255;}
+'pt'  = {typeOfFirstFixedSurface=107; typeOfSecondFixedSurface=107;}
+'pv'  = {typeOfFirstFixedSurface=109; typeOfSecondFixedSurface=255;}
+'sol' = {typeOfFirstFixedSurface=114; typeOfSecondFixedSurface=255;}
+'sol' = {typeOfFirstFixedSurface=114; typeOfSecondFixedSurface=114;}
+'hhl' = {typeOfFirstFixedSurface=118; typeOfSecondFixedSurface=255;}
+'hpl' = {typeOfFirstFixedSurface=119; typeOfSecondFixedSurface=255;}
+'sol' = {typeOfFirstFixedSurface=151; typeOfSecondFixedSurface=255;}
+'sol' = {typeOfFirstFixedSurface=151; typeOfSecondFixedSurface=151;}
+'sol' = {typeOfFirstFixedSurface=152; typeOfSecondFixedSurface=255;}
+'sol' = {typeOfFirstFixedSurface=152; typeOfSecondFixedSurface=152;}
+'o2d' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=160; scaleFactorOfFirstFixedSurface=0;
+         scaledValueOfFirstFixedSurface=0; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=160;}
+'o2d' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=9;}
+'o2d' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=20;
+         scaledValueOfFirstFixedSurface=0; scaleFactorOfFirstFixedSurface=0;}
+'sfc' = {typeOfFirstFixedSurface=162; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=166; typeOfSecondFixedSurface=255;}
+'o3d' = {typeOfFirstFixedSurface=168; typeOfSecondFixedSurface=255;}
+'o3d' = {typeOfFirstFixedSurface=168; typeOfSecondFixedSurface=168;}
+'o2d' = {typeOfFirstFixedSurface=169; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=170; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=171; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=173; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=173; typeOfSecondFixedSurface=175;}
+'o2d' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=255; discipline=1;}
+'o2d' = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=176; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=160;
+         scaleFactorOfSecondFixedSurface=0; scaledValueOfSecondFixedSurface=0;}
+'o2d' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=176;}
+'sfc' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=176; discipline=1;}
+'o2d' = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=176;}
+'sfc' = {typeOfFirstFixedSurface=177; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=188; typeOfSecondFixedSurface=189;}
+
+'sfc' = {typeOfFirstFixedSurface=5; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=14; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=16; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=151;}
+'sfc' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=167;}
+'sol' = {typeOfFirstFixedSurface=185; typeOfSecondFixedSurface=255;}
+'sol' = {typeOfFirstFixedSurface=185; typeOfSecondFixedSurface=185;}
+'sol' = {typeOfFirstFixedSurface=186; typeOfSecondFixedSurface=255;}
+'sol' = {typeOfFirstFixedSurface=186; typeOfSecondFixedSurface=186;}
+'sol' = {typeOfFirstFixedSurface=187; typeOfSecondFixedSurface=255;}
+'sol' = {typeOfFirstFixedSurface=187; typeOfSecondFixedSurface=187;}
+'sfc' = {typeOfFirstFixedSurface=187; typeOfSecondFixedSurface=185;}
diff --git a/definitions/grib2/localConcepts/nextgems/name.def b/definitions/grib2/localConcepts/nextgems/name.def
new file mode 100644
index 000000000..910acba84
--- /dev/null
+++ b/definitions/grib2/localConcepts/nextgems/name.def
@@ -0,0 +1,312 @@
+# Automatically generated by ./create_def.pl, do not edit
+#Surface runoff
+'Surface runoff' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Sub-surface runoff
+'Sub-surface runoff' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 204 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Wind speed
+'Wind speed' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Wind speed
+'Wind speed' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'U component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'U component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'V component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'V component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Snow depth
+'Snow depth' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	}
+#Snowfall
+'Snowfall' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total cloud cover
+'Total cloud cover' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Evaporation
+'Evaporation' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Low cloud cover
+'Low cloud cover' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
+	}
+#Medium cloud cover
+'Medium cloud cover' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
+	}
+#High cloud cover
+'High cloud cover' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
+	}
+#Total precipitation
+'Total precipitation' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-mean surface runoff rate
+'Time-mean surface runoff rate' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean sub-surface runoff rate
+'Time-mean sub-surface runoff rate' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 204 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean wind speed
+'Time-mean wind speed' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean wind speed
+'Time-mean wind speed' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'Time-mean U component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'Time-mean U component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'Time-mean V component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'Time-mean V component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean snow depth
+'Time-mean snow depth' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean low cloud cover
+'Time-mean low cloud cover' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean medium cloud cover
+'Time-mean medium cloud cover' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean high cloud cover
+'Time-mean high cloud cover' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Snow thickness over sea ice
+'Snow thickness over sea ice' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	 scaledValueOfFirstFixedSurface = missing() ;
+	 scaleFactorOfFirstFixedSurface = missing() ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
+	}
+#Time-mean snow thickness over sea ice
+'Time-mean snow thickness over sea ice' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	 scaledValueOfFirstFixedSurface = missing() ;
+	 scaleFactorOfFirstFixedSurface = missing() ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total snowfall rate
+'Time-mean total snowfall rate' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean evaporation rate
+'Time-mean evaporation rate' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total precipitation rate
+'Time-mean total precipitation rate' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Mean total cloud cover
+'Mean total cloud cover' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+}
diff --git a/definitions/grib2/localConcepts/nextgems/paramId.def b/definitions/grib2/localConcepts/nextgems/paramId.def
new file mode 100644
index 000000000..38562aa12
--- /dev/null
+++ b/definitions/grib2/localConcepts/nextgems/paramId.def
@@ -0,0 +1,312 @@
+# Automatically generated by ./create_def.pl, do not edit
+#Surface runoff
+'8' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Sub-surface runoff
+'9' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 204 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Wind speed
+'10' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Wind speed
+'10' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'131' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'131' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'132' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'132' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Snow depth
+'141' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	}
+#Snowfall
+'144' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total cloud cover
+'164' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Evaporation
+'182' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Low cloud cover
+'186' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
+	}
+#Medium cloud cover
+'187' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
+	}
+#High cloud cover
+'188' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
+	}
+#Total precipitation
+'228' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-mean surface runoff rate
+'172008' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean sub-surface runoff rate
+'172009' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 204 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean wind speed
+'235097' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean wind speed
+'235097' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'235131' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'235131' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'235132' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'235132' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean snow depth
+'235141' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean low cloud cover
+'235186' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean medium cloud cover
+'235187' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean high cloud cover
+'235188' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Snow thickness over sea ice
+'262002' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	 scaledValueOfFirstFixedSurface = missing() ;
+	 scaleFactorOfFirstFixedSurface = missing() ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
+	}
+#Time-mean snow thickness over sea ice
+'263002' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	 scaledValueOfFirstFixedSurface = missing() ;
+	 scaleFactorOfFirstFixedSurface = missing() ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total snowfall rate
+'172144' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean evaporation rate
+'172182' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total precipitation rate
+'172228' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Mean total cloud cover
+'228006' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+}
diff --git a/definitions/grib2/localConcepts/nextgems/shortName.def b/definitions/grib2/localConcepts/nextgems/shortName.def
new file mode 100644
index 000000000..345004112
--- /dev/null
+++ b/definitions/grib2/localConcepts/nextgems/shortName.def
@@ -0,0 +1,312 @@
+# Automatically generated by ./create_def.pl, do not edit
+#Surface runoff
+'sro' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Sub-surface runoff
+'ssro' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 204 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Wind speed
+'ws' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Wind speed
+'ws' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'u' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'u' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'v' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'v' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Snow depth
+'sd' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	}
+#Snowfall
+'sf' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total cloud cover
+'tcc' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Evaporation
+'e' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Low cloud cover
+'lcc' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
+	}
+#Medium cloud cover
+'mcc' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
+	}
+#High cloud cover
+'hcc' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
+	}
+#Total precipitation
+'tp' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-mean surface runoff rate
+'msror' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean sub-surface runoff rate
+'mssror' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 204 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean wind speed
+'avg_ws' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean wind speed
+'avg_ws' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'avg_u' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'avg_u' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'avg_v' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'avg_v' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean snow depth
+'avg_sd_m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean low cloud cover
+'avg_lcc_frac' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean medium cloud cover
+'avg_mcc_frac' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean high cloud cover
+'avg_hcc_frac' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Snow thickness over sea ice
+'sisnthick' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	 scaledValueOfFirstFixedSurface = missing() ;
+	 scaleFactorOfFirstFixedSurface = missing() ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
+	}
+#Time-mean snow thickness over sea ice
+'avg_sisnthick' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	 scaledValueOfFirstFixedSurface = missing() ;
+	 scaleFactorOfFirstFixedSurface = missing() ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total snowfall rate
+'mtsfr' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean evaporation rate
+'erate' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total precipitation rate
+'tprate' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Mean total cloud cover
+'meantcc' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+}
diff --git a/definitions/grib2/localConcepts/nextgems/units.def b/definitions/grib2/localConcepts/nextgems/units.def
new file mode 100644
index 000000000..25801ea57
--- /dev/null
+++ b/definitions/grib2/localConcepts/nextgems/units.def
@@ -0,0 +1,312 @@
+# Automatically generated by ./create_def.pl, do not edit
+#Surface runoff
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Sub-surface runoff
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 204 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Wind speed
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Wind speed
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#U component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#V component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Snow depth
+'m of water equivalent' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	}
+#Snowfall
+'m of water equivalent' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total cloud cover
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Evaporation
+'m of water equivalent' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Low cloud cover
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
+	}
+#Medium cloud cover
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
+	}
+#High cloud cover
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
+	}
+#Total precipitation
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-mean surface runoff rate
+'m s**-1' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean sub-surface runoff rate
+'m s**-1' = {
+	 localTablesVersion = 1 ;
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 204 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean wind speed
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean wind speed
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean snow depth
+'m of water equivalent' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 254 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean low cloud cover
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean medium cloud cover
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean high cloud cover
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Snow thickness over sea ice
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	 scaledValueOfFirstFixedSurface = missing() ;
+	 scaleFactorOfFirstFixedSurface = missing() ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
+	}
+#Time-mean snow thickness over sea ice
+'m' = {
+	 localTablesVersion = 1 ;
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 173 ;
+	 typeOfSecondFixedSurface = 175 ;
+	 scaledValueOfFirstFixedSurface = missing() ;
+	 scaleFactorOfFirstFixedSurface = missing() ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total snowfall rate
+'m of water equivalent s**-1' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean evaporation rate
+'m of water equivalent s**-1' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean total precipitation rate
+'m s**-1' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 193 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Mean total cloud cover
+'(0 - 1)' = {
+	 localTablesVersion = 1 ;
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+}
diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def
index 3c1203e5b..cc640c532 100644
--- a/definitions/grib2/name.def
+++ b/definitions/grib2/name.def
@@ -985,6 +985,18 @@
 	 scaleFactorOfLowerLimit = 0 ;
 	 probabilityType = 3 ;
 	}
+#10 metre convective gust of at least 25 m/s
+'10 metre convective gust of at least 25 m/s' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfLowerLimit = 25 ;
+	 scaleFactorOfLowerLimit = 0 ;
+	 probabilityType = 3 ;
+	}
 #Probability of temperature standardized anomaly greater than 1 standard deviation
 'Probability of temperature standardized anomaly greater than 1 standard deviation' = {
 	 discipline = 0 ;
@@ -1619,6 +1631,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean peak wave period of wind waves
+'Time-mean peak wave period of wind waves' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of total swell
+'Time-mean peak wave period of total swell' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of first swell partition
+'Time-mean peak wave period of first swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of second swell partition
+'Time-mean peak wave period of second swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of third swell partition
+'Time-mean peak wave period of third swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction (total)
+'Time-mean peak wave direction (total)' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of wind waves
+'Time-mean peak wave direction of wind waves' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of total swell
+'Time-mean peak wave direction of total swell' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of first swell partition
+'Time-mean peak wave direction of first swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of second swell partition
+'Time-mean peak wave direction of second swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of third swell partition
+'Time-mean peak wave direction of third swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean whitecap fraction
+'Time-mean whitecap fraction' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean wave Spectral Skewness
 'Time-mean wave Spectral Skewness' = {
 	 discipline = 10 ;
@@ -2084,6 +2180,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Time-maximum peak wave period of wind waves
+'Time-maximum peak wave period of wind waves' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of total swell
+'Time-maximum peak wave period of total swell' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of first swell partition
+'Time-maximum peak wave period of first swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of second swell partition
+'Time-maximum peak wave period of second swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of third swell partition
+'Time-maximum peak wave period of third swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction (total)
+'Time-maximum peak wave direction (total)' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of wind waves
+'Time-maximum peak wave direction of wind waves' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of total swell
+'Time-maximum peak wave direction of total swell' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of first swell partition
+'Time-maximum peak wave direction of first swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of second swell partition
+'Time-maximum peak wave direction of second swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of third swell partition
+'Time-maximum peak wave direction of third swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum whitecap fraction
+'Time-maximum whitecap fraction' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
 #Time-maximum wave Spectral Skewness
 'Time-maximum wave Spectral Skewness' = {
 	 discipline = 10 ;
@@ -2549,6 +2729,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 3 ;
 	}
+#Time-minimum peak wave period of wind waves
+'Time-minimum peak wave period of wind waves' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of total swell
+'Time-minimum peak wave period of total swell' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of first swell partition
+'Time-minimum peak wave period of first swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of second swell partition
+'Time-minimum peak wave period of second swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of third swell partition
+'Time-minimum peak wave period of third swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction (total)
+'Time-minimum peak wave direction (total)' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of wind waves
+'Time-minimum peak wave direction of wind waves' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of total swell
+'Time-minimum peak wave direction of total swell' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of first swell partition
+'Time-minimum peak wave direction of first swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of second swell partition
+'Time-minimum peak wave direction of second swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of third swell partition
+'Time-minimum peak wave direction of third swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum whitecap fraction
+'Time-minimum whitecap fraction' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
 #Time-minimum wave Spectral Skewness
 'Time-minimum wave Spectral Skewness' = {
 	 discipline = 10 ;
@@ -3014,6 +3278,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 6 ;
 	}
+#Time-standard-deviation peak wave period of wind waves
+'Time-standard-deviation peak wave period of wind waves' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of total swell
+'Time-standard-deviation peak wave period of total swell' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of first swell partition
+'Time-standard-deviation peak wave period of first swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of second swell partition
+'Time-standard-deviation peak wave period of second swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of third swell partition
+'Time-standard-deviation peak wave period of third swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction (total)
+'Time-standard-deviation peak wave direction (total)' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of wind waves
+'Time-standard-deviation peak wave direction of wind waves' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of total swell
+'Time-standard-deviation peak wave direction of total swell' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of first swell partition
+'Time-standard-deviation peak wave direction of first swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of second swell partition
+'Time-standard-deviation peak wave direction of second swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of third swell partition
+'Time-standard-deviation peak wave direction of third swell partition' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation whitecap fraction
+'Time-standard-deviation whitecap fraction' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
 #Time-standard-deviation wave Spectral Skewness
 'Time-standard-deviation wave Spectral Skewness' = {
 	 discipline = 10 ;
@@ -3742,6 +4090,13 @@
 	 typeOfGeneratingProcess = 20 ;
 	 is_aerosol = 1 ;
 	}
+#Cosine of solar zenith angle
+'Cosine of solar zenith angle' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
 #Dry deposition of ammonium aerosol
 'Dry deposition of ammonium aerosol' = {
 	 discipline = 0 ;
@@ -8113,6 +8468,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean cosine of solar zenith angle
+'Time-mean cosine of solar zenith angle' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean freezing rain precipitation rate
 'Time-mean freezing rain precipitation rate' = {
 	 discipline = 0 ;
@@ -8488,6 +8851,58 @@
 	 parameterNumber = 51 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean land surface heat net flux
+'Time-mean land surface heat net flux' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean surface direct normal short-wave radiation flux, clear sky
+'Time-mean surface direct normal short-wave radiation flux, clear sky' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean 10 metre convective gust
+'Time-mean 10 metre convective gust' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean 10 metre turbulent gust
+'Time-mean 10 metre turbulent gust' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-integrated land surface heat net flux
+'Time-integrated land surface heat net flux' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated surface direct normal short-wave radiation flux, clear sky
+'Time-integrated surface direct normal short-wave radiation flux, clear sky' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Time-maximum temperature tendency due to short-wave radiation
 'Time-maximum temperature tendency due to short-wave radiation' = {
 	 discipline = 0 ;
@@ -9883,6 +10298,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Time-maximum cosine of solar zenith angle
+'Time-maximum cosine of solar zenith angle' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
 #Time-maximum freezing rain precipitation rate
 'Time-maximum freezing rain precipitation rate' = {
 	 discipline = 0 ;
@@ -10258,6 +10681,42 @@
 	 parameterNumber = 51 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Time-maximum land surface heat net flux
+'Time-maximum land surface heat net flux' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum surface direct normal short-wave radiation flux, clear sky
+'Time-maximum surface direct normal short-wave radiation flux, clear sky' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum 10 metre convective gust
+'Time-maximum 10 metre convective gust' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum 10 metre turbulent gust
+'Time-maximum 10 metre turbulent gust' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
 #Time-minimum temperature tendency due to short-wave radiation
 'Time-minimum temperature tendency due to short-wave radiation' = {
 	 discipline = 0 ;
@@ -11681,6 +12140,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 3 ;
 	}
+#Time-minimum cosine of solar zenith angle
+'Time-minimum cosine of solar zenith angle' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
 #Time-minimum freezing rain rate water equivalent
 'Time-minimum freezing rain rate water equivalent' = {
 	 discipline = 0 ;
@@ -12056,6 +12523,42 @@
 	 parameterNumber = 51 ;
 	 typeOfStatisticalProcessing = 3 ;
 	}
+#Time-minimum land surface heat net flux
+'Time-minimum land surface heat net flux' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum surface direct normal short-wave radiation flux, clear sky
+'Time-minimum surface direct normal short-wave radiation flux, clear sky' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum 10 metre convective gust
+'Time-minimum 10 metre convective gust' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum 10 metre turbulent gust
+'Time-minimum 10 metre turbulent gust' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
 #Time-standard-deviation temperature tendency due to short-wave radiation
 'Time-standard-deviation temperature tendency due to short-wave radiation' = {
 	 discipline = 0 ;
@@ -13487,6 +13990,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 6 ;
 	}
+#Time-standard-deviation cosine of solar zenith angle
+'Time-standard-deviation cosine of solar zenith angle' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
 #Time-standard-deviation freezing rain rate water equivalent
 'Time-standard-deviation freezing rain rate water equivalent' = {
 	 discipline = 0 ;
@@ -13855,6 +14366,42 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 6 ;
 	}
+#Time-standard-deviation land surface heat net flux
+'Time-standard-deviation land surface heat net flux' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation surface direct normal short-wave radiation flux, clear sky
+'Time-standard-deviation surface direct normal short-wave radiation flux, clear sky' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 10 metre convective gust
+'Time-standard-deviation 10 metre convective gust' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 10 metre turbulent gust
+'Time-standard-deviation 10 metre turbulent gust' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
 #Cross sectional area of flow in channel
 'Cross sectional area of flow in channel' = {
 	 discipline = 1 ;
@@ -16120,6 +16667,38 @@
 	 parameterNumber = 67 ;
 	 typeOfFirstFixedSurface = 1 ;
 	}
+#Land surface heat net flux
+'Land surface heat net flux' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Surface direct normal short-wave radiation flux, clear sky
+'Surface direct normal short-wave radiation flux, clear sky' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#10 metre convective gust
+'10 metre convective gust' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#10 metre turbulent gust
+'10 metre turbulent gust' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
 #Universal thermal climate index
 'Universal thermal climate index' = {
 	 discipline = 20 ;
@@ -17194,6 +17773,22 @@
 	 typeOfFirstFixedSurface = 168 ;
 	 typeOfSecondFixedSurface = 168 ;
 	}
+#Northward mass transport
+'Northward mass transport' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 46 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	}
+#Eastward mass transport
+'Eastward mass transport' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 47 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	}
 #Net short wave radiation rate at sea surface
 'Net short wave radiation rate at sea surface' = {
 	 discipline = 0 ;
@@ -18339,6 +18934,24 @@
 	 typeOfSecondFixedSurface = 168 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean northward mass transport
+'Time-mean northward mass transport' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 46 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean eastward mass transport
+'Time-mean eastward mass transport' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 47 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean net short wave radiation rate at sea surface
 'Time-mean net short wave radiation rate at sea surface' = {
 	 discipline = 0 ;
@@ -18898,14 +19511,12 @@
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 107 ;
-	 typeOfFirstFixedSurface = 8 ;
 	}
 #Aerosol backscatter from ground
 'Aerosol backscatter from ground' = {
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 108 ;
-	 typeOfFirstFixedSurface = 1 ;
 	}
 #Aerosol extinction coefficient
 'Aerosol extinction coefficient' = {
@@ -18915,26 +19526,26 @@
 	}
 #Mass mixing ratio difference
 'Mass mixing ratio difference' = {
-         discipline = 0 ;
-         parameterCategory = 20 ;
-         parameterNumber = 2 ;
-         typeOfGeneratingProcess = 20 ;
-        }
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 2 ;
+	 typeOfGeneratingProcess = 20 ;
+	}
 #Mass mixing ratio from volcanoes difference
 'Mass mixing ratio from volcanoes difference' = {
-         discipline = 0 ;
-         parameterCategory = 20 ;
-         parameterNumber = 2 ;
-         sourceSinkChemicalPhysicalProcess = 7 ;
-         typeOfGeneratingProcess = 20 ;
-        }
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 2 ;
+	 typeOfGeneratingProcess = 20 ;
+	 sourceSinkChemicalPhysicalProcess = 7 ;
+	}
 #Emission mass flux from wild fires
 'Emission mass flux from wild fires' = {
-         discipline = 0 ;
-         parameterCategory = 20 ;
-         parameterNumber = 77 ;
-         sourceSinkChemicalPhysicalProcess = 5 ;
-        }
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 5 ;
+	}
 #Pressure tendency
 'Pressure tendency' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def
index 317652e15..34d2e411c 100644
--- a/definitions/grib2/paramId.def
+++ b/definitions/grib2/paramId.def
@@ -985,6 +985,18 @@
 	 scaleFactorOfLowerLimit = 0 ;
 	 probabilityType = 3 ;
 	}
+#10 metre convective gust of at least 25 m/s
+'131256' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfLowerLimit = 25 ;
+	 scaleFactorOfLowerLimit = 0 ;
+	 probabilityType = 3 ;
+	}
 #Probability of temperature standardized anomaly greater than 1 standard deviation
 '133093' = {
 	 discipline = 0 ;
@@ -1619,6 +1631,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean peak wave period of wind waves
+'141135' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of total swell
+'141136' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of first swell partition
+'141137' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of second swell partition
+'141138' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of third swell partition
+'141139' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction (total)
+'141140' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of wind waves
+'141141' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of total swell
+'141142' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of first swell partition
+'141143' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of second swell partition
+'141144' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of third swell partition
+'141145' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean whitecap fraction
+'141146' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean wave Spectral Skewness
 '141207' = {
 	 discipline = 10 ;
@@ -2084,6 +2180,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Time-maximum peak wave period of wind waves
+'143135' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of total swell
+'143136' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of first swell partition
+'143137' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of second swell partition
+'143138' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of third swell partition
+'143139' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction (total)
+'143140' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of wind waves
+'143141' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of total swell
+'143142' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of first swell partition
+'143143' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of second swell partition
+'143144' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of third swell partition
+'143145' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum whitecap fraction
+'143146' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
 #Time-maximum wave Spectral Skewness
 '143207' = {
 	 discipline = 10 ;
@@ -2549,6 +2729,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 3 ;
 	}
+#Time-minimum peak wave period of wind waves
+'144135' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of total swell
+'144136' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of first swell partition
+'144137' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of second swell partition
+'144138' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of third swell partition
+'144139' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction (total)
+'144140' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of wind waves
+'144141' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of total swell
+'144142' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of first swell partition
+'144143' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of second swell partition
+'144144' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of third swell partition
+'144145' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum whitecap fraction
+'144146' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
 #Time-minimum wave Spectral Skewness
 '144207' = {
 	 discipline = 10 ;
@@ -3014,6 +3278,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 6 ;
 	}
+#Time-standard-deviation peak wave period of wind waves
+'145135' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of total swell
+'145136' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of first swell partition
+'145137' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of second swell partition
+'145138' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of third swell partition
+'145139' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction (total)
+'145140' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of wind waves
+'145141' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of total swell
+'145142' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of first swell partition
+'145143' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of second swell partition
+'145144' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of third swell partition
+'145145' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation whitecap fraction
+'145146' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
 #Time-standard-deviation wave Spectral Skewness
 '145207' = {
 	 discipline = 10 ;
@@ -3742,6 +4090,13 @@
 	 typeOfGeneratingProcess = 20 ;
 	 is_aerosol = 1 ;
 	}
+#Cosine of solar zenith angle
+'214001' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
 #Dry deposition of ammonium aerosol
 '215206' = {
 	 discipline = 0 ;
@@ -8113,6 +8468,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean cosine of solar zenith angle
+'235340' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean freezing rain precipitation rate
 '235341' = {
 	 discipline = 0 ;
@@ -8488,6 +8851,58 @@
 	 parameterNumber = 51 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean land surface heat net flux
+'235386' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean surface direct normal short-wave radiation flux, clear sky
+'235387' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean 10 metre convective gust
+'235388' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean 10 metre turbulent gust
+'235389' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-integrated land surface heat net flux
+'236386' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated surface direct normal short-wave radiation flux, clear sky
+'236387' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Time-maximum temperature tendency due to short-wave radiation
 '237001' = {
 	 discipline = 0 ;
@@ -9883,6 +10298,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Time-maximum cosine of solar zenith angle
+'237340' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
 #Time-maximum freezing rain precipitation rate
 '237341' = {
 	 discipline = 0 ;
@@ -10258,6 +10681,42 @@
 	 parameterNumber = 51 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Time-maximum land surface heat net flux
+'237386' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum surface direct normal short-wave radiation flux, clear sky
+'237387' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum 10 metre convective gust
+'237388' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum 10 metre turbulent gust
+'237389' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
 #Time-minimum temperature tendency due to short-wave radiation
 '238001' = {
 	 discipline = 0 ;
@@ -11681,6 +12140,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 3 ;
 	}
+#Time-minimum cosine of solar zenith angle
+'238340' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
 #Time-minimum freezing rain rate water equivalent
 '238341' = {
 	 discipline = 0 ;
@@ -12056,6 +12523,42 @@
 	 parameterNumber = 51 ;
 	 typeOfStatisticalProcessing = 3 ;
 	}
+#Time-minimum land surface heat net flux
+'238386' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum surface direct normal short-wave radiation flux, clear sky
+'238387' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum 10 metre convective gust
+'238388' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum 10 metre turbulent gust
+'238389' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
 #Time-standard-deviation temperature tendency due to short-wave radiation
 '239001' = {
 	 discipline = 0 ;
@@ -13487,6 +13990,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 6 ;
 	}
+#Time-standard-deviation cosine of solar zenith angle
+'239340' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
 #Time-standard-deviation freezing rain rate water equivalent
 '239341' = {
 	 discipline = 0 ;
@@ -13855,6 +14366,42 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 6 ;
 	}
+#Time-standard-deviation land surface heat net flux
+'239386' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation surface direct normal short-wave radiation flux, clear sky
+'239387' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 10 metre convective gust
+'239388' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 10 metre turbulent gust
+'239389' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
 #Cross sectional area of flow in channel
 '240011' = {
 	 discipline = 1 ;
@@ -16120,6 +16667,38 @@
 	 parameterNumber = 67 ;
 	 typeOfFirstFixedSurface = 1 ;
 	}
+#Land surface heat net flux
+'260684' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Surface direct normal short-wave radiation flux, clear sky
+'260685' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#10 metre convective gust
+'260686' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#10 metre turbulent gust
+'260687' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
 #Universal thermal climate index
 '261001' = {
 	 discipline = 20 ;
@@ -17194,6 +17773,22 @@
 	 typeOfFirstFixedSurface = 168 ;
 	 typeOfSecondFixedSurface = 168 ;
 	}
+#Northward mass transport
+'262517' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 46 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	}
+#Eastward mass transport
+'262518' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 47 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	}
 #Net short wave radiation rate at sea surface
 '262900' = {
 	 discipline = 0 ;
@@ -18339,6 +18934,24 @@
 	 typeOfSecondFixedSurface = 168 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean northward mass transport
+'263517' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 46 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean eastward mass transport
+'263518' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 47 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean net short wave radiation rate at sea surface
 '263900' = {
 	 discipline = 0 ;
@@ -18898,14 +19511,12 @@
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 107 ;
-	 typeOfFirstFixedSurface = 8 ;
 	}
 #Aerosol backscatter from ground
 '461000' = {
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 108 ;
-	 typeOfFirstFixedSurface = 1 ;
 	}
 #Aerosol extinction coefficient
 '462000' = {
@@ -18915,26 +19526,26 @@
 	}
 #Mass mixing ratio difference
 '467000' = {
-         discipline = 0 ;
-         parameterCategory = 20 ;
-         parameterNumber = 2 ;
-         typeOfGeneratingProcess = 20 ;
-        }
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 2 ;
+	 typeOfGeneratingProcess = 20 ;
+	}
 #Mass mixing ratio from volcanoes difference
 '468000' = {
-         discipline = 0 ;
-         parameterCategory = 20 ;
-         parameterNumber = 2 ;
-         sourceSinkChemicalPhysicalProcess = 7 ;
-         typeOfGeneratingProcess = 20 ;
-        }
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 2 ;
+	 typeOfGeneratingProcess = 20 ;
+	 sourceSinkChemicalPhysicalProcess = 7 ;
+	}
 #Emission mass flux from wild fires
 '469000' = {
-         discipline = 0 ;
-         parameterCategory = 20 ;
-         parameterNumber = 77 ;
-         sourceSinkChemicalPhysicalProcess = 5 ;
-        }
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 5 ;
+	}
 #Pressure tendency
 '3003' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/postProcessingConcept.def b/definitions/grib2/postProcessingConcept.def
index cfd5c0031..414f31fce 100644
--- a/definitions/grib2/postProcessingConcept.def
+++ b/definitions/grib2/postProcessingConcept.def
@@ -4,7 +4,10 @@
 "lisflood_eric"      = { typeOfPostProcessing = 2; }
 "lisflood_season"    = { typeOfPostProcessing = 3; }
 "lisflood_merged"    = { typeOfPostProcessing = 4; }
-"lisflood_global"    = { typeOfPostProcessing = 5; }
+
+# See ECC-1977
+"global_lisflood"    = { typeOfPostProcessing = 5; }
+
 "geff"               = { typeOfPostProcessing = 10; }
 "ericha"             = { typeOfPostProcessing = 51; }
 "htessel_lisflood"   = { typeOfPostProcessing = 101; }
diff --git a/definitions/grib2/section.1.def b/definitions/grib2/section.1.def
index a08bb293f..d7995814d 100644
--- a/definitions/grib2/section.1.def
+++ b/definitions/grib2/section.1.def
@@ -108,6 +108,7 @@ concept stepType {
     "sum"     = {selectStepTemplateInterval=1; stepTypeInternal="sum";}
     "severity" = {selectStepTemplateInterval=1; stepTypeInternal="severity";}
     "mode"    = {selectStepTemplateInterval=1; stepTypeInternal="mode";}
+    "index"   = {selectStepTemplateInterval=1; stepTypeInternal="index";}
 }
 
 if (chem_param_split == 0) {
diff --git a/definitions/grib2/section.4.def b/definitions/grib2/section.4.def
index b813fdae6..5044f6cd8 100644
--- a/definitions/grib2/section.4.def
+++ b/definitions/grib2/section.4.def
@@ -24,31 +24,34 @@ if (centre==7 || centre==46) {
 }
 
 concept datasetForLocal(unknown) {
-  "tigge"   = {productionStatusOfProcessedData=4;}
-  "tigge"   = {productionStatusOfProcessedData=5;}
-  "s2s"     = {productionStatusOfProcessedData=6;}
-  "s2s"     = {productionStatusOfProcessedData=7;}
-  "cerise"  = {marsClass="ci";}
-  "era6"    = {marsClass="e6";} # for ERA6 parameters with constituentType
-  "hydro"   = {marsClass="ce";} # EFAS/GLOFAS
-  "hydro"   = {marsClass="ul";} # ULYSSES
-  "fire"    = {marsClass="gw";} # Global Wildfire awareness system
-  "uerra"   = {productionStatusOfProcessedData=8;} # UERRA
-  "uerra"   = {productionStatusOfProcessedData=9;}
-  "uerra"   = {productionStatusOfProcessedData=10;} # CARRA/CERRA
-  "uerra"   = {productionStatusOfProcessedData=11;}
-  "destine" = {productionStatusOfProcessedData=12;} # Destination Earth
-  "destine" = {productionStatusOfProcessedData=13;}
-  "era"     = {marsClass="e2";}
-  "era"     = {marsClass="e4";}
-  "era"     = {marsClass="ea";}
-  "era"     = {marsClass="ei";}
-  "era"     = {marsClass="em";}
-  "era"     = {marsClass="ep";}
-  "era"     = {marsClass="er";}
-  "era"     = {marsClass="et";}
-  "era"     = {marsClass="l5";}
-  "unknown" = { dummy=1; }
+  "tigge"       = {productionStatusOfProcessedData=4;}
+  "tigge"       = {productionStatusOfProcessedData=5;}
+  "s2s"         = {productionStatusOfProcessedData=6;}
+  "s2s"         = {productionStatusOfProcessedData=7;}
+  "cerise"      = {marsClass="ci";}
+  "era6"        = {marsClass="e6";} # for ERA6 parameters with constituentType
+  "hydro"       = {marsClass="ce";} # EFAS/GLOFAS
+  "hydro"       = {marsClass="ul";} # ULYSSES
+  "fire"        = {marsClass="gw";} # Global Wildfire awareness system
+  "uerra"       = {productionStatusOfProcessedData=8;} # UERRA
+  "uerra"       = {productionStatusOfProcessedData=9;}
+  "uerra"       = {productionStatusOfProcessedData=10;} # CARRA/CERRA
+  "uerra"       = {productionStatusOfProcessedData=11;}
+  "destine"     = {productionStatusOfProcessedData=12;} # Destination Earth
+  "destine"     = {productionStatusOfProcessedData=13;}
+  "destinegen1" = {productionStatusOfProcessedData=12;generation=1;} # DestinE ClimateDT Generation 1
+  "destinegen1" = {productionStatusOfProcessedData=13;generation=1;}
+  "era"         = {marsClass="e2";}
+  "era"         = {marsClass="e4";}
+  "era"         = {marsClass="ea";}
+  "era"         = {marsClass="ei";}
+  "era"         = {marsClass="em";}
+  "era"         = {marsClass="ep";}
+  "era"         = {marsClass="er";}
+  "era"         = {marsClass="et";}
+  "era"         = {marsClass="l5";}
+  "nextgems"    = {marsClass="ng";}
+  "unknown"     = { dummy=1; }
 }
 
 # If the keys marsClass or productionStatusOfProcessedData change in memory,
diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def
index 4f3468222..5b9f2f5ed 100644
--- a/definitions/grib2/shortName.def
+++ b/definitions/grib2/shortName.def
@@ -985,6 +985,18 @@
 	 scaleFactorOfLowerLimit = 0 ;
 	 probabilityType = 3 ;
 	}
+#10 metre convective gust of at least 25 m/s
+'10cogug25' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfLowerLimit = 25 ;
+	 scaleFactorOfLowerLimit = 0 ;
+	 probabilityType = 3 ;
+	}
 #Probability of temperature standardized anomaly greater than 1 standard deviation
 'ptsa_gt_1stdev' = {
 	 discipline = 0 ;
@@ -1619,6 +1631,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean peak wave period of wind waves
+'avg_pp1dw' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of total swell
+'avg_pp1ds' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of first swell partition
+'avg_pp1d1' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of second swell partition
+'avg_pp1d2' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of third swell partition
+'avg_pp1d3' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction (total)
+'avg_pwd' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of wind waves
+'avg_pwdw' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of total swell
+'avg_pwds' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of first swell partition
+'avg_pwd1' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of second swell partition
+'avg_pwd2' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of third swell partition
+'avg_pwd3' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean whitecap fraction
+'avg_wcfr' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean wave Spectral Skewness
 'avg_wss' = {
 	 discipline = 10 ;
@@ -2084,6 +2180,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Time-maximum peak wave period of wind waves
+'max_pp1dw' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of total swell
+'max_pp1ds' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of first swell partition
+'max_pp1d1' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of second swell partition
+'max_pp1d2' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of third swell partition
+'max_pp1d3' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction (total)
+'max_pwd' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of wind waves
+'max_pwdw' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of total swell
+'max_pwds' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of first swell partition
+'max_pwd1' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of second swell partition
+'max_pwd2' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of third swell partition
+'max_pwd3' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum whitecap fraction
+'max_wcfr' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
 #Time-maximum wave Spectral Skewness
 'max_wss' = {
 	 discipline = 10 ;
@@ -2549,6 +2729,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 3 ;
 	}
+#Time-minimum peak wave period of wind waves
+'min_pp1dw' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of total swell
+'min_pp1ds' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of first swell partition
+'min_pp1d1' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of second swell partition
+'min_pp1d2' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of third swell partition
+'min_pp1d3' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction (total)
+'min_pwd' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of wind waves
+'min_pwdw' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of total swell
+'min_pwds' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of first swell partition
+'min_pwd1' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of second swell partition
+'min_pwd2' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of third swell partition
+'min_pwd3' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum whitecap fraction
+'min_wcfr' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
 #Time-minimum wave Spectral Skewness
 'min_wss' = {
 	 discipline = 10 ;
@@ -3014,6 +3278,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 6 ;
 	}
+#Time-standard-deviation peak wave period of wind waves
+'std_pp1dw' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of total swell
+'std_pp1ds' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of first swell partition
+'std_pp1d1' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of second swell partition
+'std_pp1d2' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of third swell partition
+'std_pp1d3' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction (total)
+'std_pwd' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of wind waves
+'std_pwdw' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of total swell
+'std_pwds' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of first swell partition
+'std_pwd1' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of second swell partition
+'std_pwd2' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of third swell partition
+'std_pwd3' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation whitecap fraction
+'std_wcfr' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
 #Time-standard-deviation wave Spectral Skewness
 'std_wss' = {
 	 discipline = 10 ;
@@ -3742,6 +4090,13 @@
 	 typeOfGeneratingProcess = 20 ;
 	 is_aerosol = 1 ;
 	}
+#Cosine of solar zenith angle
+'cossza' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
 #Dry deposition of ammonium aerosol
 'aerddpam' = {
 	 discipline = 0 ;
@@ -6794,7 +7149,7 @@
 	 typeOfStatisticalProcessing = 0 ;
 	}
 #Time-mean top net long-wave radiation flux, clear sky
-'avg_tnlwrcs' = {
+'avg_tnlwrfcs' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 6 ;
@@ -6810,7 +7165,7 @@
 	 typeOfStatisticalProcessing = 0 ;
 	}
 #Time-mean surface net long-wave radiation flux, clear sky
-'avg_snlwrcs' = {
+'avg_snlwrfcs' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 6 ;
@@ -8113,6 +8468,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean cosine of solar zenith angle
+'avg_cossza' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean freezing rain precipitation rate
 'avg_fprate' = {
 	 discipline = 0 ;
@@ -8488,6 +8851,58 @@
 	 parameterNumber = 51 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean land surface heat net flux
+'avg_lshnf' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean surface direct normal short-wave radiation flux, clear sky
+'avg_sdirnswrfcs' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean 10 metre convective gust
+'avg_10cogu' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean 10 metre turbulent gust
+'avg_10tugu' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-integrated land surface heat net flux
+'acc_lshnf' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated surface direct normal short-wave radiation flux, clear sky
+'acc_sdirnswrfcs' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Time-maximum temperature tendency due to short-wave radiation
 'max_ttswr' = {
 	 discipline = 0 ;
@@ -8800,7 +9215,7 @@
 	 typeOfStatisticalProcessing = 2 ;
 	}
 #Time-maximum top net long-wave radiation flux, clear sky
-'max_tnlwrcs' = {
+'max_tnlwrfcs' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 6 ;
@@ -8816,7 +9231,7 @@
 	 typeOfStatisticalProcessing = 2 ;
 	}
 #Time-maximum surface net long-wave radiation flux, clear sky
-'max_snlwrcs' = {
+'max_snlwrfcs' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 6 ;
@@ -9883,6 +10298,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Time-maximum cosine of solar zenith angle
+'max_cossza' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
 #Time-maximum freezing rain precipitation rate
 'max_fprate' = {
 	 discipline = 0 ;
@@ -10258,6 +10681,42 @@
 	 parameterNumber = 51 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Time-maximum land surface heat net flux
+'max_lshnf' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum surface direct normal short-wave radiation flux, clear sky
+'max_sdirnswrfcs' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum 10 metre convective gust
+'max_10cogu' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum 10 metre turbulent gust
+'max_10tugu' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
 #Time-minimum temperature tendency due to short-wave radiation
 'min_ttswr' = {
 	 discipline = 0 ;
@@ -10570,7 +11029,7 @@
 	 typeOfStatisticalProcessing = 3 ;
 	}
 #Time-minimum top net long-wave radiation flux, clear sky
-'min_tnlwrcs' = {
+'min_tnlwrfcs' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 6 ;
@@ -10586,7 +11045,7 @@
 	 typeOfStatisticalProcessing = 3 ;
 	}
 #Time-minimum surface net long-wave radiation flux, clear sky
-'min_snlwrcs' = {
+'min_snlwrfcs' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 6 ;
@@ -11681,6 +12140,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 3 ;
 	}
+#Time-minimum cosine of solar zenith angle
+'min_cossza' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
 #Time-minimum freezing rain rate water equivalent
 'min_fprate' = {
 	 discipline = 0 ;
@@ -12056,6 +12523,42 @@
 	 parameterNumber = 51 ;
 	 typeOfStatisticalProcessing = 3 ;
 	}
+#Time-minimum land surface heat net flux
+'min_lshnf' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum surface direct normal short-wave radiation flux, clear sky
+'min_sdirnswrfcs' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum 10 metre convective gust
+'min_10cogu' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum 10 metre turbulent gust
+'min_10tugu' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
 #Time-standard-deviation temperature tendency due to short-wave radiation
 'std_ttswr' = {
 	 discipline = 0 ;
@@ -12368,7 +12871,7 @@
 	 typeOfStatisticalProcessing = 6 ;
 	}
 #Time-standard-deviation top net long-wave radiation flux, clear sky
-'std_tnlwrcs' = {
+'std_tnlwrfcs' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 6 ;
@@ -12384,7 +12887,7 @@
 	 typeOfStatisticalProcessing = 6 ;
 	}
 #Time-standard-deviation surface net long-wave radiation flux, clear sky
-'std_snlwrcs' = {
+'std_snlwrfcs' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 6 ;
@@ -13487,6 +13990,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 6 ;
 	}
+#Time-standard-deviation cosine of solar zenith angle
+'std_cossza' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
 #Time-standard-deviation freezing rain rate water equivalent
 'std_fprate' = {
 	 discipline = 0 ;
@@ -13855,6 +14366,42 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 6 ;
 	}
+#Time-standard-deviation land surface heat net flux
+'std_lshnf' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation surface direct normal short-wave radiation flux, clear sky
+'std_sdirnswrfcs' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 10 metre convective gust
+'std_10cogu' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 10 metre turbulent gust
+'std_10tugu' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
 #Cross sectional area of flow in channel
 'chcross' = {
 	 discipline = 1 ;
@@ -14623,7 +15170,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	}
 #Surface net long-wave radiation flux, clear sky
-'snlwrcs' = {
+'snlwrfcs' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 6 ;
@@ -16072,7 +16619,7 @@
 	 typeOfFirstFixedSurface = 8 ;
 	}
 #Top net long-wave radiation flux, clear sky
-'tnlwrcs' = {
+'tnlwrfcs' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 6 ;
@@ -16120,6 +16667,38 @@
 	 parameterNumber = 67 ;
 	 typeOfFirstFixedSurface = 1 ;
 	}
+#Land surface heat net flux
+'lshnf' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Surface direct normal short-wave radiation flux, clear sky
+'sdirnswrfcs' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#10 metre convective gust
+'10cogu' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#10 metre turbulent gust
+'10tugu' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
 #Universal thermal climate index
 'utci' = {
 	 discipline = 20 ;
@@ -17194,6 +17773,22 @@
 	 typeOfFirstFixedSurface = 168 ;
 	 typeOfSecondFixedSurface = 168 ;
 	}
+#Northward mass transport
+'mtn' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 46 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	}
+#Eastward mass transport
+'mte' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 47 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	}
 #Net short wave radiation rate at sea surface
 'ssr_sea' = {
 	 discipline = 0 ;
@@ -18339,6 +18934,24 @@
 	 typeOfSecondFixedSurface = 168 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean northward mass transport
+'avg_mtn' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 46 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean eastward mass transport
+'avg_mte' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 47 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean net short wave radiation rate at sea surface
 'avg_ssr_sea' = {
 	 discipline = 0 ;
@@ -18898,14 +19511,12 @@
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 107 ;
-	 typeOfFirstFixedSurface = 8 ;
 	}
 #Aerosol backscatter from ground
 'aerbscatgnd' = {
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 108 ;
-	 typeOfFirstFixedSurface = 1 ;
 	}
 #Aerosol extinction coefficient
 'aerext' = {
@@ -18915,26 +19526,26 @@
 	}
 #Mass mixing ratio difference
 'mass_mixrat_diff' = {
-         discipline = 0 ;
-         parameterCategory = 20 ;
-         parameterNumber = 2 ;
-         typeOfGeneratingProcess = 20 ;
-        }
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 2 ;
+	 typeOfGeneratingProcess = 20 ;
+	}
 #Mass mixing ratio from volcanoes difference
 'mass_mixrat_vol_diff' = {
-         discipline = 0 ;
-         parameterCategory = 20 ;
-         parameterNumber = 2 ;
-         sourceSinkChemicalPhysicalProcess = 7 ;
-         typeOfGeneratingProcess = 20 ;
-        }
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 2 ;
+	 typeOfGeneratingProcess = 20 ;
+	 sourceSinkChemicalPhysicalProcess = 7 ;
+	}
 #Emission mass flux from wild fires
 'emi_mflx_wfire' = {
-         discipline = 0 ;
-         parameterCategory = 20 ;
-         parameterNumber = 77 ;
-         sourceSinkChemicalPhysicalProcess = 5 ;
-        }
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 5 ;
+	}
 #Pressure tendency
 'ptend' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/tables/1.0.table b/definitions/grib2/tables/1.0.table
index 432c0f0e5..1038dc72d 100644
--- a/definitions/grib2/tables/1.0.table
+++ b/definitions/grib2/tables/1.0.table
@@ -33,6 +33,7 @@
 31 31 Version implemented on 15 May 2023
 32 32 Version implemented on 30 November 2023
 33 33 Version implemented on 15 May 2024
-34 34 Pre-operational to be implemented by next amendment
-# 35-254 Future versions
+34 34 Version implemented on 18 November 2024
+35 35 Pre-operational to be implemented by next amendment
+# 36-254 Future versions
 255 255 Master tables not used. Local table entries and local templates may use the entire range of the table, not just those sections marked Reserved for local used.
diff --git a/definitions/grib2/tables/34/0.0.table b/definitions/grib2/tables/34/0.0.table
new file mode 100644
index 000000000..a8542e94f
--- /dev/null
+++ b/definitions/grib2/tables/34/0.0.table
@@ -0,0 +1,13 @@
+# Code table 0.0 - Discipline of processed data in the GRIB message, number of GRIB Master table
+0 0 Meteorological products
+1 1 Hydrological products
+2 2 Land surface products
+3 3 Satellite remote sensing products (formerly Space products)
+4 4 Space weather products
+# 5-9 Reserved
+10 10 Oceanographic products
+# 11-19 Reserved
+20 20 Health and socioeconomic impacts
+# 21-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/1.0.table b/definitions/grib2/tables/34/1.0.table
new file mode 100644
index 000000000..a9a0a11c0
--- /dev/null
+++ b/definitions/grib2/tables/34/1.0.table
@@ -0,0 +1,39 @@
+# Code table 1.0 - GRIB master tables version number
+0 0 Experimental
+1 1 Version implemented on 7 November 2001
+2 2 Version implemented on 4 November 2003
+3 3 Version implemented on 2 November 2005
+4 4 Version implemented on 7 November 2007
+5 5 Version implemented on 4 November 2009
+6 6 Version implemented on 15 September 2010
+7 7 Version implemented on 4 May 2011
+8 8 Version implemented on 2 November 2011
+9 9 Version implemented on 2 May 2012
+10 10 Version implemented on 7 November 2012
+11 11 Version implemented on 8 May 2013
+12 12 Version implemented on 14 November 2013
+13 13 Version implemented on 7 May 2014
+14 14 Version implemented on 5 November 2014
+15 15 Version implemented on 6 May 2015
+16 16 Version implemented on 11 November 2015
+17 17 Version implemented on 4 May 2016
+18 18 Version implemented on 2 November 2016
+19 19 Version implemented on 3 May 2017
+20 20 Version implemented on 8 November 2017
+21 21 Version implemented on 2 May 2018
+22 22 Version implemented on 7 November 2018
+23 23 Version implemented on 15 May 2019
+24 24 Version implemented on 6 November 2019
+25 25 Version implemented on 6 May 2020
+26 26 Version implemented on 16 November 2020
+27 27 Version implemented on 15 June 2021
+28 28 Version implemented on 15 November 2021
+29 29 Version implemented on 15 May 2022
+30 30 Version implemented on 15 November 2022
+31 31 Version implemented on 15 May 2023
+32 32 Version implemented on 30 November 2023
+33 33 Version implemented on 15 May 2024
+34 34 Version implemented on 18 November 2024
+35 35 Pre-operational to be implemented by next amendment
+# 36-254 Future versions
+255 255 Missing
diff --git a/definitions/grib2/tables/34/1.1.table b/definitions/grib2/tables/34/1.1.table
new file mode 100644
index 000000000..f6d332005
--- /dev/null
+++ b/definitions/grib2/tables/34/1.1.table
@@ -0,0 +1,4 @@
+# Code table 1.1 - GRIB local tables version number
+0 0 Local tables not used. Only table entries and templates from the current master table are valid
+# 1-254 Number of local tables version used
+255 255 Missing
diff --git a/definitions/grib2/tables/34/1.2.table b/definitions/grib2/tables/34/1.2.table
new file mode 100644
index 000000000..05ec48c5d
--- /dev/null
+++ b/definitions/grib2/tables/34/1.2.table
@@ -0,0 +1,10 @@
+# Code table 1.2 - Significance of reference time
+0 0 Analysis
+1 1 Start of forecast
+2 2 Verifying time of forecast
+3 3 Observation time
+4 4 Local time
+5 5 Simulation start
+# 6-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/1.3.table b/definitions/grib2/tables/34/1.3.table
new file mode 100644
index 000000000..88c033e42
--- /dev/null
+++ b/definitions/grib2/tables/34/1.3.table
@@ -0,0 +1,18 @@
+# Code table 1.3 - Production status of data
+0 0 Operational products
+1 1 Operational test products
+2 2 Research products
+3 3 Re-analysis products
+4 4 THORPEX Interactive Grand Global Ensemble (TIGGE)
+5 5 THORPEX Interactive Grand Global Ensemble test (TIGGE)
+6 6 S2S operational products
+7 7 S2S test products
+8 8 Uncertainties in Ensembles of Regional ReAnalyses project (UERRA)
+9 9 Uncertainties in Ensembles of Regional ReAnalyses project test (UERRA)
+10 10 Copernicus regional reanalysis (CARRA/CERRA)
+11 11 Copernicus regional reanalysis test (CARRA/CERRA)
+12 12 Destination Earth
+13 13 Destination Earth test
+# 14-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/1.4.table b/definitions/grib2/tables/34/1.4.table
new file mode 100644
index 000000000..d8b1e2336
--- /dev/null
+++ b/definitions/grib2/tables/34/1.4.table
@@ -0,0 +1,15 @@
+# Code table 1.4 - Type of data
+0 an Analysis products
+1 fc Forecast products
+2 af Analysis and forecast products
+3 cf Control forecast products
+4 pf Perturbed forecast products
+5 cp Control and perturbed forecast products
+6 sa Processed satellite observations
+7 ra Processed radar observations
+8 ep Event probability
+9 9 Experimental data
+10 10 ML based forecast
+# 11-191 Reserved
+# 192-254 Reserved for local use
+255 missing Missing
diff --git a/definitions/grib2/tables/34/1.5.table b/definitions/grib2/tables/34/1.5.table
new file mode 100644
index 000000000..533111959
--- /dev/null
+++ b/definitions/grib2/tables/34/1.5.table
@@ -0,0 +1,7 @@
+# Code table 1.5 - Identification template number
+0 0 Calendar definition
+1 1 Paleontological offset
+2 2 Calendar definition and paleontological offset
+# 3-32767 Reserved
+# 32768-65534 Reserved for local use
+65535 65535 Missing
diff --git a/definitions/grib2/tables/34/1.6.table b/definitions/grib2/tables/34/1.6.table
new file mode 100644
index 000000000..bd46899a7
--- /dev/null
+++ b/definitions/grib2/tables/34/1.6.table
@@ -0,0 +1,8 @@
+# Code table 1.6 - Type of calendar
+0 0 Gregorian
+1 1 360-day
+2 2 365-day
+3 3 Proleptic Gregorian
+# 4-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/3.0.table b/definitions/grib2/tables/34/3.0.table
new file mode 100644
index 000000000..a442a06a0
--- /dev/null
+++ b/definitions/grib2/tables/34/3.0.table
@@ -0,0 +1,6 @@
+# Code table 3.0 - Source of grid definition
+0 0 Specified in Code table 3.1
+1 1 Predetermined grid definition (Defined by originating centre)
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 A grid definition does not apply to this product
diff --git a/definitions/grib2/tables/34/3.1.table b/definitions/grib2/tables/34/3.1.table
new file mode 100644
index 000000000..26dc8da3f
--- /dev/null
+++ b/definitions/grib2/tables/34/3.1.table
@@ -0,0 +1,57 @@
+# Code table 3.1 - Grid definition template number
+0 0 Latitude/longitude (Also called equidistant cylindrical, or Plate Carree)
+1 1 Rotated latitude/longitude
+2 2 Stretched latitude/longitude
+3 3 Stretched and rotated latitude/longitude
+4 4 Variable resolution latitude/longitude
+5 5 Variable resolution rotated latitude/longitude
+# 6-9 Reserved
+10 10 Mercator
+# 11 Reserved
+12 12 Transverse Mercator
+13 13 Mercator with modelling subdomains definition
+# 14-19 Reserved
+20 20 Polar stereographic projection (Can be south or north)
+# 21-22 Reserved
+23 23 Polar stereographic with modelling subdomains definition
+# 24-29 Reserved
+30 30 Lambert conformal (Can be secant or tangent, conical or bipolar)
+31 31 Albers equal area
+# 32 Reserved
+33 33 Lambert conformal with modelling subdomains definition
+# 34-39 Reserved
+40 40 Gaussian latitude/longitude
+41 41 Rotated Gaussian latitude/longitude
+42 42 Stretched Gaussian latitude/longitude
+43 43 Stretched and rotated Gaussian latitude/longitude
+# 44-49 Reserved
+50 50 Spherical harmonic coefficients
+51 51 Rotated spherical harmonic coefficients
+52 52 Stretched spherical harmonic coefficients
+53 53 Stretched and rotated spherical harmonic coefficients
+# 54-60 Reserved
+61 61 Spectral Mercator with modelling subdomains definition
+62 62 Spectral polar stereographic with modelling subdomains definition
+63 63 Spectral Lambert conformal with modelling subdomains definition
+# 64-89 Reserved
+90 90 Space view perspective or orthographic
+# 91-99 Reserved
+100 100 Triangular grid based on an icosahedron
+101 101 General unstructured grid
+# 102-109 Reserved
+110 110 Equatorial azimuthal equidistant projection
+# 111-119 Reserved
+120 120 Azimuth-range projection
+# 121-139 Reserved
+140 140 Lambert azimuthal equal area projection
+# 141-149 Reserved
+150 150 Hierarchical Equal Area isoLatitude Pixelization grid (HEALPix)
+# 151-999 Reserved
+1000 1000 Cross-section grid with points equally spaced on the horizontal
+# 1001-1099 Reserved
+1100 1100 Hovmoller diagram grid with points equally spaced on the horizontal
+# 1101-1199 Reserved
+1200 1200 Time section grid
+# 1201-32767 Reserved
+# 32768-65534 Reserved for local use
+65535 65535 Missing
diff --git a/definitions/grib2/tables/34/3.10.table b/definitions/grib2/tables/34/3.10.table
new file mode 100644
index 000000000..1612d05e3
--- /dev/null
+++ b/definitions/grib2/tables/34/3.10.table
@@ -0,0 +1,8 @@
+# Flag table 3.10 - Scanning mode for one diamond
+1 0 Points scan in +i direction, i.e. from pole to Equator
+1 1 Points scan in -i direction, i.e. from Equator to pole
+2 0 Points scan in +j direction, i.e. from west to east
+2 1 Points scan in -j direction, i.e. from east to west
+3 0 Adjacent points in i direction are consecutive
+3 1 Adjacent points in j direction are consecutive
+# 4-8 Reserved
diff --git a/definitions/grib2/tables/34/3.11.table b/definitions/grib2/tables/34/3.11.table
new file mode 100644
index 000000000..06ae10810
--- /dev/null
+++ b/definitions/grib2/tables/34/3.11.table
@@ -0,0 +1,7 @@
+# Code table 3.11 - Interpretation of list of numbers at end of section 3
+0 0 There is no appended list
+1 1 Numbers define number of points corresponding to full coordinate circles (i.e. parallels), coordinate values on each circle are multiple of the circle mesh, and extreme coordinate values given in grid definition (i.e. extreme longitudes) may not be reached in all rows
+2 2 Numbers define number of points corresponding to coordinate lines delimited by extreme coordinate values given in grid definition (i.e. extreme longitudes) which are present in each row
+3 3 Numbers define the actual latitudes for each row in the grid. The list of numbers are integer values of the valid latitudes in microdegrees (scaled by 10-6) or in unit equal to the ratio of the basic angle and the subdivisions number for each row, in the same order as specified in the scanning mode flag (bit no. 2)
+# 4-254 Reserved
+255 255 Missing
diff --git a/definitions/grib2/tables/34/3.12.table b/definitions/grib2/tables/34/3.12.table
new file mode 100644
index 000000000..7d4757100
--- /dev/null
+++ b/definitions/grib2/tables/34/3.12.table
@@ -0,0 +1,6 @@
+# Code table 3.12 - HEALPix rhomboids or points ordering
+0 0 Ring ordering
+1 1 Nested ordering
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/3.13.table b/definitions/grib2/tables/34/3.13.table
new file mode 100644
index 000000000..aabe4fc03
--- /dev/null
+++ b/definitions/grib2/tables/34/3.13.table
@@ -0,0 +1,8 @@
+# Flag table 3.13 - HEALPix scanning mode
+1 0 Points scan in +i (+x) direction
+1 1 Points scan in -i (-x) direction
+2 0 Points scan in -j (-y) direction
+2 1 Points scan in +j (+y) direction
+3 0 Adjacent points in i (x) direction are consecutive
+3 1 Adjacent points in j (y) direction are consecutive
+# 4-8 Reserved
diff --git a/definitions/grib2/tables/34/3.15.table b/definitions/grib2/tables/34/3.15.table
new file mode 100644
index 000000000..43539dbfc
--- /dev/null
+++ b/definitions/grib2/tables/34/3.15.table
@@ -0,0 +1,23 @@
+# Code table 3.15 - Physical meaning of vertical coordinate
+# 0-19 Reserved
+20 20 Temperature (K)
+# 21-99 Reserved
+100 100 Pressure (Pa)
+101 101 Pressure deviation from mean sea level (Pa)
+102 102 Altitude above mean sea level (m)
+103 103 Height above ground (m)
+104 104 Sigma coordinate
+105 105 Hybrid coordinate
+106 106 Depth below land surface (m)
+107 pt Potential temperature (theta) (K)
+108 108 Pressure deviation from ground to level (Pa)
+109 pv Potential vorticity (K m2 kg-1 s-1)
+110 110 Geometrical height (m)
+111 111 Eta coordinate
+112 112 Geopotential height (gpm)
+113 113 Logarithmic hybrid coordinate
+# 114-159 Reserved
+160 160 Depth below sea level (m)
+# 161-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/3.2.table b/definitions/grib2/tables/34/3.2.table
new file mode 100644
index 000000000..13b9bf469
--- /dev/null
+++ b/definitions/grib2/tables/34/3.2.table
@@ -0,0 +1,16 @@
+# Code table 3.2 - Shape of the reference system
+0 0 Earth assumed spherical with radius = 6 367 470.0 m
+1 1 Earth assumed spherical with radius specified (in m) by data producer
+2 2 Earth assumed oblate spheroid with size as determined by IAU in 1965 (major axis = 6 378 160.0 m, minor axis = 6 356 775.0 m, f = 1/297.0)
+3 3 Earth assumed oblate spheroid with major and minor axes specified (in km) by data producer
+4 4 Earth assumed oblate spheroid as defined in IAG-GRS80 model (major axis = 6 378 137.0 m, minor axis = 6 356 752.314 m, f = 1/298.257 222 101)
+5 5 Earth assumed represented by WGS-84 (as used by ICAO since 1998)
+6 6 Earth assumed spherical with radius of 6 371 229.0 m
+7 7 Earth assumed oblate spheroid with major or minor axes specified (in m) by data producer
+8 8 Earth model assumed spherical with radius of 6 371 200 m, but the horizontal datum of the resulting latitude/longitude field is the WGS-84 reference frame
+9 9 Earth represented by the Ordnance Survey Great Britain 1936 Datum, using the Airy 1830 Spheroid, the Greenwich meridian as 0 longitude, and the Newlyn datum as mean sea level, 0 height
+10 10 Earth model assumed WGS84 with corrected geomagnetic coordinates (latitude and longitude) defined by Gustafsson et al., 1992
+11 11 Sun assumed spherical with radius = 695 990 000 m (Allen, C.W., Astrophysical Quantities, 3rd ed.; Athlone: London, 1976) and Stonyhurst latitude and longitude system with origin at the intersection of the solar central meridian (as seen from Earth) and the solar equator (Thompson, W., Coordinate systems for solar image data, Astron. Astrophys. 2006, 449, 791-803)
+# 12-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/3.20.table b/definitions/grib2/tables/34/3.20.table
new file mode 100644
index 000000000..e2bb156ee
--- /dev/null
+++ b/definitions/grib2/tables/34/3.20.table
@@ -0,0 +1,6 @@
+# Code table 3.20 - Type of horizontal line
+0 0 Rhumb
+1 1 Great circle
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/3.21.table b/definitions/grib2/tables/34/3.21.table
new file mode 100644
index 000000000..e001e1c8f
--- /dev/null
+++ b/definitions/grib2/tables/34/3.21.table
@@ -0,0 +1,8 @@
+# Code table 3.21 - Vertical dimension coordinate values definition
+0 0 Explicit coordinate values set
+1 1 Linear coordinates f(1) = C1, f(n) = f(n-1) + C2
+# 2-10 Reserved
+11 11 Geometric coordinates f(1) = C1, f(n) = C2 * f(n-1)
+# 12-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/3.25.table b/definitions/grib2/tables/34/3.25.table
new file mode 100644
index 000000000..e5a754994
--- /dev/null
+++ b/definitions/grib2/tables/34/3.25.table
@@ -0,0 +1,10 @@
+# Code table 3.25 - Type of bi-Fourier truncation
+# 0-76 Reserved
+77 77 Rectangular
+# 78-87 Reserved
+88 88 Elliptic
+# 89-98 Reserved
+99 99 Diamond
+# 100-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/3.3.table b/definitions/grib2/tables/34/3.3.table
new file mode 100644
index 000000000..25cb46a1d
--- /dev/null
+++ b/definitions/grib2/tables/34/3.3.table
@@ -0,0 +1,9 @@
+# Flag table 3.3 - Resolution and component flags
+# 1-2 Reserved
+3 0 i direction increments not given
+3 1 i direction increments given
+4 0 j direction increments not given
+4 1 j direction increments given
+5 0 Resolved u- and v- components of vector quantities relative to easterly and northerly directions
+5 1 Resolved u- and v- components of vector quantities relative to the defined grid in the direction of increasing x and y (or i and j) coordinates, respectively
+# 6-8 Reserved - set to zero
diff --git a/definitions/grib2/tables/34/3.4.table b/definitions/grib2/tables/34/3.4.table
new file mode 100644
index 000000000..0f9d84464
--- /dev/null
+++ b/definitions/grib2/tables/34/3.4.table
@@ -0,0 +1,17 @@
+# Flag table 3.4 - Scanning mode
+1 0 Points of first row or column scan in the +i (+x) direction
+1 1 Points of first row or column scan in the -i (-x) direction
+2 0 Points of first row or column scan in the -j (-y) direction
+2 1 Points of first row or column scan in the +j (+y) direction
+3 0 Adjacent points in i (x) direction are consecutive
+3 1 Adjacent points in j (y) direction are consecutive
+4 0 All rows scan in the same direction
+4 1 Adjacent rows scan in the opposite direction
+5 0 Points within odd rows are not offset in i (x) direction
+5 1 Points within odd rows are offset by Di/2 in i (x) direction
+6 0 Points within even rows are not offset in i (x) direction
+6 1 Points within even rows are offset by Di/2 in i (x) direction
+7 0 Points are not offset in j (y) direction
+7 1 Points are offset by Dj/2 in j (y) direction
+8 0 Rows have Ni grid points and columns have Nj grid points
+8 1 Rows have Ni grid points if points are not offset in i direction  Rows have Ni-1 grid points if points are offset by Di/2 in i direction  Columns have Nj grid points if points are not offset in j direction  Columns have Nj-1 grid points if points are offset by Dj/2 in j direction
diff --git a/definitions/grib2/tables/34/3.5.table b/definitions/grib2/tables/34/3.5.table
new file mode 100644
index 000000000..2f8ec82e3
--- /dev/null
+++ b/definitions/grib2/tables/34/3.5.table
@@ -0,0 +1,5 @@
+# Flag table 3.5 - Projection centre
+1 0 North Pole is on the projection plane
+1 1 South Pole is on the projection plane
+2 0 Only one projection centre is used
+2 1 Projection is bipolar and symmetric
diff --git a/definitions/grib2/tables/34/3.6.table b/definitions/grib2/tables/34/3.6.table
new file mode 100644
index 000000000..5ab13aaa5
--- /dev/null
+++ b/definitions/grib2/tables/34/3.6.table
@@ -0,0 +1,3 @@
+# Code table 3.6 - Spectral data representation type
+1 1 see separate doc or pdf file
+2 2 Bi-Fourier representation
diff --git a/definitions/grib2/tables/34/3.7.table b/definitions/grib2/tables/34/3.7.table
new file mode 100644
index 000000000..34c0de085
--- /dev/null
+++ b/definitions/grib2/tables/34/3.7.table
@@ -0,0 +1,5 @@
+# Code table 3.7 - Spectral data representation mode
+0 0 Reserved
+1 1 see separate doc or pdf file
+# 2-254 Reserved
+255 255 Missing
diff --git a/definitions/grib2/tables/34/3.8.table b/definitions/grib2/tables/34/3.8.table
new file mode 100644
index 000000000..fcd17dca8
--- /dev/null
+++ b/definitions/grib2/tables/34/3.8.table
@@ -0,0 +1,10 @@
+# Code table 3.8 - Grid point position
+0 0 Grid points at triangle vertices
+1 1 Grid points at centres of triangles
+2 2 Grid points at midpoints of triangle sides
+3 3 Grid points at shape vertices
+4 4 Grid points at centre of shapes
+5 5 Grid points at midpoints of shape sides
+# 6-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/3.9.table b/definitions/grib2/tables/34/3.9.table
new file mode 100644
index 000000000..ecd65514a
--- /dev/null
+++ b/definitions/grib2/tables/34/3.9.table
@@ -0,0 +1,4 @@
+# Flag table 3.9 - Numbering order of diamonds as seen from the corresponding pole
+1 0 Clockwise orientation
+1 1 Anti-clockwise (i.e. counter-clockwise) orientation
+# 2-8 Reserved
diff --git a/definitions/grib2/tables/34/4.0.table b/definitions/grib2/tables/34/4.0.table
new file mode 100644
index 000000000..0113bb8d1
--- /dev/null
+++ b/definitions/grib2/tables/34/4.0.table
@@ -0,0 +1,133 @@
+# Code table 4.0 - Product definition template number
+0 0 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time
+1 1 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time
+2 2 Derived forecasts based on all ensemble members at a horizontal level or in a horizontal layer at a point in time
+3 3 Derived forecasts based on a cluster of ensemble members over a rectangular area at a horizontal level or in a horizontal layer at a point in time
+4 4 Derived forecasts based on a cluster of ensemble members over a circular area at a horizontal level or in a horizontal layer at a point in time
+5 5 Probability forecasts at a horizontal level or in a horizontal layer at a point in time
+6 6 Percentile forecasts at a horizontal level or in a horizontal layer at a point in time
+7 7 Analysis or forecast error at a horizontal level or in a horizontal layer at a point in time
+8 8 Average, accumulation, extreme values or other statistically processed values at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+9 9 Probability forecasts at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+10 10 Percentile forecasts at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+11 11 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval
+12 12 Derived forecasts based on all ensemble members at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval
+13 13 Derived forecasts based on a cluster of ensemble members over a rectangular area, at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval
+14 14 Derived forecasts based on a cluster of ensemble members over a circular area, at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval
+15 15 Average, accumulation, extreme values or other statistically processed values over a spatial area at a horizontal level or in a horizontal layer at a point in time
+# 16-19 Reserved
+20 20 Radar product
+# 21-29 Reserved
+30 30 Satellite product (deprecated)
+31 31 Satellite product
+32 32 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for simulated (synthetic) satellite data
+33 33 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for simulated (synthetic) satellite data
+34 34 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval for simulated (synthetic) satellite data
+35 35 Satellite product with or without associated quality values
+# 36-39 Reserved
+40 40 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents
+41 41 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents
+42 42 Average, accumulation, and/or extreme values or other statistically processed values at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for atmospheric chemical constituents
+43 43 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for atmospheric chemical constituents
+44 44 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for aerosol (deprecated)
+45 45 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for aerosol
+46 46 Average, accumulation, and/or extreme values or other statistically processed values at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for aerosol
+47 47 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for aerosol
+48 48 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for optical properties of aerosol
+49 49 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for optical properties of aerosol
+50 50 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for aerosol
+51 51 Categorical forecasts at a horizontal level or in a horizontal layer at a point in time
+# 52 Reserved
+53 53 Partitioned parameters at a horizontal level or in a horizontal layer at a point in time
+54 54 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for partitioned parameters
+55 55 Spatio-temporal changing tiles at a horizontal level or horizontal layer at a point in time
+56 56 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for spatio-temporal changing tile parameters (deprecated)
+57 57 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents based on a distribution function
+58 58 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents based on a distribution function
+59 59 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for spatio-temporal changing tile parameters (corrected version of template 4.56)
+60 60 Individual ensemble reforecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time
+61 61 Individual ensemble reforecast, control and perturbed, at a horizontal level or in a horizontal layer, in a continuous or non-continuous time interval
+62 62 Average, accumulation, and/or extreme values or other statistically processed values at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for spatio-temporal changing tiles at a horizontal level or horizontal layer at a point in time
+63 63 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for spatio-temporal changing tiles
+# 64-66 Reserved
+67 67 Average, accumulation, and/or extreme values or other statistically processed values at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for atmospheric chemical constituents based on a distribution function
+68 68 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for atmospheric chemical constituents based on a distribution function
+# 69 Reserved
+70 70 Post-processing analysis or forecast at a horizontal level or in a horizontal layer at a point in time
+71 71 Post-processing individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time
+72 72 Post-processing average, accumulation, extreme values or other statistically processed values at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+73 73 Post-processing individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer, in a continuous or non-continuous time interval
+# 74-75 Reserved
+76 76 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents with source or sink
+77 77 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents with source or sink
+78 78 Average, accumulation, and/or extreme values or other statistically processed values at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for atmospheric chemical constituents with source or sink
+79 79 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for atmospheric chemical constituents with source or sink
+80 80 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for optical properties of aerosol with source or sink
+81 81 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for optical properties of aerosol with source or sink
+82 82 Average, accumulation, and/or extreme values or other statistically processed values at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for aerosol with source or sink
+83 83 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for aerosol with source or sink
+84 84 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for aerosol with source or sink
+85 85 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for aerosol
+86 86 Quantile forecasts at a horizontal level or in a horizontal layer at a point in time
+87 87 Quantile forecasts at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+88 88 Analysis or forecast at a horizontal level or in a horizontal layer at a specified local time
+89 89 Post-processed quantile forecasts at a horizontal level or in a horizontal layer at a point in time
+90 90 Post-processed quantile forecasts at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+91 91 Categorical forecasts at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+92 92 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a specified local time
+93 93 Post-processing analysis or forecast at a horizontal level or in a horizontal layer at a specified local time
+94 94 Post-processing individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a specified local time
+95 95 Average, accumulation, extreme values or other statistically processed value at a horizontal level or in a horizontal layer at a specified local time
+96 96 Average, accumulation, extreme values or other statistically processed values of an individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a specified local time
+97 97 Average, accumulation, extreme values or other statistically processed values of post-processing analysis or forecast at a horizontal level or in a horizontal layer at a specified local time
+98 98 Average, accumulation, extreme values or other statistically processed values of a post-processing individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a specified local time
+99 99 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for wave 2D spectra with explicit list of frequencies and directions
+100 100 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for wave 2D spectra with explicit list of frequencies and directions
+101 101 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for wave 2D spectra with frequencies and directions defined by formulae
+102 102 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for wave 2D spectra with frequencies and directions defined by formulae
+103 103 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for waves selected by period range
+104 104 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for waves selected by period range
+105 105 Anomalies, significance and other derived products from an analysis or forecast in relation to a reference period at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+106 106 Anomalies, significance and other derived products from an individual ensemble forecast, control and perturbed in relation to a reference period at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+107 107 Anomalies, significance and other derived products from derived forecasts based on all ensemble members in relation to a reference period at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+108 108 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for generic optical products
+109 109 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for generic optical products
+110 110 Average, accumulation, extreme values or other statistically processed values at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for generic optical products
+111 111 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval for generic optical products
+112 112 Anomalies, significance and other derived products as probability forecasts in relation to a reference period at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+113 113 Generalised tiles at a horizontal level or horizontal layer at a point in time
+114 114 Average, accumulation, and/or extreme values or other statistically processed values on generalised tiles at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+115 115 Individual ensemble forecast, control and perturbed on generalised tiles at a horizontal level or in a horizontal layer at a point in time
+116 116 Individual ensemble forecast, control and perturbed on generalised tiles at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+117 117 Individual large ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time
+118 118 Individual large ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval
+119 119 Probability forecasts from large ensembles at a horizontal level or in a horizontal layer at a point in time
+120 120 Probability forecasts from large ensembles at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+121 121 Probability forecasts from large ensembles with spatiotemporal processing based on focal (moving window) statistics at a horizontal level or in a horizontal layer at a point in time
+122 122 Probability forecasts from large ensembles with spatiotemporal processing based on focal (moving window) statistics at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+123 123 Probability forecasts from large ensembles with spatiotemporal processing based on focal (moving window) statistics in relation to a reference period at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+124 124 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for radionuclides
+125 125 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for radionuclides
+126 126 Average, accumulation, and/or extreme values or other statistically processed values at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for radionuclides
+127 127 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval for radionuclides
+128 128 Anomalies significance and other derived products from an analysis or forecast in relation to a reference period at a horizontal level or in a horizontal layer at a point in time
+129 129 Anomalies significance and other derived products from an individual ensemble forecast, control and perturbed in relation to a reference period at a horizontal level or in a horizontal layer at a point in time
+130 130 Anomalies significance and other derived products from derived forecasts based on all ensemble members in relation to a reference period at a horizontal level or in a horizontal layer at a point in time
+131 131 Anomalies significance and other derived products as probability forecasts in relation to a reference period at a horizontal level or in a horizontal layer at a point in time
+132 132 Quantile forecasts of anomalies, significance and other derived products in relation to a reference period at a horizontal level or in a horizontal layer at a point in time
+133 133 Post-processed quantile forecasts of anomalies, significance and other derived products in relation to a reference period at a horizontal level or in a horizontal layer at a point in time
+134 134 Quantile forecasts of anomalies, significance and other derived products in relation to a reference period at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+135 135 Post-processed quantile forecasts of anomalies, significance and other derived products in relation to a reference period at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+136 136 Probability forecasts of anomalies, significance and other derived products in relation to a reference period with spatiotemporal processing based on focal (moving window) statistics in relation to a reference period at a horizontal level or in at a point in time
+# 137-253 Reserved
+254 254 CCITT IA5 character string
+# 255-999 Reserved
+1000 1000 Cross-section of analysis and forecast at a point in time
+1001 1001 Cross-section of averaged or otherwise statistically processed analysis or forecast over a range of time
+1002 1002 Cross-section of analysis and forecast, averaged or otherwise statistically processed over latitude or longitude
+# 1003-1099 Reserved
+1100 1100 Hovmoller-type grid with no averaging or other statistical processing
+1101 1101 Hovmoller-type grid with averaging or other statistical processing
+# 1102-32767 Reserved
+# 32768-65534 Reserved for local use
+65535 65535 Missing
diff --git a/definitions/grib2/tables/34/4.1.0.table b/definitions/grib2/tables/34/4.1.0.table
new file mode 100644
index 000000000..deb34a4e3
--- /dev/null
+++ b/definitions/grib2/tables/34/4.1.0.table
@@ -0,0 +1,29 @@
+# Product discipline 0 - Meteorological products
+0 0 Temperature
+1 1 Moisture
+2 2 Momentum
+3 3 Mass
+4 4 Short-wave radiation
+5 5 Long-wave radiation
+6 6 Cloud
+7 7 Thermodynamic stability indices
+8 8 Kinematic stability indices
+9 9 Temperature probabilities
+10 10 Moisture probabilities
+11 11 Momentum probabilities
+12 12 Mass probabilities
+13 13 Aerosols
+14 14 Trace gases (e.g. ozone, CO2)
+15 15 Radar
+16 16 Forecast radar imagery
+17 17 Electrodynamics
+18 18 Nuclear/radiology
+19 19 Physical atmospheric properties
+20 20 Atmospheric chemical constituents
+21 21 Thermodynamic properties
+22 22 Drought indices
+# 23-189 Reserved
+190 190 CCITT IA5 string
+191 191 Miscellaneous
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.1.1.table b/definitions/grib2/tables/34/4.1.1.table
new file mode 100644
index 000000000..df2c13fa8
--- /dev/null
+++ b/definitions/grib2/tables/34/4.1.1.table
@@ -0,0 +1,7 @@
+# Product discipline 1 - Hydrological products
+0 0 Hydrology basic products
+1 1 Hydrology probabilities
+2 2 Inland water and sediment properties
+# 3-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.1.10.table b/definitions/grib2/tables/34/4.1.10.table
new file mode 100644
index 000000000..5a64f9652
--- /dev/null
+++ b/definitions/grib2/tables/34/4.1.10.table
@@ -0,0 +1,10 @@
+# Product discipline 10 - Oceanographic products
+0 0 Waves
+1 1 Currents
+2 2 Ice
+3 3 Surface properties
+4 4 Subsurface properties
+# 5-190 Reserved
+191 191 Miscellaneous
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.1.2.table b/definitions/grib2/tables/34/4.1.2.table
new file mode 100644
index 000000000..369a55cce
--- /dev/null
+++ b/definitions/grib2/tables/34/4.1.2.table
@@ -0,0 +1,12 @@
+# Product discipline 2 - Land surface products
+0 0 Vegetation/biomass
+1 1 Agri-/aquacultural special products
+2 2 Transportation-related products
+3 3 Soil products
+4 4 Fire weather products
+5 5 Glaciers and inland ice
+6 6 Urban areas
+7 7 Thermodynamic properties
+# 8-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.1.20.table b/definitions/grib2/tables/34/4.1.20.table
new file mode 100644
index 000000000..e651e326f
--- /dev/null
+++ b/definitions/grib2/tables/34/4.1.20.table
@@ -0,0 +1,8 @@
+# Product discipline 20 - Health and socioeconomic impacts
+0 0 Health indicators
+1 1 Epidemiology
+2 2 Socioeconomic indicators
+3 3 Renewable energy sector
+# 4-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.1.3.table b/definitions/grib2/tables/34/4.1.3.table
new file mode 100644
index 000000000..35d82f440
--- /dev/null
+++ b/definitions/grib2/tables/34/4.1.3.table
@@ -0,0 +1,11 @@
+# Product discipline 3 - Satellite remote sensing products (formerly Space products)
+0 0 Image format products
+1 1 Quantitative products
+2 2 Cloud properties
+3 3 Flight rule conditions
+4 4 Volcanic ash
+5 5 Sea-surface temperature
+6 6 Solar radiation
+# 7-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.1.4.table b/definitions/grib2/tables/34/4.1.4.table
new file mode 100644
index 000000000..7d1378729
--- /dev/null
+++ b/definitions/grib2/tables/34/4.1.4.table
@@ -0,0 +1,15 @@
+# Product discipline 4 - Space weather products
+0 0 Temperature
+1 1 Momentum
+2 2 Charged particle mass and number
+3 3 Electric and magnetic fields
+4 4 Energetic particles
+5 5 Waves
+6 6 Solar electromagnetic emissions
+7 7 Terrestrial electromagnetic emissions
+8 8 Imagery
+9 9 Ion-neutral coupling
+10 10 Space weather indices
+# 11-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.10.table b/definitions/grib2/tables/34/4.10.table
new file mode 100644
index 000000000..0acd9127c
--- /dev/null
+++ b/definitions/grib2/tables/34/4.10.table
@@ -0,0 +1,22 @@
+# Code table 4.10 - Type of statistical processing
+0 avg Average
+1 accum Accumulation
+2 max Maximum
+3 min Minimum
+4 diff Difference (value at the end of time range minus value at the beginning)
+5 rms Root mean square
+6 sd Standard deviation
+7 cov Covariance (temporal variance)
+8 8 Difference (value at the start of time range minus value at the end)
+9 ratio Ratio
+10 10 Standardized anomaly
+11 11 Summation
+12 12 Return period
+13 13 Median
+# 14-99 Reserved
+100 100 Severity
+101 101 Mode
+102 102 Index processing
+# 103-191 Reserved
+# 192-254 Reserved for local use
+255 missing Missing
diff --git a/definitions/grib2/tables/34/4.100.table b/definitions/grib2/tables/34/4.100.table
new file mode 100644
index 000000000..a24770d68
--- /dev/null
+++ b/definitions/grib2/tables/34/4.100.table
@@ -0,0 +1,10 @@
+# Code table 4.100 - Type of reference dataset
+0 0 Analysis
+1 1 Forecast
+2 2 Reforecast (Hindcast)
+3 3 Reanalysis
+4 4 Climate projection
+5 5 Gridded observations
+# 6-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.101.table b/definitions/grib2/tables/34/4.101.table
new file mode 100644
index 000000000..b7f9baf3f
--- /dev/null
+++ b/definitions/grib2/tables/34/4.101.table
@@ -0,0 +1,14 @@
+# Code table 4.101 - Type of relationship to reference dataset
+0 0 Anomaly
+1 1 Standardized anomaly
+2 2 Significance (Wilcoxon-Mann-Whitney)
+3 3 Climatology
+# 4-19 Reserved
+20 20 Extreme Forecast Index (EFI)
+21 21 Shift of Tails (SOT)
+22 22 Anomaly of probabilities
+23 23 Standardized Drought Index
+24 24 Crossing Point Forecast (CPF)
+# 25-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.102.table b/definitions/grib2/tables/34/4.102.table
new file mode 100644
index 000000000..214844fb3
--- /dev/null
+++ b/definitions/grib2/tables/34/4.102.table
@@ -0,0 +1,22 @@
+# Code table 4.102 - Statistical processing of reference period
+0 0 Average
+1 1 Accumulation
+2 2 Maximum
+3 3 Minimum
+4 4 Median
+# 5-19 Reserved
+20 20 Model Climate
+21 21 Index based on normal distribution
+22 22 Index based on log-normal distribution
+23 23 Index based on generalised log-normal distribution
+24 24 Index based on gamma distribution
+25 25 Index based on logistic distribution
+26 26 Index based on log-logistic distribution
+27 27 Index based on generalised logistic distribution
+28 28 Index based on Weibull distribution
+29 29 Index based on generalised extreme value distribution
+30 30 Index based on Pearson III distribution
+31 31 Index based on empirical distribution
+# 32-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.103.table b/definitions/grib2/tables/34/4.103.table
new file mode 100644
index 000000000..5d70488ca
--- /dev/null
+++ b/definitions/grib2/tables/34/4.103.table
@@ -0,0 +1,9 @@
+# Code table 4.103 - Spatial vicinity type
+0 0 Circle [m]
+1 1 Rectangle [m,m]
+2 2 Square [m]
+3 3 Wedge [m, degree, degree]
+4 4 Span of grid boxes centered around grid box i,j [x,y]
+# 5-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.104.table b/definitions/grib2/tables/34/4.104.table
new file mode 100644
index 000000000..d1e417780
--- /dev/null
+++ b/definitions/grib2/tables/34/4.104.table
@@ -0,0 +1,15 @@
+# Code table 4.104 - Spatial and temporal vicinity processing
+0 0 Average
+1 1 Reserved
+2 2 Maximum
+3 3 Minimum
+4 4 Range
+5 5 Reserved
+6 6 Standard deviation
+# 7-10 Reserved
+11 11 Sum
+# 12-189 Reserved
+190 190 Quantile
+191 191 Categorical (boolean)
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.105.table b/definitions/grib2/tables/34/4.105.table
new file mode 100644
index 000000000..f3be24ecb
--- /dev/null
+++ b/definitions/grib2/tables/34/4.105.table
@@ -0,0 +1,6 @@
+# Code table 4.105 - Spatial and temporal vicinity missing data
+0 0 Ignore missing data
+1 1 No data
+# 2-189 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.11.table b/definitions/grib2/tables/34/4.11.table
new file mode 100644
index 000000000..01cc81303
--- /dev/null
+++ b/definitions/grib2/tables/34/4.11.table
@@ -0,0 +1,10 @@
+# Code table 4.11 - Type of time intervals
+0 0 Reserved
+1 1 Successive times processed have same forecast time, start time of forecast is incremented
+2 2 Successive times processed have same start time of forecast, forecast time is incremented
+3 3 Successive times processed have start time of forecast incremented and forecast time decremented so that valid time remains constant
+4 4 Successive times processed have start time of forecast decremented and forecast time incremented so that valid time remains constant
+5 5 Floating subinterval of time between forecast time and end of overall time interval
+# 6-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.12.table b/definitions/grib2/tables/34/4.12.table
new file mode 100644
index 000000000..d42b47e96
--- /dev/null
+++ b/definitions/grib2/tables/34/4.12.table
@@ -0,0 +1,7 @@
+# Code table 4.12 - Operating mode
+0 0 Maintenance mode
+1 1 Clear air
+2 2 Precipitation
+# 3-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.13.table b/definitions/grib2/tables/34/4.13.table
new file mode 100644
index 000000000..a0e28eac8
--- /dev/null
+++ b/definitions/grib2/tables/34/4.13.table
@@ -0,0 +1,6 @@
+# Code table 4.13 - Quality control indicator
+0 0 No quality control applied
+1 1 Quality control applied
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.14.table b/definitions/grib2/tables/34/4.14.table
new file mode 100644
index 000000000..d525b23b3
--- /dev/null
+++ b/definitions/grib2/tables/34/4.14.table
@@ -0,0 +1,6 @@
+# Code table 4.14 - Clutter filter indicator
+0 0 No clutter filter used
+1 1 Clutter filter used
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.15.table b/definitions/grib2/tables/34/4.15.table
new file mode 100644
index 000000000..7adddedb6
--- /dev/null
+++ b/definitions/grib2/tables/34/4.15.table
@@ -0,0 +1,11 @@
+# Code table 4.15 - Type of spatial processing used to arrive at given data value from the source data
+0 0 Data is calculated directly from the source grid with no interpolation
+1 1 Bilinear interpolation using the 4 source grid grid-point values surrounding the nominal grid-point
+2 2 Bicubic interpolation using the 4 source grid grid-point values surrounding the nominal grid-point
+3 3 Using the value from the source grid grid-point which is nearest to the nominal grid-point
+4 4 Budget interpolation using the 4 source grid grid-point values surrounding the nominal grid-point
+5 5 Spectral interpolation using the 4 source grid grid-point values surrounding the nominal grid-point
+6 6 Neighbor-budget interpolation using the 4 source grid grid-point values surrounding the nominal grid-point
+# 7-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.16.table b/definitions/grib2/tables/34/4.16.table
new file mode 100644
index 000000000..5b9f6fd73
--- /dev/null
+++ b/definitions/grib2/tables/34/4.16.table
@@ -0,0 +1,10 @@
+# Code table 4.16 - Quality value associated with parameter
+0 0 Confidence index
+1 1 Quality indicator
+2 2 Correlation of product with used calibration product
+3 3 Standard deviation
+4 4 Random error
+5 5 Probability
+# 6-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.192.table b/definitions/grib2/tables/34/4.192.table
new file mode 100644
index 000000000..e1fd91594
--- /dev/null
+++ b/definitions/grib2/tables/34/4.192.table
@@ -0,0 +1,4 @@
+1 1 first
+2 2 second
+3 3 third
+4 4 fourth
diff --git a/definitions/grib2/tables/34/4.2.0.0.table b/definitions/grib2/tables/34/4.2.0.0.table
new file mode 100644
index 000000000..e4912c9d6
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.0.table
@@ -0,0 +1,37 @@
+# Product discipline 0 - Meteorological products, parameter category 0: temperature
+0 0 Temperature (K)
+1 1 Virtual temperature (K)
+2 2 Potential temperature (K)
+3 3 Pseudo-adiabatic potential temperature or equivalent potential temperature (K)
+4 4 Maximum temperature (K)
+5 5 Minimum temperature (K)
+6 6 Dewpoint temperature (K)
+7 7 Dewpoint depression (or deficit) (K)
+8 8 Lapse rate (K/m)
+9 9 Temperature anomaly (K)
+10 10 Latent heat net flux (W m-2)
+11 11 Sensible heat net flux (W m-2)
+12 12 Heat index (K)
+13 13 Wind chill factor (K)
+14 14 Minimum dewpoint depression (K)
+15 15 Virtual potential temperature (K)
+16 16 Snow phase change heat flux (W m-2)
+17 17 Skin temperature (K)
+18 18 Snow temperature (top of snow) (K)
+19 19 Turbulent transfer coefficient for heat (Numeric)
+20 20 Turbulent diffusion coefficient for heat (m2/s)
+21 21 Apparent temperature (K)
+22 22 Temperature tendency due to short-wave radiation (K s-1)
+23 23 Temperature tendency due to long-wave radiation (K s-1)
+24 24 Temperature tendency due to short-wave radiation, clear sky (K s-1)
+25 25 Temperature tendency due to long-wave radiation, clear sky (K s-1)
+26 26 Temperature tendency due to parameterization (K s-1)
+27 27 Wet-bulb temperature (K)
+28 28 Unbalanced component of temperature (K)
+29 29 Temperature advection (K s-1)
+30 30 Latent heat net flux due to evaporation (W m-2)
+31 31 Latent heat net flux due to sublimation (W m-2)
+32 32 Wet-bulb potential temperature (K)
+# 33-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.1.table b/definitions/grib2/tables/34/4.2.0.1.table
new file mode 100644
index 000000000..2405606cb
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.1.table
@@ -0,0 +1,174 @@
+# Product discipline 0 - Meteorological products, parameter category 1: moisture
+0 0 Specific humidity (kg/kg)
+1 1 Relative humidity (%)
+2 2 Humidity mixing ratio (kg/kg)
+3 3 Precipitable water (kg m-2)
+4 4 Vapour pressure (Pa)
+5 5 Saturation deficit (Pa)
+6 6 Evaporation (kg m-2)
+7 7 Precipitation rate (kg m-2 s-1)
+8 8 Total precipitation (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
+10 10 Convective precipitation (kg m-2)
+11 11 Snow depth (m)
+12 12 Snowfall rate water equivalent (kg m-2 s-1)
+13 13 Water equivalent of accumulated snow depth (kg m-2)
+14 14 Convective snow (kg m-2)
+15 15 Large-scale snow (kg m-2)
+16 16 Snow melt (kg m-2)
+17 17 Snow age (d)
+18 18 Absolute humidity (kg m-3)
+19 19 Precipitation type (Code table 4.201)
+20 20 Integrated liquid water (kg m-2)
+21 21 Condensate (kg/kg)
+22 22 Cloud mixing ratio (kg/kg)
+23 23 Ice water mixing ratio (kg/kg)
+24 24 Rain mixing ratio (kg/kg)
+25 25 Snow mixing ratio (kg/kg)
+26 26 Horizontal moisture convergence (kg kg-1 s-1)
+27 27 Maximum relative humidity (%)
+28 28 Maximum absolute humidity (kg m-3)
+29 29 Total snowfall (m)
+30 30 Precipitable water category (Code table 4.202)
+31 31 Hail (m)
+32 32 Graupel (snow pellets) (kg/kg)
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
+37 37 Convective precipitation rate (kg m-2 s-1)
+38 38 Horizontal moisture divergence (kg kg-1 s-1)
+39 39 Per cent frozen precipitation (%)
+40 40 Potential evaporation (kg m-2)
+41 41 Potential evaporation rate (W m-2)
+42 42 Snow cover (%)
+43 43 Rain fraction of total cloud water (Proportion)
+44 44 Rime factor (Numeric)
+45 45 Total column integrated rain (kg m-2)
+46 46 Total column integrated snow (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
+48 48 Convective water precipitation (kg m-2)
+49 49 Total water precipitation (kg m-2)
+50 50 Total snow precipitation (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+52 52 Total precipitation rate (kg m-2 s-1)
+53 53 Total snowfall rate water equivalent (kg m-2 s-1)
+54 54 Large scale precipitation rate (kg m-2 s-1)
+55 55 Convective snowfall rate water equivalent (kg m-2 s-1)
+56 56 Large scale snowfall rate water equivalent (kg m-2 s-1)
+57 57 Total snowfall rate (m/s)
+58 58 Convective snowfall rate (m/s)
+59 59 Large scale snowfall rate (m/s)
+60 60 Snow depth water equivalent (kg m-2)
+61 61 Snow density (kg m-3)
+62 62 Snow evaporation (kg m-2)
+63 63 Reserved
+64 64 Total column integrated water vapour (kg m-2)
+65 65 Rain precipitation rate (kg m-2 s-1)
+66 66 Snow precipitation rate (kg m-2 s-1)
+67 67 Freezing rain precipitation rate (kg m-2 s-1)
+68 68 Ice pellets precipitation rate (kg m-2 s-1)
+69 69 Total column integrated cloud water (kg m-2)
+70 70 Total column integrated cloud ice (kg m-2)
+71 71 Hail mixing ratio (kg/kg)
+72 72 Total column integrated hail (kg m-2)
+73 73 Hail precipitation rate (kg m-2 s-1)
+74 74 Total column integrated graupel (kg m-2)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+76 76 Convective rain rate (kg m-2 s-1)
+77 77 Large scale rain rate (kg m-2 s-1)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
+79 79 Evaporation rate (kg m-2 s-1)
+80 80 Total condensate (kg/kg)
+81 81 Total column-integrated condensate (kg m-2)
+82 82 Cloud ice mixing-ratio (kg/kg)
+83 83 Specific cloud liquid water content (kg/kg)
+84 84 Specific cloud ice water content (kg/kg)
+85 85 Specific rainwater content (kg/kg)
+86 86 Specific snow water content (kg/kg)
+87 87 Stratiform precipitation rate (kg m-2 s-1)
+88 88 Categorical convective precipitation (Code table 4.222)
+# 89 Reserved
+90 90 Total kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+93 93 Relative humidity with respect to water (%)
+94 94 Relative humidity with respect to ice (%)
+95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
+96 96 Mass density of rain (kg m-3)
+97 97 Mass density of snow (kg m-3)
+98 98 Mass density of graupel (kg m-3)
+99 99 Mass density of hail (kg m-3)
+100 100 Specific number concentration of rain (kg-1)
+101 101 Specific number concentration of snow (kg-1)
+102 102 Specific number concentration of graupel (kg-1)
+103 103 Specific number concentration of hail (kg-1)
+104 104 Number density of rain (m-3)
+105 105 Number density of snow (m-3)
+106 106 Number density of graupel (m-3)
+107 107 Number density of hail (m-3)
+108 108 Specific humidity tendency due to parameterization (kg kg-1 s-1)
+109 109 Mass density of liquid water coating on hail expressed as mass of liquid water per unit volume of air (kg m-3)
+110 110 Specific mass of liquid water coating on hail expressed as mass of liquid water per unit mass of moist air (kg kg-1)
+111 111 Mass mixing ratio of liquid water coating on hail expressed as mass of liquid water per unit mass of dry air (kg kg-1)
+112 112 Mass density of liquid water coating on graupel expressed as mass of liquid water per unit volume of air (kg m-3)
+113 113 Specific mass of liquid water coating on graupel expressed as mass of liquid water per unit mass of moist air (kg kg-1)
+114 114 Mass mixing ratio of liquid water coating on graupel expressed as mass of liquid water per unit mass of dry air (kg kg-1)
+115 115 Mass density of liquid water coating on snow expressed as mass of liquid water per unit volume of air (kg m-3)
+116 116 Specific mass of liquid water coating on snow expressed as mass of liquid water per unit mass of moist air (kg kg-1)
+117 117 Mass mixing ratio of liquid water coating on snow expressed as mass of liquid water per unit mass of dry air (kg kg-1)
+118 118 Unbalanced component of specific humidity (kg kg-1)
+119 119 Unbalanced component of specific cloud liquid water content (kg kg-1)
+120 120 Unbalanced component of specific cloud ice water content (kg kg-1)
+121 121 Fraction of snow cover (Proportion)
+122 122 Precipitation intensity index (Code table 4.247)
+123 123 Dominant precipitation type (Code table 4.201)
+124 124 Presence of showers (Code table 4.222)
+125 125 Presence of blowing snow (Code table 4.222)
+126 126 Presence of blizzard (Code table 4.222)
+127 127 Ice pellets (non-water equivalent) precipitation rate (m/s)
+128 128 Total solid precipitation rate (kg m-2 s-1)
+129 129 Effective radius of cloud water (m)
+130 130 Effective radius of rain (m)
+131 131 Effective radius of cloud ice (m)
+132 132 Effective radius of snow (m)
+133 133 Effective radius of graupel (m)
+134 134 Effective radius of hail (m)
+135 135 Effective radius of subgrid liquid clouds (m)
+136 136 Effective radius of subgrid ice clouds (m)
+137 137 Effective aspect ratio of rain (-)
+138 138 Effective aspect ratio of cloud ice (-)
+139 139 Effective aspect ratio of snow (-)
+140 140 Effective aspect ratio of graupel (-)
+141 141 Effective aspect ratio of hail (-)
+142 142 Effective aspect ratio of subgrid ice clouds (-)
+143 143 Potential evaporation rate (kg m-2 s-1)
+144 144 Specific rain water content (convective) (kg kg-1)
+145 145 Specific snow water content (convective) (kg kg-1)
+146 146 Cloud ice precipitation rate (kg m-2 s-1)
+147 147 Character of precipitation (Code table 4.249)
+148 148 Snow evaporation rate (kg m-2 s-1)
+149 149 Cloud water mixing ratio (kg kg-1)
+150 150 Column integrated eastward water vapour mass flux (kg m-1 s-1)
+151 151 Column integrated northward water vapour mass flux (kg m-1 s-1)
+152 152 Column integrated eastward cloud liquid water mass flux (kg m-1 s-1)
+153 153 Column integrated northward cloud liquid water mass flux (kg m-1 s-1)
+154 154 Column integrated eastward cloud ice mass flux (kg m-1 s-1)
+155 155 Column integrated northward cloud ice mass flux (kg m-1 s-1)
+156 156 Column integrated eastward rain mass flux (kg m-1 s-1)
+157 157 Column integrated northward rain mass flux (kg m-1 s-1)
+158 158 Column integrated eastward snow mass flux (kg m-1 s-1)
+159 159 Column integrated northward snow mass flux (kg m-1 s-1)
+160 160 Column integrated divergence of water vapour mass flux (kg m-2 s-1)
+161 161 Column integrated divergence of cloud liquid water mass flux (kg m-2 s-1)
+162 162 Column integrated divergence of cloud ice mass flux (kg m-2 s-1)
+163 163 Column integrated divergence of rain mass flux (kg m-2 s-1)
+164 164 Column integrated divergence of snow mass flux (kg m-2 s-1)
+165 165 Column integrated divergence of total water mass flux (kg m-2 s-1)
+166 166 Column integrated water vapour flux (kg m-2 s-1)
+167 167 Total column supercooled liquid water (kg m-2)
+168 168 Saturation specific humidity with respect to water (kg m-3)
+169 169 Total column integrated saturation specific humidity with respect to water (kg m-2)
+# 170-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.13.table b/definitions/grib2/tables/34/4.2.0.13.table
new file mode 100644
index 000000000..4c1253b96
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.13.table
@@ -0,0 +1,5 @@
+# Product discipline 0 - Meteorological products, parameter category 13: aerosols
+0 0 Aerosol type (Code table 4.205)
+# 1-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.14.table b/definitions/grib2/tables/34/4.2.0.14.table
new file mode 100644
index 000000000..df0f721ea
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.14.table
@@ -0,0 +1,7 @@
+# Product discipline 0 - Meteorological products, parameter category 14: trace gases
+0 0 Total ozone (DU)
+1 1 Ozone mixing ratio (kg/kg)
+2 2 Total column integrated ozone (DU)
+# 3-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.15.table b/definitions/grib2/tables/34/4.2.0.15.table
new file mode 100644
index 000000000..ac49ad402
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.15.table
@@ -0,0 +1,21 @@
+# Product discipline 0 - Meteorological products, parameter category 15: radar
+0 0 Base spectrum width (m/s)
+1 1 Base reflectivity (dB)
+2 2 Base radial velocity (m/s)
+3 3 Vertically integrated liquid water (VIL) (kg m-2)
+4 4 Layer-maximum base reflectivity (dB)
+5 5 Precipitation (kg m-2)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
+9 9 Reflectivity of cloud droplets (dB)
+10 10 Reflectivity of cloud ice (dB)
+11 11 Reflectivity of snow (dB)
+12 12 Reflectivity of rain (dB)
+13 13 Reflectivity of graupel (dB)
+14 14 Reflectivity of hail (dB)
+15 15 Hybrid scan reflectivity (dB)
+16 16 Hybrid scan reflectivity height (m)
+# 17-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.16.table b/definitions/grib2/tables/34/4.2.0.16.table
new file mode 100644
index 000000000..111e6d986
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.16.table
@@ -0,0 +1,10 @@
+# Product discipline 0 - Meteorological products, parameter category 16: forecast radar imagery
+0 0 Equivalent radar reflectivity factor for rain (mm6 m-3)
+1 1 Equivalent radar reflectivity factor for snow (mm6 m-3)
+2 2 Equivalent radar reflectivity factor for parameterized convection (mm6 m-3)
+3 3 Echo top (m)
+4 4 Reflectivity (dB)
+5 5 Composite reflectivity (dB)
+# 6-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.17.table b/definitions/grib2/tables/34/4.2.0.17.table
new file mode 100644
index 000000000..3c7b284f2
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.17.table
@@ -0,0 +1,10 @@
+# Product discipline 0 - Meteorological products, parameter category 17: electrodynamics
+0 0 Lightning strike density (m-2 s-1)
+1 1 Lightning potential index (LPI) (J kg-1)
+2 2 Cloud-to-ground lightning flash density (km-2 day-1)
+3 3 Cloud-to-cloud lightning flash density (km-2 day-1)
+4 4 Total lightning flash density (km-2 day-1)
+5 5 Subgrid-scale lightning potential index (J kg-1)
+# 6-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.18.table b/definitions/grib2/tables/34/4.2.0.18.table
new file mode 100644
index 000000000..6efa6e5e0
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.18.table
@@ -0,0 +1,31 @@
+# Product discipline 0 - Meteorological products, parameter category 18: nuclear/radiology
+0 0 Air activity concentration of caesium 137 (Bq m-3)
+1 1 Air activity concentration of iodine 131 (Bq m-3)
+2 2 Air activity concentration of radioactive pollutant (Bq m-3)
+3 3 Ground deposition activity of caesium 137 (Bq m-2)
+4 4 Ground deposition activity of iodine 131 (Bq m-2)
+5 5 Ground deposition activity of radioactive pollutant (Bq m-2)
+6 6 Time-integrated air activity concentration of caesium pollutant (Bq s m-3)
+7 7 Time-integrated air activity concentration of iodine pollutant (Bq s m-3)
+8 8 Time-integrated air activity concentration of radioactive pollutant (Bq s m-3)
+9 9 Reserved
+10 10 Air activity concentration (Bq m-3)
+11 11 Wet deposition activity (Bq m-2)
+12 12 Dry deposition activity (Bq m-2)
+13 13 Total deposition activity (wet + dry) (Bq m-2)
+14 14 Specific activity concentration (Bq kg-1)
+15 15 Maximum of air activity concentration in layer (Bq m-3)
+16 16 Height of maximum air activity concentration (m)
+17 17 Column-integrated air activity concentration (Bq m-2)
+18 18 Column-averaged air activity concentration in layer (Bq m-3)
+19 19 Deposition activity arrival (s)
+20 20 Deposition activity ended (s)
+21 21 Cloud activity arrival (s)
+22 22 Cloud activity ended (s)
+23 23 Effective dose rate (nSv h-1)
+24 24 Thyroid dose rate (adult) (nSv h-1)
+25 25 Gamma dose rate (adult) (nSv h-1)
+26 26 Activity emission (Bq s-1)
+# 27-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.19.table b/definitions/grib2/tables/34/4.2.0.19.table
new file mode 100644
index 000000000..7599c89bc
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.19.table
@@ -0,0 +1,56 @@
+# Product discipline 0 - Meteorological products, parameter category 19: physical atmospheric properties
+0 0 Visibility (m)
+1 1 Albedo (%)
+2 2 Thunderstorm probability (%)
+3 3 Mixed layer depth (m)
+4 4 Volcanic ash (Code table 4.206)
+5 5 Icing top (m)
+6 6 Icing base (m)
+7 7 Icing (Code table 4.207)
+8 8 Turbulence top (m)
+9 9 Turbulence base (m)
+10 10 Turbulence (Code table 4.208)
+11 11 Turbulent kinetic energy (J/kg)
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
+15 15 Contrail top (m)
+16 16 Contrail base (m)
+17 17 Maximum snow albedo (%)
+18 18 Snow free albedo (%)
+19 19 Snow albedo (%)
+20 20 Icing (%)
+21 21 In-cloud turbulence (%)
+22 22 Clear air turbulence (CAT) (%)
+23 23 Supercooled large droplet probability (%)
+24 24 Convective turbulent kinetic energy (J/kg)
+25 25 Weather (Code table 4.225)
+26 26 Convective outlook (Code table 4.224)
+27 27 Icing scenario (Code table 4.227)
+28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
+29 29 Clear air turbulence (CAT) (m2/3 s-1)
+30 30 Eddy dissipation parameter (m2/3 s-1)
+31 31 Maximum of eddy dissipation parameter in layer (m2/3 s-1)
+32 32 Highest freezing level (m)
+33 33 Visibility through liquid fog (m)
+34 34 Visibility through ice fog (m)
+35 35 Visibility through blowing snow (m)
+36 36 Presence of snow squalls (Code table 4.222)
+37 37 Icing severity (Code table 4.228)
+38 38 Sky transparency index (Code table 4.214)
+39 39 Seeing index (Code table 4.214)
+40 40 Snow level (m)
+41 41 Duct base height (m)
+42 42 Trapping layer base height (m)
+43 43 Trapping layer top height (m)
+44 44 Mean vertical gradient of refractivity inside trapping layer (m-1)
+45 45 Minimum vertical gradient of refractivity inside trapping layer (m-1)
+46 46 Net radiation flux (W m-2)
+47 47 Global irradiance on tilted surfaces (W m-2)
+48 48 Top of persistent contrails (m)
+49 49 Base of persistent contrails (m)
+50 50 Convectively-induced turbulence (CIT) (eddy dissipation rate) (m2/3 s-1)
+51 51 Visibility through precipitation (m)
+# 52-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.190.table b/definitions/grib2/tables/34/4.2.0.190.table
new file mode 100644
index 000000000..dfe39840d
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.190.table
@@ -0,0 +1,5 @@
+# Product discipline 0 - Meteorological products, parameter category 190: CCITT IA5 string
+0 0 Arbitrary text string (CCITT IA5)
+# 1-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.191.table b/definitions/grib2/tables/34/4.2.0.191.table
new file mode 100644
index 000000000..5fce8eab0
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.191.table
@@ -0,0 +1,12 @@
+# Product discipline 0 - Meteorological products, parameter category 191: miscellaneous
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+1 1 Geographical latitude (deg N)
+2 2 Geographical longitude (deg E)
+3 3 Days since last observation (d)
+4 4 Tropical cyclone density track (Numeric)
+5 5 Hurricane track in spatiotemporal vicinity (boolean)
+6 6 Tropical storm track in spatiotemporal vicinity (boolean)
+7 7 Tropical depression track in spatiotemporal vicinity (boolean)
+# 8-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.2.table b/definitions/grib2/tables/34/4.2.0.2.table
new file mode 100644
index 000000000..88206bf0e
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.2.table
@@ -0,0 +1,74 @@
+# Product discipline 0 - Meteorological products, parameter category 2: momentum
+0 0 Wind direction (from which blowing) (degree true)
+1 1 Wind speed (m/s)
+2 2 u-component of wind (m/s)
+3 3 v-component of wind (m/s)
+4 4 Stream function (m2/s)
+5 5 Velocity potential (m2/s)
+6 6 Montgomery stream function (m2 s-2)
+7 7 Sigma coordinate vertical velocity (/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
+10 10 Absolute vorticity (/s)
+11 11 Absolute divergence (/s)
+12 12 Relative vorticity (/s)
+13 13 Relative divergence (/s)
+14 14 Potential vorticity (K m2 kg-1 s-1)
+15 15 Vertical u-component shear (/s)
+16 16 Vertical v-component shear (/s)
+17 17 Momentum flux, u-component (N m-2)
+18 18 Momentum flux, v-component (N m-2)
+19 19 Wind mixing energy (J)
+20 20 Boundary layer dissipation (W m-2)
+21 21 Maximum wind speed (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
+25 25 Vertical speed shear (/s)
+26 26 Horizontal momentum flux (N m-2)
+27 27 u-component storm motion (m/s)
+28 28 v-component storm motion (m/s)
+29 29 Drag coefficient (Numeric)
+30 30 Frictional velocity (m/s)
+31 31 Turbulent diffusion coefficient for momentum (m2/s)
+32 32 Eta coordinate vertical velocity (/s)
+33 33 Wind fetch (m)
+34 34 Normal wind component (m/s)
+35 35 Tangential wind component (m/s)
+36 36 Amplitude function for Rossby wave envelope for meridional wind (m/s)
+37 37 Northward turbulent surface stress (N m-2 s)
+38 38 Eastward turbulent surface stress (N m-2 s)
+39 39 Eastward wind tendency due to parameterization (m s-2)
+40 40 Northward wind tendency due to parameterization (m s-2)
+41 41 u-component of geostrophic wind (m s-1)
+42 42 v-component of geostrophic wind (m s-1)
+43 43 Geostrophic wind direction (degree true)
+44 44 Geostrophic wind speed (m s-1)
+45 45 Unbalanced component of divergence (s-1)
+46 46 Vorticity advection (s-2)
+47 47 Surface roughness for heat (m)
+48 48 Surface roughness for moisture (m)
+49 49 Wind stress (N m-2)
+50 50 Eastward wind stress (N m-2)
+51 51 Northward wind stress (N m-2)
+52 52 u-component of wind stress (N m-2)
+53 53 v-component of wind stress (N m-2)
+54 54 Natural logarithm of surface roughness length for heat (Numeric)
+55 55 Natural logarithm of surface roughness length for moisture (Numeric)
+56 56 u-component of neutral wind (m s-1)
+57 57 v-component of neutral wind (m s-1)
+58 58 Magnitude of turbulent surface stress (N m-2)
+59 59 Vertical divergence (s-1)
+60 60 Drag thermal coefficient (Numeric)
+61 61 Drag evaporation coefficient (Numeric)
+62 62 Eastward turbulent surface stress (N m-2)
+63 63 Northward turbulent surface stress (N m-2)
+64 64 Eastward turbulent surface stress due to orographic form drag (N m-2)
+65 65 Northward turbulent surface stress due to orographic form drag (N m-2)
+66 66 Eastward turbulent surface stress due to surface roughness (N m-2)
+67 67 Northward turbulent surface stress due to surface roughness (N m-2)
+68 68 Convective gust (m s-1)
+69 69 Turbulent gust (m s-1)
+# 70-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.20.table b/definitions/grib2/tables/34/4.2.0.20.table
new file mode 100644
index 000000000..6fc9b5b10
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.20.table
@@ -0,0 +1,73 @@
+# Product discipline 0 - Meteorological products, parameter category 20: atmospheric chemical constituents
+0 0 Mass density (concentration) (kg m-3)
+1 1 Column-integrated mass density (kg m-2)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+3 3 Atmosphere emission mass flux (kg m-2 s-1)
+4 4 Atmosphere net production mass flux (kg m-2 s-1)
+5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
+6 6 Surface dry deposition mass flux (kg m-2 s-1)
+7 7 Surface wet deposition mass flux (kg m-2 s-1)
+8 8 Atmosphere re-emission mass flux (kg m-2 s-1)
+9 9 Wet deposition by large-scale precipitation mass flux (kg m-2 s-1)
+10 10 Wet deposition by convective precipitation mass flux (kg m-2 s-1)
+11 11 Sedimentation mass flux (kg m-2 s-1)
+12 12 Dry deposition mass flux (kg m-2 s-1)
+13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
+14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+15 15 Dry deposition velocity (m/s)
+16 16 Mass mixing ratio with respect to dry air (kg/kg)
+17 17 Mass mixing ratio with respect to wet air (kg/kg)
+18 18 Potential of hydrogen (pH) (pH)
+# 19-49 Reserved
+50 50 Amount in atmosphere (mol)
+51 51 Concentration in air (mol m-3)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
+53 53 Chemical gross production rate of concentration (mol m-3 s-1)
+54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
+55 55 Surface flux (mol m-2 s-1)
+56 56 Changes of amount in atmosphere (mol/s)
+57 57 Total yearly average burden of the atmosphere (mol)
+58 58 Total yearly averaged atmospheric loss (mol/s)
+59 59 Aerosol number concentration (m-3)
+60 60 Aerosol specific number concentration (kg-1)
+61 61 Maximum of mass density in layer (kg m-3)
+62 62 Height of maximum mass density (m)
+63 63 Column-averaged mass density in layer (kg m-3)
+64 64 Mole fraction with respect to dry air (mol/mol)
+65 65 Mole fraction with respect to wet air (mol/mol)
+66 66 Column-integrated in-cloud scavenging rate by precipitation (kg m-2 s-1)
+67 67 Column-integrated below-cloud scavenging rate by precipitation (kg m-2 s-1)
+68 68 Column-integrated release rate from evaporating precipitation (kg m-2 s-1)
+69 69 Column-integrated in-cloud scavenging rate by large-scale precipitation (kg m-2 s-1)
+70 70 Column-integrated below-cloud scavenging rate by large-scale precipitation (kg m-2 s-1)
+71 71 Column-integrated release rate from evaporating large-scale precipitation (kg m-2 s-1)
+72 72 Column-integrated in-cloud scavenging rate by convective precipitation (kg m-2 s-1)
+73 73 Column-integrated below-cloud scavenging rate by convective precipitation (kg m-2 s-1)
+74 74 Column-integrated release rate from evaporating convective precipitation (kg m-2 s-1)
+75 75 Wildfire flux (kg m-2 s-1)
+76 76 Emission rate (kg kg-1 s-1)
+77 77 Surface emission flux (kg m-2 s-1)
+78 78 Column integrated eastward mass flux (kg m-1 s-1)
+79 79 Column integrated northward mass flux (kg m-1 s-1)
+80 80 Column integrated divergence of mass flux (kg m-2 s-1)
+81 81 Column integrated net source (kg m-2 s-1)
+82 82 Sink mass flux (kg m-2 s-1)
+83 83 Source mass flux (kg m-2 s-1)
+84 84 Volume-mean total column mixing ratio (mol mol-1)
+# 85-99 Reserved
+100 100 Surface area density (aerosol) (m-1)
+101 101 Vertical visual range (m)
+102 102 Aerosol optical thickness (Numeric)
+103 103 Single scattering albedo (Numeric)
+104 104 Asymmetry factor (Numeric)
+105 105 Aerosol extinction coefficient (m-1)
+106 106 Aerosol absorption coefficient (m-1)
+107 107 Aerosol lidar backscatter from satellite (m-1 sr-1)
+108 108 Aerosol lidar backscatter from the ground (m-1 sr-1)
+109 109 Aerosol lidar extinction from satellite (m-1)
+110 110 Aerosol lidar extinction from the ground (m-1)
+111 111 Angstrom exponent (Numeric)
+112 112 Absorption aerosol optical thickness (Numeric)
+# 113-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.21.table b/definitions/grib2/tables/34/4.2.0.21.table
new file mode 100644
index 000000000..05646e1a6
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.21.table
@@ -0,0 +1,27 @@
+# Product discipline 0 - Meteorological products, parameter category 21: thermodynamic properties
+0 0 Column integrated potential + internal energy (J m-2)
+1 1 Column integrated kinetic energy (J m-2)
+2 2 Column integrated total energy (J m-2)
+3 3 Column integrated enthalpy (J m-2)
+4 4 Column integrated water enthalpy (J m-2)
+5 5 Column integrated eastward enthalpy flux (W m-1)
+6 6 Column integrated northward enthalpy flux (W m-1)
+7 7 Column integrated eastward potential energy flux (W m-1)
+8 8 Column integrated northward potential energy flux (W m-1)
+9 9 Column integrated eastward kinetic energy flux (W m-1)
+10 10 Column integrated northward kinetic energy flux (W m-1)
+11 11 Column integrated eastward total energy flux (W m-1)
+12 12 Column integrated northward total energy flux (W m-1)
+13 13 Divergence of column integrated enthalpy flux (W m-2)
+14 14 Divergence of column integrated potential energy flux (W m-2)
+15 15 Divergence of column integrated water potential energy flux (W m-2)
+16 16 Divergence of column integrated kinetic energy flux (W m-2)
+17 17 Divergence of column integrated total energy flux (W m-2)
+18 18 Divergence of column integrated water enthalpy flux (W m-2)
+19 19 Column integrated eastward heat flux (W m-1)
+20 20 Column integrated northward heat flux (W m-1)
+21 21 Column integrated potential+internal+latent energy (J m-2)
+22 22 Eady growth rate (day-1)
+# 23-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.22.table b/definitions/grib2/tables/34/4.2.0.22.table
new file mode 100644
index 000000000..726bda9c0
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.22.table
@@ -0,0 +1,11 @@
+# Product discipline 0 - Meteorological products, parameter category 22: drought indices
+0 0 Standard Precipitation Index (SPI) (dimensionless)
+1 1 Standardized Precipitation Evapotranspiration Index (SPEI) (dimensionless)
+2 2 Standardized Streamflow index (SSFI) (dimensionless)
+3 3 Standardized Reservoir Supply Index (SRSI) (dimensionless)
+4 4 Standardized Water-level Index (SWI) (dimensionless)
+5 5 Standardized Snowmelt and Rain Index (SMRI) (dimensionless)
+6 6 Streamflow Drought Index (SDI) (dimensionless)
+# 7-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.3.table b/definitions/grib2/tables/34/4.2.0.3.table
new file mode 100644
index 000000000..d685de2ef
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.3.table
@@ -0,0 +1,51 @@
+# Product discipline 0 - Meteorological products, parameter category 3: mass
+0 0 Pressure (Pa)
+1 1 Pressure reduced to MSL (Pa)
+2 2 Pressure tendency (Pa/s)
+3 3 ICAO Standard Atmosphere Reference Height (m)
+4 4 Geopotential (m2 s-2)
+5 5 Geopotential height (gpm)
+6 6 Geometric height (m)
+7 7 Standard deviation of height (m)
+8 8 Pressure anomaly (Pa)
+9 9 Geopotential height anomaly (gpm)
+10 10 Density (kg m-3)
+11 11 Altimeter setting (Pa)
+12 12 Thickness (m)
+13 13 Pressure altitude (m)
+14 14 Density altitude (m)
+15 15 5-wave geopotential height (gpm)
+16 16 Zonal flux of gravity wave stress (N m-2)
+17 17 Meridional flux of gravity wave stress (N m-2)
+18 18 Planetary boundary layer height (m)
+19 19 5-wave geopotential height anomaly (gpm)
+20 20 Standard deviation of sub-grid scale orography (m)
+21 21 Angle of sub-gridscale orography (rad)
+22 22 Slope of sub-gridscale orography (Numeric)
+23 23 Gravity wave dissipation (W m-2)
+24 24 Anisotropy of sub-gridscale orography (Numeric)
+25 25 Natural logarithm of pressure in Pa (Numeric)
+26 26 Exner pressure (Numeric)
+27 27 Updraught mass flux (kg m-2 s-1)
+28 28 Downdraught mass flux (kg m-2 s-1)
+29 29 Updraught detrainment rate (kg m-3 s-1)
+30 30 Downdraught detrainment rate (kg m-3 s-1)
+31 31 Unbalanced component of logarithm of surface pressure (-)
+32 32 Saturation water vapour pressure (Pa)
+33 33 Geometric altitude above mean sea level (m)
+34 34 Geometric height above ground level (m)
+35 35 Column integrated divergence of total mass flux (kg m-2 s-1)
+36 36 Column integrated eastward total mass flux (kg m-1 s-1)
+37 37 Column integrated northward total mass flux (kg m-1 s-1)
+38 38 Standard deviation of filtered subgrid orography (m)
+39 39 Column integrated mass of atmosphere (kg m-2)
+40 40 Column integrated eastward geopotential flux (W m-1)
+41 41 Column integrated northward geopotential flux (W m-1)
+42 42 Column integrated divergence of water geopotential flux (W m-2)
+43 43 Column integrated divergence of geopotential flux (W m-2)
+44 44 Height of zero-degree wet-bulb temperature (m)
+45 45 Height of one-degree wet-bulb temperature (m)
+46 46 Pressure departure from hydrostatic state (Pa)
+# 47-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.4.table b/definitions/grib2/tables/34/4.2.0.4.table
new file mode 100644
index 000000000..9bcceea28
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.4.table
@@ -0,0 +1,34 @@
+# Product discipline 0 - Meteorological products, parameter category 4: short-wave radiation
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+2 2 Short-wave radiation flux (W m-2)
+3 3 Global radiation flux (W m-2)
+4 4 Brightness temperature (K)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wavelength) (W m-3 sr-1)
+7 7 Downward short-wave radiation flux (W m-2)
+8 8 Upward short-wave radiation flux (W m-2)
+9 9 Net short wave radiation flux (W m-2)
+10 10 Photosynthetically active radiation (W m-2)
+11 11 Net short-wave radiation flux, clear sky (W m-2)
+12 12 Downward UV radiation (W m-2)
+13 13 Direct short-wave radiation flux (W m-2)
+14 14 Diffuse short-wave radiation flux (W m-2)
+15 15 Upward UV radiation emitted/reflected from the Earth's surface (W m-2)
+# 16-49 Reserved
+50 50 UV index (under clear sky) (Numeric)
+51 51 UV index (Numeric)
+52 52 Downward short-wave radiation flux, clear sky (W m-2)
+53 53 Upward short-wave radiation flux, clear sky (W m-2)
+54 54 Direct normal short-wave radiation flux (W m-2)
+55 55 UV visible albedo for diffuse radiation (%)
+56 56 UV visible albedo for direct radiation (%)
+57 57 UV visible albedo for direct radiation, geometric component (%)
+58 58 UV visible albedo for direct radiation, isotropic component (%)
+59 59 UV visible albedo for direct radiation, volumetric component (%)
+60 60 Photosynthetically active radiation flux, clear sky (W m-2)
+61 61 Direct short-wave radiation flux, clear sky (W m-2)
+62 62 Direct normal short-wave radiation flux, clear sky (W m-2)
+# 63-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.5.table b/definitions/grib2/tables/34/4.2.0.5.table
new file mode 100644
index 000000000..7065106a2
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.5.table
@@ -0,0 +1,18 @@
+# Product discipline 0 - Meteorological products, parameter category 5: long-wave radiation
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+2 2 Long-wave radiation flux (W m-2)
+3 3 Downward long-wave radiation flux (W m-2)
+4 4 Upward long-wave radiation flux (W m-2)
+5 5 Net long-wave radiation flux (W m-2)
+6 6 Net long-wave radiation flux, clear sky (W m-2)
+7 7 Brightness temperature (K)
+8 8 Downward long-wave radiation flux, clear sky (W m-2)
+9 9 Near IR albedo for diffuse radiation (%)
+10 10 Near IR albedo for direct radiation (%)
+11 11 Near IR albedo for direct radiation, geometric component (%)
+12 12 Near IR albedo for direct radiation, isotropic component (%)
+13 13 Near IR albedo for direct radiation, volumetric component (%)
+# 14-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.6.table b/definitions/grib2/tables/34/4.2.0.6.table
new file mode 100644
index 000000000..d831f3474
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.6.table
@@ -0,0 +1,51 @@
+# Product discipline 0 - Meteorological products, parameter category 6: cloud
+0 0 Cloud ice (kg m-2)
+1 1 Total cloud cover (%)
+2 2 Convective cloud cover (%)
+3 3 Low cloud cover (%)
+4 4 Medium cloud cover (%)
+5 5 High cloud cover (%)
+6 6 Cloud water (kg m-2)
+7 7 Cloud amount (%)
+8 8 Cloud type (Code table 4.203)
+9 9 Thunderstorm maximum tops (m)
+10 10 Thunderstorm coverage (Code table 4.204)
+11 11 Cloud base (m)
+12 12 Cloud top (m)
+13 13 Ceiling (m)
+14 14 Non-convective cloud cover (%)
+15 15 Cloud work function (J/kg)
+16 16 Convective cloud efficiency (Proportion)
+17 17 Total condensate (kg/kg)
+18 18 Total column-integrated cloud water (kg m-2)
+19 19 Total column-integrated cloud ice (kg m-2)
+20 20 Total column-integrated condensate (kg m-2)
+21 21 Ice fraction of total condensate (Proportion)
+22 22 Cloud cover (%)
+23 23 Cloud ice mixing ratio (kg/kg)
+24 24 Sunshine (Numeric)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
+26 26 Height of convective cloud base (m)
+27 27 Height of convective cloud top (m)
+28 28 Number of cloud droplets per unit mass of air (/kg)
+29 29 Number of cloud ice particles per unit mass of air (/kg)
+30 30 Number density of cloud droplets (m-3)
+31 31 Number density of cloud ice particles (m-3)
+32 32 Fraction of cloud cover (Numeric)
+33 33 Sunshine duration (s)
+34 34 Surface long-wave effective total cloudiness (Numeric)
+35 35 Surface short-wave effective total cloudiness (Numeric)
+36 36 Fraction of stratiform precipitation cover (Proportion)
+37 37 Fraction of convective precipitation cover (Proportion)
+38 38 Mass density of cloud droplets (kg m-3)
+39 39 Mass density of cloud ice (kg m-3)
+40 40 Mass density of convective cloud water droplets (kg m-3)
+# 41-46 Reserved
+47 47 Volume fraction of cloud water droplets (Numeric)
+48 48 Volume fraction of cloud ice particles (Numeric)
+49 49 Volume fraction of cloud (ice and/or water) (Numeric)
+50 50 Fog (%)
+51 51 Sunshine duration fraction (Proportion)
+# 52-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.0.7.table b/definitions/grib2/tables/34/4.2.0.7.table
new file mode 100644
index 000000000..15acb1857
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.0.7.table
@@ -0,0 +1,25 @@
+# Product discipline 0 - Meteorological products, parameter category 7: thermodynamic stability indices
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
+2 2 K index (K)
+3 3 KO index (K)
+4 4 Total totals index (K)
+5 5 Sweat index (Numeric)
+6 6 Convective available potential energy (J/kg)
+7 7 Convective inhibition (J/kg)
+8 8 Storm relative helicity (J/kg)
+9 9 Energy helicity index (Numeric)
+10 10 Surface lifted index (K)
+11 11 Best (4-layer) lifted index (K)
+12 12 Richardson number (Numeric)
+13 13 Showalter index (K)
+14 14 Reserved
+15 15 Updraught helicity (m2 s-2)
+16 16 Bulk Richardson number (Numeric)
+17 17 Gradient Richardson number (Numeric)
+18 18 Flux Richardson number (Numeric)
+19 19 Convective available potential energy - shear (m2 s-2)
+20 20 Thunderstorm intensity index (Code table 4.246)
+# 21-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.1.0.table b/definitions/grib2/tables/34/4.2.1.0.table
new file mode 100644
index 000000000..7072b3d44
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.1.0.table
@@ -0,0 +1,25 @@
+# Product discipline 1 - Hydrological products, parameter category 0: hydrology basic products
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
+4 4 Snow water equivalent per cent of normal (%)
+5 5 Baseflow-groundwater runoff (kg m-2)
+6 6 Storm surface runoff (kg m-2)
+7 7 Discharge from rivers or streams (m3/s)
+8 8 Groundwater upper storage (kg m-2)
+9 9 Groundwater lower storage (kg m-2)
+10 10 Side flow into river channel (m3 s-1 m-1)
+11 11 River storage of water (m3)
+12 12 Floodplain storage of water (m3)
+13 13 Water on soil surface (kg m-2)
+14 14 Upstream accumulated precipitation (kg m-2)
+15 15 Upstream accumulated snow melt (kg m-2)
+16 16 Percolation rate (kg m-2 s-1)
+17 17 River outflow of water (m3 s-1)
+18 18 Floodplain outflow of water (m3 s-1)
+19 19 Floodpath outflow of water (m3 s-1)
+20 20 Water on surface (kg m-2)
+# 21-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.1.1.table b/definitions/grib2/tables/34/4.2.1.1.table
new file mode 100644
index 000000000..e3931d5e6
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.1.1.table
@@ -0,0 +1,7 @@
+# Product discipline 1 - Hydrological products, parameter category 1: hydrology probabilities
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
+# 3-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.1.2.table b/definitions/grib2/tables/34/4.2.1.2.table
new file mode 100644
index 000000000..2c4e0f50d
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.1.2.table
@@ -0,0 +1,28 @@
+# Product discipline 1 - Hydrological products, parameter category 2: inland water and sediment properties
+0 0 Water depth (m)
+1 1 Water temperature (K)
+2 2 Water fraction (Proportion)
+3 3 Sediment thickness (m)
+4 4 Sediment temperature (K)
+5 5 Ice thickness (m)
+6 6 Ice temperature (K)
+7 7 Ice cover (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
+9 9 Shape factor with respect to salinity profile (-)
+10 10 Shape factor with respect to temperature profile in thermocline (-)
+11 11 Attenuation coefficient of water with respect to solar radiation (m)
+12 12 Salinity (kg/kg)
+13 13 Cross-sectional area of flow in channel (m2)
+14 14 Snow temperature (K)
+15 15 Lake depth (m)
+16 16 River depth (m)
+17 17 Floodplain depth (m)
+18 18 Floodplain flooded fraction (proportion)
+19 19 FLoodplain flooded area (m2)
+20 20 River fraction (proportion)
+21 21 River area (m2)
+22 22 Fraction of river coverage plus river related flooding (proportion)
+23 23 Area of river coverage plus river related flooding (m2)
+# 24-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.10.0.table b/definitions/grib2/tables/34/4.2.10.0.table
new file mode 100644
index 000000000..92b18661a
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.10.0.table
@@ -0,0 +1,103 @@
+# Product discipline 10 - Oceanographic products, parameter category 0: waves
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
+3 3 Significant height of combined wind waves and swell (m)
+4 4 Direction of wind waves (degree true)
+5 5 Significant height of wind waves (m)
+6 6 Mean period of wind waves (s)
+7 7 Direction of swell waves (degree true)
+8 8 Significant height of swell waves (m)
+9 9 Mean period of swell waves (s)
+10 10 Primary wave direction (degree true)
+11 11 Primary wave mean period (s)
+12 12 Secondary wave direction (degree true)
+13 13 Secondary wave mean period (s)
+14 14 Mean direction of combined wind waves and swell (degree true)
+15 15 Mean period of combined wind waves and swell (s)
+16 16 Coefficient of drag with waves (-)
+17 17 Friction velocity (m/s)
+18 18 Wave stress (N m-2)
+19 19 Normalized wave stress (-)
+20 20 Mean square slope of waves (-)
+21 21 u-component surface Stokes drift (m/s)
+22 22 v-component surface Stokes drift (m/s)
+23 23 Period of maximum individual wave height (s)
+24 24 Maximum individual wave height (m)
+25 25 Inverse mean wave frequency (s)
+26 26 Inverse mean frequency of wind waves (s)
+27 27 Inverse mean frequency of total swell (s)
+28 28 Mean zero-crossing wave period (s)
+29 29 Mean zero-crossing period of wind waves (s)
+30 30 Mean zero-crossing period of total swell (s)
+31 31 Wave directional width (-)
+32 32 Directional width of wind waves (-)
+33 33 Directional width of total swell (-)
+34 34 Peak wave period (s)
+35 35 Peak period of wind waves (s)
+36 36 Peak period of total swell (s)
+37 37 Altimeter wave height (m)
+38 38 Altimeter corrected wave height (m)
+39 39 Altimeter range relative correction (-)
+40 40 10-metre neutral wind speed over waves (m/s)
+41 41 10-metre wind direction over waves (deg)
+42 42 Wave energy spectrum (m2 s rad-1)
+43 43 Kurtosis of the sea-surface elevation due to waves (-)
+44 44 Benjamin-Feir index (-)
+45 45 Spectral peakedness factor (/s)
+46 46 Peak wave direction (deg)
+47 47 Significant wave height of first swell partition (m)
+48 48 Significant wave height of second swell partition (m)
+49 49 Significant wave height of third swell partition (m)
+50 50 Mean wave period of first swell partition (s)
+51 51 Mean wave period of second swell partition (s)
+52 52 Mean wave period of third swell partition (s)
+53 53 Mean wave direction of first swell partition (deg)
+54 54 Mean wave direction of second swell partition (deg)
+55 55 Mean wave direction of third swell partition (deg)
+56 56 Wave directional width of first swell partition (-)
+57 57 Wave directional width of second swell partition (-)
+58 58 Wave directional width of third swell partition (-)
+59 59 Wave frequency width of first swell partition (-)
+60 60 Wave frequency width of second swell partition (-)
+61 61 Wave frequency width of third swell partition (-)
+62 62 Wave frequency width (-)
+63 63 Frequency width of wind waves (-)
+64 64 Frequency width of total swell (-)
+65 65 Peak wave period of first swell partition (s)
+66 66 Peak wave period of second swell partition (s)
+67 67 Peak wave period of third swell partition (s)
+68 68 Peak wave direction of first swell partition (degree true)
+69 69 Peak wave direction of second swell partition (degree true)
+70 70 Peak wave direction of third swell partition (degree true)
+71 71 Peak direction of wind waves (degree true)
+72 72 Peak direction of total swell (degree true)
+73 73 Whitecap fraction (fraction)
+74 74 Mean direction of total swell (degree)
+75 75 Mean direction of wind waves (degree)
+76 76 Charnock (Numeric)
+77 77 Wave Spectral Skewness (Numeric)
+78 78 Wave energy flux magnitude (W m-1)
+79 79 Wave energy flux mean direction (degree true)
+80 80 Ratio of wave angular and frequency width (Numeric)
+81 81 Free convective velocity over the oceans (m s-1)
+82 82 Air density over the oceans (kg m-3)
+83 83 Normalized energy flux into waves (Numeric)
+84 84 Normalized stress into ocean (Numeric)
+85 85 Normalized energy flux into ocean (Numeric)
+86 86 Surface elevation variance due to waves (over all frequencies and directions) (m2 s rad-1)
+87 87 Wave induced mean sea level correction (m)
+88 88 Spectral width index (Numeric)
+89 89 Number of events in freak waves statistics (Numeric)
+90 90 u-component of surface momentum flux into ocean (N m-2)
+91 91 v-component of surface momentum flux into ocean (N m-2)
+92 92 Wave turbulent energy flux into ocean (W m-2)
+93 93 Envelop maximum individual wave height (m)
+94 94 Time domain maximum individual crest height (m)
+95 95 Time domain maximum individual wave height (m)
+96 96 Space time maximum individual crest height (m)
+97 97 Space time maximum individual wave height (m)
+98 98 Goda peakedness factor (Numeric)
+# 99-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.10.1.table b/definitions/grib2/tables/34/4.2.10.1.table
new file mode 100644
index 000000000..aeec67455
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.10.1.table
@@ -0,0 +1,11 @@
+# Product discipline 10 - Oceanographic products, parameter category 1: currents
+0 0 Current direction (degree true)
+1 1 Current speed (m/s)
+2 2 u-component of current (m/s)
+3 3 v-component of current (m/s)
+4 4 Rip current occurrence probability (%)
+5 5 Eastward current (m s-1)
+6 6 Northward current (m s-1)
+# 7-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.10.191.table b/definitions/grib2/tables/34/4.2.10.191.table
new file mode 100644
index 000000000..cd4d4cde7
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.10.191.table
@@ -0,0 +1,9 @@
+# Product discipline 10 - Oceanographic products, parameter category 191: miscellaneous
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+1 1 Meridional overturning stream function (m3/s)
+2 2 Reserved
+3 3 Days since last observation (d)
+4 4 Barotropic stream function (m3 s-1)
+# 5-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.10.2.table b/definitions/grib2/tables/34/4.2.10.2.table
new file mode 100644
index 000000000..0f27bd249
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.10.2.table
@@ -0,0 +1,34 @@
+# Product discipline 10 - Oceanographic products, parameter category 2: ice
+0 0 Ice cover (Proportion)
+1 1 Ice thickness (m)
+2 2 Direction of ice drift (degree true)
+3 3 Speed of ice drift (m/s)
+4 4 u-component of ice drift (m/s)
+5 5 v-component of ice drift (m/s)
+6 6 Ice growth rate (m/s)
+7 7 Ice divergence (/s)
+8 8 Ice temperature (K)
+9 9 Module of ice internal pressure (Pa m)
+10 10 Zonal vector component of vertically integrated ice internal pressure (Pa m)
+11 11 Meridional vector component of vertically integrated ice internal pressure (Pa m)
+12 12 Compressive ice strength (N/m)
+13 13 Snow temperature (over sea ice) (K)
+14 14 Albedo (Numeric)
+15 15 Sea ice volume per unit area (m3 m-2)
+16 16 Snow volume over sea ice per unit area (m3 m-2)
+17 17 Sea ice heat content (J m-2)
+18 18 Snow over sea ice heat content (J m-2)
+19 19 Ice freeboard thickness (m)
+20 20 Ice melt pond fraction (fraction)
+21 21 Ice melt pond depth (m)
+22 22 Ice melt pond volume per unit area (m3 m-2)
+23 23 Sea ice fraction tendency due to parameterization (s-1)
+24 24 x-component of ice drift (m s-1)
+25 25 y-component of ice drift (m s-1)
+26 26 Sea ice salinity (g kg-1)
+27 27 Freezing/melting potential (W m-2)
+28 28 Melt onset date (Numeric)
+29 29 Freeze onset date (Numeric)
+# 30-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.10.3.table b/definitions/grib2/tables/34/4.2.10.3.table
new file mode 100644
index 000000000..6c4277c8e
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.10.3.table
@@ -0,0 +1,26 @@
+# Product discipline 10 - Oceanographic products, parameter category 3: surface properties
+0 0 Water temperature (K)
+1 1 Deviation of sea level from mean (m)
+2 2 Heat exchange coefficient (-)
+3 3 Practical salinity (Numeric)
+4 4 Downward heat flux (W m-2)
+5 5 Eastward surface stress (N m-2)
+6 6 Northward surface stress (N m-2)
+7 7 x-component surface stress (N m-2)
+8 8 y-component surface stress (N m-2)
+9 9 Thermosteric change in sea surface height (m)
+10 10 Halosteric change in sea surface height (m)
+11 11 Steric change in sea surface height (m)
+12 12 Sea salt flux (kg m-2 s-1)
+13 13 Net upward water flux (kg m-2 s-1)
+14 14 Eastward surface water velocity (m s-1)
+15 15 Northward surface water velocity (m s-1)
+16 16 x-component of surface water velocity (m s-1)
+17 17 y-component of surface water velocity (m s-1)
+18 18 Heat flux correction (W m-2)
+19 19 Sea surface height tendency due to parameterization (m s-1)
+20 20 Deviation of sea level from mean with inverse barometer correction (m)
+21 21 Salinity (kg kg-1)
+# 22-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.10.4.table b/definitions/grib2/tables/34/4.2.10.4.table
new file mode 100644
index 000000000..c9d052519
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.10.4.table
@@ -0,0 +1,57 @@
+# Product discipline 10 - Oceanographic products, parameter category 4: subsurface properties
+0 0 Main thermocline depth (m)
+1 1 Main thermocline anomaly (m)
+2 2 Transient thermocline depth (m)
+3 3 Salinity (kg/kg)
+4 4 Ocean vertical heat diffusivity (m2/s)
+5 5 Ocean vertical salt diffusivity (m2/s)
+6 6 Ocean vertical momentum diffusivity (m2/s)
+7 7 Bathymetry (m)
+# 8-10 Reserved
+11 11 Shape factor with respect to salinity profile (-)
+12 12 Shape factor with respect to temperature profile in thermocline (-)
+13 13 Attenuation coefficient of water with respect to solar radiation (/m)
+14 14 Water depth (m)
+15 15 Water temperature (K)
+16 16 Water density (rho) (kg m-3)
+17 17 Water density anomaly (sigma) (kg m-3)
+18 18 Water potential temperature (theta) (K)
+19 19 Water potential density (rho theta) (kg m-3)
+20 20 Water potential density anomaly (sigma theta) (kg m-3)
+21 21 Practical salinity (Numeric)
+22 22 Water column-integrated heat content (J m-2)
+23 23 Eastward water velocity (m s-1)
+24 24 Northward water velocity (m s-1)
+25 25 x-component water velocity (m s-1)
+26 26 y-component water velocity (m s-1)
+27 27 Upward water velocity (m s-1)
+28 28 Vertical eddy diffusivity (m2 s-1)
+29 29 Bottom pressure equivalent height (m)
+30 30 Fresh water flux into sea water from rivers (kg m-2 s-1)
+31 31 Fresh water flux correction (kg m-2 s-1)
+32 32 Virtual salt flux into sea water (g kg-1 m-2 s-1)
+33 33 Virtual salt flux correction (g kg-1 m-2 s-1)
+34 34 Sea water temperature tendency due to Newtonian relaxation (K s-1)
+35 35 Sea water salinity tendency due to Newtonian relaxation (g kg-1 s-1)
+36 36 Sea water temperature tendency due to parameterization (K s-1)
+37 37 Sea water salinity tendency due to parameterization (g kg-1 s-1)
+38 38 Eastward sea water velocity tendency due to parameterization (m s-2)
+39 39 Northward sea water velocity tendency due to parameterization (m s-2)
+40 40 Sea water temperature tendency due to direct bias correction (K s-1)
+41 41 Sea water salinity tendency due to direct bias correction (g kg-1 s-1)
+42 42 Sea water meridional volume transport (m3 m-2 s-1)
+43 43 Sea water zonal volume transport (m3 m-2 s-1)
+44 44 Sea water column integrated meridional volume transport (m3 m-1 s-1)
+45 45 Sea water column integrated zonal volume transport (m3 m-1 s-1)
+46 46 Sea water meridional mass transport (kg m-2 s-1)
+47 47 Sea water zonal mass transport (kg m-2 s-1)
+48 48 Sea water column integrated meridional mass transport (kg m-1 s-1)
+49 49 Sea water column integrated zonal mass transport (kg m-1 s-1)
+50 50 Sea water column integrated practical salinity (g kg-1 m)
+51 51 Sea water column integrated salinity (kg kg-1 m)
+52 52 Mixed layer depth (m)
+53 53 Normal component of water velocity (m s-1)
+54 54 Tangential component of water velocity (m s-1)
+# 55-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.2.0.table b/definitions/grib2/tables/34/4.2.2.0.table
new file mode 100644
index 000000000..8daeafd85
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.2.0.table
@@ -0,0 +1,68 @@
+# Product discipline 2 - Land surface products, parameter category 0: vegetation/biomass
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
+1 1 Surface roughness (m)
+2 2 Soil temperature (K)
+3 3 Soil moisture content (kg m-2)
+4 4 Vegetation (%)
+5 5 Water runoff (kg m-2)
+6 6 Evapotranspiration (kg-2 s-1)
+7 7 Model terrain height (m)
+8 8 Land use (Code table 4.212)
+9 9 Volumetric soil moisture content (Proportion)
+10 10 Ground heat flux (W m-2)
+11 11 Moisture availability (%)
+12 12 Exchange coefficient (kg m-2 s-1)
+13 13 Plant canopy surface water (kg m-2)
+14 14 Blackadar's mixing length scale (m)
+15 15 Canopy conductance (m/s)
+16 16 Minimal stomatal resistance (s/m)
+17 17 Wilting point (Proportion)
+18 18 Solar parameter in canopy conductance (Proportion)
+19 19 Temperature parameter in canopy (Proportion)
+20 20 Humidity parameter in canopy conductance (Proportion)
+21 21 Soil moisture parameter in canopy conductance (Proportion)
+22 22 Soil moisture (kg m-3)
+23 23 Column-integrated soil water (kg m-2)
+24 24 Heat flux (W m-2)
+25 25 Volumetric soil moisture (m3 m-3)
+26 26 Wilting point (kg m-3)
+27 27 Volumetric wilting point (m3 m-3)
+28 28 Leaf area index (Numeric)
+29 29 Evergreen forest cover (Proportion)
+30 30 Deciduous forest cover (Proportion)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
+32 32 Root depth of vegetation (m)
+33 33 Water runoff and drainage (kg m-2)
+34 34 Surface water runoff (kg m-2)
+35 35 Tile class (Code table 4.243)
+36 36 Tile fraction (Proportion)
+37 37 Tile percentage (%)
+38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
+39 39 Evapotranspiration rate (kg m-2 s-1)
+40 40 Potential evapotranspiration rate (kg m-2 s-1)
+41 41 Snow melt rate (kg m-2 s-1)
+42 42 Water runoff and drainage rate (kg m-2 s-1)
+43 43 Drainage direction (Code table 4.250)
+44 44 Upstream area (m2)
+45 45 Wetland cover (Proportion)
+46 46 Wetland type (Code table 4.239)
+47 47 Irrigation cover (Proportion)
+48 48 C4 crop cover (Proportion)
+49 49 C4 grass cover (Proportion)
+50 50 Skin reservoir content (kg m-2)
+51 51 Surface runoff rate (kg m-2 s-1)
+52 52 Subsurface runoff rate (kg m-2 s-1)
+53 53 Low-vegetation cover (Proportion)
+54 54 High-vegetation cover (Proportion)
+55 55 Leaf area index, low-vegetation (m2 m-2)
+56 56 Leaf area index, high-vegetation (m2 m-2)
+57 57 Type of low-vegetation (Code table 4.234)
+58 58 Type of high-vegetation (Code table 4.234)
+59 59 Net ecosystem exchange flux (kg m-2 s-1)
+60 60 Gross primary production flux (kg m-2 s-1)
+61 61 Ecosystem respiration flux (kg m-2 s-1)
+62 62 Emissivity (Proportion)
+63 63 Canopy air temperature (K)
+# 64-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.2.3.table b/definitions/grib2/tables/34/4.2.2.3.table
new file mode 100644
index 000000000..ad6b618f2
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.2.3.table
@@ -0,0 +1,35 @@
+# Product discipline 2 - Land surface products, parameter category 3: soil products
+0 0 Soil type (Code table 4.213)
+1 1 Upper layer soil temperature (K)
+2 2 Upper layer soil moisture (kg m-3)
+3 3 Lower layer soil moisture (kg m-3)
+4 4 Bottom layer soil temperature (K)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+6 6 Number of soil layers in root zone (Numeric)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
+9 9 Soil porosity (Proportion)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
+15 15 Soil porosity (m3 m-3)
+16 16 Volumetric saturation of soil moisture (m3 m-3)
+17 17 Saturation of soil moisture (kg m-3)
+18 18 Soil temperature (K)
+19 19 Soil moisture (kg m-3)
+20 20 Column-integrated soil moisture (kg m-2)
+21 21 Soil ice (kg m-3)
+22 22 Column-integrated soil ice (kg m-2)
+23 23 Liquid water in snow pack (kg m-2)
+24 24 Frost index (K day-1)
+25 25 Snow depth at elevation bands (kg m-2)
+26 26 Soil heat flux (W m-2)
+27 27 Soil depth (m)
+28 28 Snow temperature (K)
+29 29 Ice temperature (K)
+30 30 Soil wetness index (Numeric)
+# 31-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.2.4.table b/definitions/grib2/tables/34/4.2.2.4.table
new file mode 100644
index 000000000..0ea44a18c
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.2.4.table
@@ -0,0 +1,41 @@
+# Product discipline 2 - Land surface products, parameter category 4: fire weather products
+0 0 Fire outlook (Code table 4.224)
+1 1 Fire outlook due to dry thunderstorm (Code table 4.224)
+2 2 Haines index (Numeric)
+3 3 Fire burned area (%)
+4 4 Fosberg index (Numeric)
+5 5 Forest Fire Weather Index (as defined by the Canadian Forest Service) (Numeric)
+6 6 Fine Fuel Moisture Code (as defined by the Canadian Forest Service) (Numeric)
+7 7 Duff Moisture Code (as defined by the Canadian Forest Service) (Numeric)
+8 8 Drought Code (as defined by the Canadian Forest Service) (Numeric)
+9 9 Initial Fire Spread Index (as defined by the Canadian Forest Service) (Numeric)
+10 10 Fire Buildup Index (as defined by the Canadian Forest Service) (Numeric)
+11 11 Fire Daily Severity Rating (as defined by the Canadian Forest Service) (Numeric)
+12 12 Keetch-Byram drought index (Numeric)
+13 13 Drought factor (as defined by the Australian forest service ) (Numeric)
+14 14 Rate of spread (as defined by the Australian forest service ) (m/s)
+15 15 Fire danger index (as defined by the Australian forest service ) (Numeric)
+16 16 Spread component (as defined by the US Forest Service National Fire Danger Rating System) (Numeric)
+17 17 Burning index (as defined by the US Forest Service National Fire Danger Rating System) (Numeric)
+18 18 Ignition component (as defined by the US Forest Service National Fire Danger Rating System) (%)
+19 19 Energy release component (as defined by the US Forest Service National Fire Danger Rating System) (Joule/m2)
+20 20 Burning area (%)
+21 21 Burnable area (%)
+22 22 Unburnable area (%)
+23 23 Fuel load (kg m-2)
+24 24 Combustion completeness (%)
+25 25 Fuel moisture content (kg kg-1)
+26 26 Wildfire potential (as defined by the US NOAA Global Systems Laboratory) (Numeric)
+27 27 Live leaf fuel load (kg m-2)
+28 28 Live wood fuel load (kg m-2)
+29 29 Dead leaf fuel load (kg m-2)
+30 30 Dead wood fuel load (kg m-2)
+31 31 Live fuel moisture content (kg kg-1)
+32 32 Fine dead leaf moisture content (kg kg-1)
+33 33 Dense dead leaf moisture content (kg kg-1)
+34 34 Fine dead wood moisture content (kg kg-1)
+35 35 Dense dead wood moisture content (kg kg-1)
+36 36 Fire radiative power (W)
+# 37-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.2.5.table b/definitions/grib2/tables/34/4.2.2.5.table
new file mode 100644
index 000000000..1d08dd573
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.2.5.table
@@ -0,0 +1,6 @@
+# Product discipline 2 - Land surface products, parameter category 5: glaciers and inland ice
+0 0 Glacier cover (Proportion)
+1 1 Glacier temperature (K)
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.2.6.table b/definitions/grib2/tables/34/4.2.2.6.table
new file mode 100644
index 000000000..7a7712af0
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.2.6.table
@@ -0,0 +1,13 @@
+# Product discipline 2 - Land surface products, parameter category 6: urban areas
+0 0 Urban cover (Proportion)
+1 1 Road cover (Proportion)
+2 2 Building cover (Proportion)
+3 3 Building height (m)
+4 4 Vertical-to-horizontal area fraction (m2 m-2)
+5 5 Standard deviation of building height (m)
+6 6 Distance downward from roof surface (m)
+7 7 Distance inward from outer wall surface (m)
+8 8 Distance downward from road surface (m)
+# 9-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.2.7.table b/definitions/grib2/tables/34/4.2.2.7.table
new file mode 100644
index 000000000..1657058c7
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.2.7.table
@@ -0,0 +1,7 @@
+# Product discipline 2 - Land surface products, parameter category 7: thermodynamic properties
+0 0 Heat net flux (W m-2)
+1 1 Latent heat net flux (W m-2)
+2 2 Sensible heat net flux (W m-2)
+# 3-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.20.0.table b/definitions/grib2/tables/34/4.2.20.0.table
new file mode 100644
index 000000000..a997371d9
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.20.0.table
@@ -0,0 +1,13 @@
+# Product discipline 20 - Health and socioeconomic impacts, parameter category 0: health indicators
+0 0 Universal thermal climate index (K)
+1 1 Mean radiant temperature (K)
+2 2 Wet-bulb globe temperature (K)
+3 3 Globe temperature (K)
+4 4 Humidex (K)
+5 5 Effective temperature (K)
+6 6 Normal effective temperature (K)
+7 7 Standard effective temperature (K)
+8 8 Physiological equivalent temperature (K)
+# 9-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.20.1.table b/definitions/grib2/tables/34/4.2.20.1.table
new file mode 100644
index 000000000..0712cd8d1
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.20.1.table
@@ -0,0 +1,14 @@
+# Product discipline 20 - Health and socioeconomic impacts, parameter category 1: epidemiology
+0 0 Malaria cases (Fraction)
+1 1 Malaria circumsporozoite protein rate (Fraction)
+2 2 Plasmodium falciparum entomological inoculation rate (Bites per day per person)
+3 3 Human bite rate by anopheles vectors (Bites per day per person)
+4 4 Malaria immunity (Fraction)
+5 5 Falciparum parasite rates (Fraction)
+6 6 Detectable falciparum parasite ratio (after day 10) (Fraction)
+7 7 Anopheles vector to host ratio (Fraction)
+8 8 Anopheles vector number (Number m-2)
+9 9 Fraction of malarial vector reproductive habitat (Fraction)
+# 10-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.20.2.table b/definitions/grib2/tables/34/4.2.20.2.table
new file mode 100644
index 000000000..d6b9083d1
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.20.2.table
@@ -0,0 +1,5 @@
+# Product discipline 20 - Health and socioeconomic impacts, parameter category 2: socioeconomic indicators
+0 0 Population density (Person m-2)
+# 1-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.20.3.table b/definitions/grib2/tables/34/4.2.20.3.table
new file mode 100644
index 000000000..9c2f80cfa
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.20.3.table
@@ -0,0 +1,14 @@
+# Product discipline 20 - Health and socioeconomic impacts, parameter category 3: renewable energy sector
+0 0 Renewable power capacity (W)
+1 1 Renewable power production rate (W)
+2 2 Wind power capacity (W)
+3 3 Wind power production rate (W)
+4 4 Solar photovoltaic (PV) power capacity (W)
+5 5 Solar photovoltaic (PV) power production rate (W)
+6 6 Solar non-photovoltaic (PV) power capacity (W)
+7 7 Solar non-photovoltaic (PV) power production rate (W)
+8 8 Concentrated solar power (CSP) power capacity (W)
+9 9 Concentrated solar power (CSP) power production rate (W)
+# 10-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.3.0.table b/definitions/grib2/tables/34/4.2.3.0.table
new file mode 100644
index 000000000..0bec15119
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.3.0.table
@@ -0,0 +1,14 @@
+# Product discipline 3 - Space products, parameter category 0: image format products
+0 0 Scaled radiance (Numeric)
+1 1 Scaled albedo (Numeric)
+2 2 Scaled brightness temperature (Numeric)
+3 3 Scaled precipitable water (Numeric)
+4 4 Scaled lifted index (Numeric)
+5 5 Scaled cloud top pressure (Numeric)
+6 6 Scaled skin temperature (Numeric)
+7 7 Cloud mask (Code table 4.217)
+8 8 Pixel scene type (Code table 4.218)
+9 9 Fire detection indicator (Code table 4.223)
+# 10-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.3.1.table b/definitions/grib2/tables/34/4.2.3.1.table
new file mode 100644
index 000000000..d5dda2af5
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.3.1.table
@@ -0,0 +1,39 @@
+# Product discipline 3 - Space products, parameter category 1: quantitative products
+0 0 Estimated precipitation (kg m-2)
+1 1 Instantaneous rain rate (kg m-2 s-1)
+2 2 Cloud top height (m)
+3 3 Cloud top height quality indicator (Code table 4.219)
+4 4 Estimated u-component of wind (m/s)
+5 5 Estimated v-component of wind (m/s)
+6 6 Number of pixel used (Numeric)
+7 7 Solar zenith angle (deg)
+8 8 Relative azimuth angle (deg)
+9 9 Reflectance in 0.6 micron channel (%)
+10 10 Reflectance in 0.8 micron channel (%)
+11 11 Reflectance in 1.6 micron channel (%)
+12 12 Reflectance in 3.9 micron channel (%)
+13 13 Atmospheric divergence (/s)
+14 14 Cloudy brightness temperature (K)
+15 15 Clear-sky brightness temperature (K)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+18 18 Reserved
+19 19 Wind speed (m/s)
+20 20 Aerosol optical thickness at 0.635 um
+21 21 Aerosol optical thickness at 0.810 um
+22 22 Aerosol optical thickness at 1.640 um
+23 23 Angstrom coefficient
+24 24 Cosine of the solar zenith angle (Numeric)
+# 25-26 Reserved
+27 27 Bidirectional reflectance factor (Numeric)
+28 28 Brightness temperature (K)
+29 29 Scaled radiance (Numeric)
+30 30 Reflectance in 0.4 micron channel (%)
+31 31 Cloudy reflectance (%)
+32 32 Clear reflectance (%)
+# 33-97 Reserved
+98 98 Correlation coefficient between MPE rain-rates for the co-located IR data and the microwave data rain-rates (Numeric)
+99 99 Standard deviation between MPE rain-rates for the co-located IR data and the microwave data rain-rates (kg m-2 s-1)
+# 100-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.3.2.table b/definitions/grib2/tables/34/4.2.3.2.table
new file mode 100644
index 000000000..2471f0ba7
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.3.2.table
@@ -0,0 +1,27 @@
+# Product discipline 3 - Space products, parameter category 2: cloud properties
+0 0 Clear sky probability (%)
+1 1 Cloud top temperature (K)
+2 2 Cloud top pressure (Pa)
+3 3 Cloud type (Code table 4.218)
+4 4 Cloud phase (Code table 4.218)
+5 5 Cloud optical depth (Numeric)
+6 6 Cloud particle effective radius (m)
+7 7 Cloud liquid water path (kg m-2)
+8 8 Cloud ice water path (kg m-2)
+9 9 Cloud albedo (Numeric)
+10 10 Cloud emissivity (Numeric)
+11 11 Effective absorption optical depth ratio (Numeric)
+30 30 Measurement cost (Numeric)
+31 31 Upper layer cloud optical depth (Numeric)
+32 32 Upper layer cloud top pressure (Pa)
+33 33 Upper layer cloud effective radius (m)
+34 34 Error in upper layer cloud optical depth (Numeric)
+35 35 Error in upper layer cloud top pressure (Pa)
+36 36 Error in upper layer cloud effective radius (m)
+37 37 Lower layer cloud optical depth (Numeric)
+38 38 Lower layer cloud top pressure (Pa)
+39 39 Error in lower layer cloud optical depth (Numeric)
+40 40 Error in lower layer cloud top pressure (Pa)
+# 41-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.3.3.table b/definitions/grib2/tables/34/4.2.3.3.table
new file mode 100644
index 000000000..3a53cdc81
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.3.3.table
@@ -0,0 +1,7 @@
+# Product discipline 3 - Space products, parameter category 3: flight rule conditions
+0 0 Probability of encountering marginal visual flight rule conditions (%)
+1 1 Probability of encountering low instrument flight rule conditions (%)
+2 2 Probability of encountering instrument flight rule conditions (%)
+# 3-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.3.4.table b/definitions/grib2/tables/34/4.2.3.4.table
new file mode 100644
index 000000000..d26b12bd5
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.3.4.table
@@ -0,0 +1,13 @@
+# Product discipline 3 - Space products, parameter category 4: volcanic ash
+0 0 Volcanic ash probability (%)
+1 1 Volcanic ash cloud top temperature (K)
+2 2 Volcanic ash cloud top pressure (Pa)
+3 3 Volcanic ash cloud top height (m)
+4 4 Volcanic ash cloud emissivity (Numeric)
+5 5 Volcanic ash effective absorption optical depth ratio (Numeric)
+6 6 Volcanic ash cloud optical depth (Numeric)
+7 7 Volcanic ash column density (kg m-2)
+8 8 Volcanic ash particle effective radius (m)
+# 9-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.3.5.table b/definitions/grib2/tables/34/4.2.3.5.table
new file mode 100644
index 000000000..ef8096f82
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.3.5.table
@@ -0,0 +1,10 @@
+# Product discipline 3 - Space products, parameter category 5: sea-surface temperature
+0 0 Interface sea-surface temperature (K)
+1 1 Skin sea-surface temperature (K)
+2 2 Sub-skin sea-surface temperature (K)
+3 3 Foundation sea-surface temperature (K)
+4 4 Estimated bias between sea-surface temperature and standard (K)
+5 5 Estimated standard deviation between sea surface temperature and standard (K)
+# 6-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.3.6.table b/definitions/grib2/tables/34/4.2.3.6.table
new file mode 100644
index 000000000..34a5c307c
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.3.6.table
@@ -0,0 +1,10 @@
+# Product discipline 3 - Space products, parameter category 6: solar radiation
+0 0 Global solar irradiance (W m-2)
+1 1 Global solar exposure (J m-2)
+2 2 Direct solar irradiance (W m-2)
+3 3 Direct solar exposure (J m-2)
+4 4 Diffuse solar irradiance (W m-2)
+5 5 Diffuse solar exposure (J m-2)
+# 6-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.4.0.table b/definitions/grib2/tables/34/4.2.4.0.table
new file mode 100644
index 000000000..337308305
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.4.0.table
@@ -0,0 +1,10 @@
+# Product discipline 4 - Space weather products, parameter category 0: temperature
+0 0 Temperature (K)
+1 1 Electron temperature (K)
+2 2 Proton temperature (K)
+3 3 Ion temperature (K)
+4 4 Parallel temperature (K)
+5 5 Perpendicular temperature (K)
+# 6-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.4.1.table b/definitions/grib2/tables/34/4.2.4.1.table
new file mode 100644
index 000000000..9ec11160f
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.4.1.table
@@ -0,0 +1,8 @@
+# Product discipline 4 - Space weather products, parameter category 1: momentum
+0 0 Velocity magnitude (speed) (m s-1)
+1 1 1st vector component of velocity (coordinate system dependent) (m s-1)
+2 2 2nd vector component of velocity (coordinate system dependent) (m s-1)
+3 3 3rd vector component of velocity (coordinate system dependent) (m s-1)
+# 4-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.4.10.table b/definitions/grib2/tables/34/4.2.4.10.table
new file mode 100644
index 000000000..8f5b19e06
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.4.10.table
@@ -0,0 +1,12 @@
+# Product discipline 4 - Space weather products, parameter category 10: space weather indices
+0 0 Scintillation index (sigma phi) (rad)
+1 1 Scintillation index S4 (Numeric)
+2 2 Rate of change of TEC index (ROTI) (TECU/min)
+3 3 Disturbance ionosphere index spatial gradient (DIXSG) (Numeric)
+4 4 Along arc TEC rate (AATR) (TECU/min)
+5 5 Kp (Numeric)
+6 6 Equatorial disturbance storm time index (Dst) (nT)
+7 7 Auroral electrojet (AE) (nT)
+# 8-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.4.2.table b/definitions/grib2/tables/34/4.2.4.2.table
new file mode 100644
index 000000000..b479b3361
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.4.2.table
@@ -0,0 +1,18 @@
+# Product discipline 4 - Space weather products, parameter category 2: charged particle mass and number
+0 0 Particle number density (m-3)
+1 1 Electron density (m-3)
+2 2 Proton density (m-3)
+3 3 Ion density (m-3)
+4 4 Vertical total electron content (TECU)
+5 5 HF absorption frequency (Hz)
+6 6 HF absorption (dB)
+7 7 Spread F (m)
+8 8 h'F (m)
+9 9 Critical frequency (Hz)
+10 10 Maximal usable frequency (MUF) (Hz)
+11 11 Peak height (hm) (m)
+12 12 Peak density (Nm) (m-3)
+13 13 Equivalent slab thickness (tau) (km)
+# 14-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.4.3.table b/definitions/grib2/tables/34/4.2.4.3.table
new file mode 100644
index 000000000..3b752bbbc
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.4.3.table
@@ -0,0 +1,12 @@
+# Product discipline 4 - Space weather products, parameter category 3: electric and magnetic fields
+0 0 Magnetic field magnitude (T)
+1 1 1st vector component of magnetic field (T)
+2 2 2nd vector component of magnetic field (T)
+3 3 3rd vector component of magnetic field (T)
+4 4 Electric field magnitude (V m-1)
+5 5 1st vector component of electric field (V m-1)
+6 6 2nd vector component of electric field (V m-1)
+7 7 3rd vector component of electric field (V m-1)
+# 8-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.4.4.table b/definitions/grib2/tables/34/4.2.4.4.table
new file mode 100644
index 000000000..694c8cacc
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.4.4.table
@@ -0,0 +1,11 @@
+# Product discipline 4 - Space weather products, parameter category 4: energetic particles
+0 0 Proton flux (differential) ((m2 s sr eV)-1)
+1 1 Proton flux (integral) ((m2 s sr )-1)
+2 2 Electron flux (differential) ((m2 s sr eV)-1)
+3 3 Electron flux (integral) ((m2 s sr)-1)
+4 4 Heavy ion flux (differential) ((m2 s sr eV/nuc)-1)
+5 5 Heavy ion flux (integral) ((m2 s sr)-1)
+6 6 Cosmic ray neutron flux (h-1)
+# 7-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.4.5.table b/definitions/grib2/tables/34/4.2.4.5.table
new file mode 100644
index 000000000..913efec6f
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.4.5.table
@@ -0,0 +1,8 @@
+# Product discipline 4 - Space weather products, parameter category 5: waves
+0 0 Amplitude (dB)
+1 1 Phase (rad)
+2 2 Frequency (Hz)
+3 3 Wavelength (m)
+# 4-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.4.6.table b/definitions/grib2/tables/34/4.2.4.6.table
new file mode 100644
index 000000000..6d13019a6
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.4.6.table
@@ -0,0 +1,11 @@
+# Product discipline 4 - Space weather products, parameter category 6: solar electromagnetic emissions
+0 0 Integrated solar irradiance (W m-2)
+1 1 Solar X-ray flux (XRS long) (W m-2)
+2 2 Solar X-ray flux (XRS short) (W m-2)
+3 3 Solar EUV irradiance (W m-2)
+4 4 Solar spectral irradiance (W m-2 nm-1)
+5 5 F10.7 (W m-2 Hz-1)
+6 6 Solar radio emissions (W m-2 Hz-1)
+# 7-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.4.7.table b/definitions/grib2/tables/34/4.2.4.7.table
new file mode 100644
index 000000000..38c2b17a8
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.4.7.table
@@ -0,0 +1,8 @@
+# Product discipline 4 - Space weather products, parameter category 7: terrestrial electromagnetic emissions
+0 0 Limb intensity (J m-2 s-1)
+1 1 Disk intensity (J m-2 s-1)
+2 2 Disk intensity day (J m-2 s-1)
+3 3 Disk intensity night (J m-2 s-1)
+# 4-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.4.8.table b/definitions/grib2/tables/34/4.2.4.8.table
new file mode 100644
index 000000000..f350f4807
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.4.8.table
@@ -0,0 +1,13 @@
+# Product discipline 4 - Space weather products, parameter category 8: imagery
+0 0 X-ray radiance (W sr-1 m-2)
+1 1 EUV radiance (W sr-1 m-2)
+2 2 H-alpha radiance (W sr-1 m-2)
+3 3 White light radiance (W sr-1 m-2)
+4 4 CaII-K radiance (W sr-1 m-2)
+5 5 White light coronagraph radiance (W sr-1 m-2)
+6 6 Heliospheric radiance (W sr-1 m-2)
+7 7 Thematic mask (Numeric)
+8 8 Solar induced chlorophyll fluorescence (W m-2 sr-1 m-1)
+# 9-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.2.4.9.table b/definitions/grib2/tables/34/4.2.4.9.table
new file mode 100644
index 000000000..0e83436e2
--- /dev/null
+++ b/definitions/grib2/tables/34/4.2.4.9.table
@@ -0,0 +1,7 @@
+# Product discipline 4 - Space weather products, parameter category 9: ion-neutral coupling
+0 0 Pedersen conductivity (S m-1)
+1 1 Hall conductivity (S m-1)
+2 2 Parallel conductivity (S m-1)
+# 3-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.201.table b/definitions/grib2/tables/34/4.201.table
new file mode 100644
index 000000000..78e9307c3
--- /dev/null
+++ b/definitions/grib2/tables/34/4.201.table
@@ -0,0 +1,19 @@
+# Code table 4.201 - Precipitation type
+0 0 No precipitation
+1 1 Rain
+2 2 Thunderstorm
+3 3 Freezing rain
+4 4 Mixed/ice
+5 5 Snow
+6 6 Wet snow
+7 7 Mixture of rain and snow
+8 8 Ice pellets
+9 9 Graupel
+10 10 Hail
+11 11 Drizzle
+12 12 Freezing drizzle
+13 13 Hail (less than 5 mm)
+14 14 Hail (greater than or equal to 5 mm)
+# 15-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.202.table b/definitions/grib2/tables/34/4.202.table
new file mode 100644
index 000000000..7f3c8f6cf
--- /dev/null
+++ b/definitions/grib2/tables/34/4.202.table
@@ -0,0 +1,4 @@
+# Code table 4.202 - Precipitable water category
+# 0-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.203.table b/definitions/grib2/tables/34/4.203.table
new file mode 100644
index 000000000..cf5eb6bdc
--- /dev/null
+++ b/definitions/grib2/tables/34/4.203.table
@@ -0,0 +1,26 @@
+# Code table 4.203 - Cloud type
+0 0 Clear
+1 1 Cumulonimbus
+2 2 Stratus
+3 3 Stratocumulus
+4 4 Cumulus
+5 5 Altostratus
+6 6 Nimbostratus
+7 7 Altocumulus
+8 8 Cirrostratus
+9 9 Cirrocumulus
+10 10 Cirrus
+11 11 Cumulonimbus - ground-based fog beneath the lowest layer
+12 12 Stratus - ground-based fog beneath the lowest layer
+13 13 Stratocumulus - ground-based fog beneath the lowest layer
+14 14 Cumulus - ground-based fog beneath the lowest layer
+15 15 Altostratus - ground-based fog beneath the lowest layer
+16 16 Nimbostratus - ground-based fog beneath the lowest layer
+17 17 Altocumulus - ground-based fog beneath the lowest layer
+18 18 Cirrostratus - ground-based fog beneath the lowest layer
+19 19 Cirrocumulus - ground-based fog beneath the lowest layer
+20 20 Cirrus - ground-based fog beneath the lowest layer
+# 21-190 Reserved
+191 191 Unknown
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.204.table b/definitions/grib2/tables/34/4.204.table
new file mode 100644
index 000000000..8e0be1f8c
--- /dev/null
+++ b/definitions/grib2/tables/34/4.204.table
@@ -0,0 +1,9 @@
+# Code table 4.204 - Thunderstorm coverage
+0 0 None
+1 1 Isolated (1-2%)
+2 2 Few (3-5%)
+3 3 Scattered (6-45%)
+4 4 Numerous (> 45%)
+# 5-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.205.table b/definitions/grib2/tables/34/4.205.table
new file mode 100644
index 000000000..c40c7f47b
--- /dev/null
+++ b/definitions/grib2/tables/34/4.205.table
@@ -0,0 +1,6 @@
+# Code table 4.205 - Presence of aerosol
+0 0 Aerosol not present
+1 1 Aerosol present
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.206.table b/definitions/grib2/tables/34/4.206.table
new file mode 100644
index 000000000..76472c261
--- /dev/null
+++ b/definitions/grib2/tables/34/4.206.table
@@ -0,0 +1,6 @@
+# Code table 4.206 - Volcanic ash
+0 0 Not present
+1 1 Present
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.207.table b/definitions/grib2/tables/34/4.207.table
new file mode 100644
index 000000000..b6392fca0
--- /dev/null
+++ b/definitions/grib2/tables/34/4.207.table
@@ -0,0 +1,10 @@
+# Code table 4.207 - Icing
+0 0 None
+1 1 Light
+2 2 Moderate
+3 3 Severe
+4 4 Trace
+5 5 Heavy
+# 6-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.208.table b/definitions/grib2/tables/34/4.208.table
new file mode 100644
index 000000000..4361d38c0
--- /dev/null
+++ b/definitions/grib2/tables/34/4.208.table
@@ -0,0 +1,9 @@
+# Code table 4.208 - Turbulence
+0 0 None (smooth)
+1 1 Light
+2 2 Moderate
+3 3 Severe
+4 4 Extreme
+# 5-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.209.table b/definitions/grib2/tables/34/4.209.table
new file mode 100644
index 000000000..39ea549ac
--- /dev/null
+++ b/definitions/grib2/tables/34/4.209.table
@@ -0,0 +1,9 @@
+# Code table 4.209 - Planetary boundary-layer regime
+0 0 Reserved
+1 1 Stable
+2 2 Mechanically driven turbulence
+3 3 Forced convection
+4 4 Free convection
+# 5-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.210.table b/definitions/grib2/tables/34/4.210.table
new file mode 100644
index 000000000..791878469
--- /dev/null
+++ b/definitions/grib2/tables/34/4.210.table
@@ -0,0 +1,6 @@
+# Code table 4.210 - Contrail intensity
+0 0 Contrail not present
+1 1 Contrail present
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.211.table b/definitions/grib2/tables/34/4.211.table
new file mode 100644
index 000000000..2a28a84d9
--- /dev/null
+++ b/definitions/grib2/tables/34/4.211.table
@@ -0,0 +1,7 @@
+# Code table 4.211 - Contrail engine type
+0 0 Low bypass
+1 1 High bypass
+2 2 Non-bypass
+# 3-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.212.table b/definitions/grib2/tables/34/4.212.table
new file mode 100644
index 000000000..6a3dcf88c
--- /dev/null
+++ b/definitions/grib2/tables/34/4.212.table
@@ -0,0 +1,18 @@
+# Code table 4.212 - Land use
+0 0 Reserved
+1 1 Urban land
+2 2 Agriculture
+3 3 Range land
+4 4 Deciduous forest
+5 5 Coniferous forest
+6 6 Forest/wetland
+7 7 Water
+8 8 Wetlands
+9 9 Desert
+10 10 Tundra
+11 11 Ice
+12 12 Tropical forest
+13 13 Savannah
+# 14-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.213.table b/definitions/grib2/tables/34/4.213.table
new file mode 100644
index 000000000..68d627af6
--- /dev/null
+++ b/definitions/grib2/tables/34/4.213.table
@@ -0,0 +1,16 @@
+# Code table 4.213 - Soil type
+0 0 Reserved
+1 1 Sand
+2 2 Loamy sand
+3 3 Sandy loam
+4 4 Silt loam
+5 5 Organic (redefined)
+6 6 Sandy clay loam
+7 7 Silt clay loam
+8 8 Clay loam
+9 9 Sandy clay
+10 10 Silty clay
+11 11 Clay
+# 12-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.214.table b/definitions/grib2/tables/34/4.214.table
new file mode 100644
index 000000000..b08860ce0
--- /dev/null
+++ b/definitions/grib2/tables/34/4.214.table
@@ -0,0 +1,11 @@
+# Code table 4.214 - Environmental Factor Qualifier
+0 0 Worst
+1 1 Very poor
+2 2 Poor
+3 3 Average
+4 4 Good
+5 5 Excellent
+# 6-190 Reserved
+191 191 Unknown
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.215.table b/definitions/grib2/tables/34/4.215.table
new file mode 100644
index 000000000..7888772d5
--- /dev/null
+++ b/definitions/grib2/tables/34/4.215.table
@@ -0,0 +1,9 @@
+# Code table 4.215 - Remotely sensed snow coverage
+# 0-49 Reserved
+50 50 No-snow/no-cloud
+# 51-99 Reserved
+100 100 Clouds
+# 101-249 Reserved
+250 250 Snow
+# 251-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.216.table b/definitions/grib2/tables/34/4.216.table
new file mode 100644
index 000000000..b51b358f4
--- /dev/null
+++ b/definitions/grib2/tables/34/4.216.table
@@ -0,0 +1,5 @@
+# Code table 4.216 - Elevation of snow-covered terrain
+# 0-90 Elevation in increments of 100 m
+# 91-253 Reserved
+254 254 Clouds
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.217.table b/definitions/grib2/tables/34/4.217.table
new file mode 100644
index 000000000..a700410d5
--- /dev/null
+++ b/definitions/grib2/tables/34/4.217.table
@@ -0,0 +1,8 @@
+# Code table 4.217 - Cloud mask type
+0 0 Clear over water
+1 1 Clear over land
+2 2 Cloud
+3 3 No data
+# 4-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.218.table b/definitions/grib2/tables/34/4.218.table
new file mode 100644
index 000000000..a13debf16
--- /dev/null
+++ b/definitions/grib2/tables/34/4.218.table
@@ -0,0 +1,46 @@
+# Code table 4.218 - Pixel scene type
+0 0 No scene identified
+1 1 Green needle-leafed forest
+2 2 Green broad-leafed forest
+3 3 Deciduous needle-leafed forest
+4 4 Deciduous broad-leafed forest
+5 5 Deciduous mixed forest
+6 6 Closed shrub-land
+7 7 Open shrub-land
+8 8 Woody savannah
+9 9 Savannah
+10 10 Grassland
+11 11 Permanent wetland
+12 12 Cropland
+13 13 Urban
+14 14 Vegetation/crops
+15 15 Permanent snow/ice
+16 16 Barren desert
+17 17 Water bodies
+18 18 Tundra
+19 19 Warm liquid water cloud
+20 20 Supercooled liquid water cloud
+21 21 Mixed-phase cloud
+22 22 Optically thin ice cloud
+23 23 Optically thick ice cloud
+24 24 Multilayered cloud
+# 25-96 Reserved
+97 97 Snow/ice on land
+98 98 Snow/ice on water
+99 99 Sun-glint
+100 100 General cloud
+101 101 Low cloud/fog/stratus
+102 102 Low cloud/stratocumulus
+103 103 Low cloud/unknown type
+104 104 Medium cloud/nimbostratus
+105 105 Medium cloud/altostratus
+106 106 Medium cloud/unknown type
+107 107 High cloud/cumulus
+108 108 High cloud/cirrus
+109 109 High cloud/unknown
+110 110 Unknown cloud type
+111 111 Single layer water cloud
+112 112 Single layer ice cloud
+# 113-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.219.table b/definitions/grib2/tables/34/4.219.table
new file mode 100644
index 000000000..9979f50ad
--- /dev/null
+++ b/definitions/grib2/tables/34/4.219.table
@@ -0,0 +1,8 @@
+# Code table 4.219 - Cloud top height quality indicator
+0 0 Nominal cloud top height quality
+1 1 Fog in segment
+2 2 Poor quality height estimation
+3 3 Fog in segment and poor quality height estimation
+# 4-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.220.table b/definitions/grib2/tables/34/4.220.table
new file mode 100644
index 000000000..88e869e42
--- /dev/null
+++ b/definitions/grib2/tables/34/4.220.table
@@ -0,0 +1,6 @@
+# Code table 4.220 - Horizontal dimension processed
+0 0 Latitude
+1 1 Longitude
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.221.table b/definitions/grib2/tables/34/4.221.table
new file mode 100644
index 000000000..011cc3518
--- /dev/null
+++ b/definitions/grib2/tables/34/4.221.table
@@ -0,0 +1,6 @@
+# Code table 4.221 - Treatment of missing data
+0 0 Not included
+1 1 Extrapolated
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.222.table b/definitions/grib2/tables/34/4.222.table
new file mode 100644
index 000000000..558d947ac
--- /dev/null
+++ b/definitions/grib2/tables/34/4.222.table
@@ -0,0 +1,6 @@
+# Code table 4.222 - Categorical result
+0 0 No
+1 1 Yes
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.223.table b/definitions/grib2/tables/34/4.223.table
new file mode 100644
index 000000000..572c4e7a8
--- /dev/null
+++ b/definitions/grib2/tables/34/4.223.table
@@ -0,0 +1,5 @@
+# Code table 4.223 - Fire detection indicator
+0 0 No fire detected
+1 1 Possible fire detected
+2 2 Probable fire detected
+3 3 Missing
diff --git a/definitions/grib2/tables/34/4.224.table b/definitions/grib2/tables/34/4.224.table
new file mode 100644
index 000000000..014f56e23
--- /dev/null
+++ b/definitions/grib2/tables/34/4.224.table
@@ -0,0 +1,18 @@
+# Code table 4.224 - Categorical outlook
+0 0 No risk area
+1 1 Reserved
+2 2 General thunderstorm risk area
+3 3 Reserved
+4 4 Slight risk area
+5 5 Reserved
+6 6 Moderate risk area
+7 7 Reserved
+8 8 High risk area
+# 9-10 Reserved
+11 11 Dry thunderstorm (dry lightning) risk area
+# 12-13 Reserved
+14 14 Critical risk area
+# 15-17 Reserved
+18 18 Extremely critical risk area
+# 19-254 Reserved
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.225.table b/definitions/grib2/tables/34/4.225.table
new file mode 100644
index 000000000..9dc374087
--- /dev/null
+++ b/definitions/grib2/tables/34/4.225.table
@@ -0,0 +1,2 @@
+# Code table 4.225 - Weather (see FM 94 BUFR/FM 95 CREX Code table 0 20 003 - Present weather)
+511 511 Missing value
diff --git a/definitions/grib2/tables/34/4.227.table b/definitions/grib2/tables/34/4.227.table
new file mode 100644
index 000000000..48c3b7633
--- /dev/null
+++ b/definitions/grib2/tables/34/4.227.table
@@ -0,0 +1,9 @@
+# Code table 4.227 - Icing scenario (weather/cloud classification)
+0 0 None
+1 1 General
+2 2 Convective
+3 3 Stratiform
+4 4 Freezing
+# 5-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing value
diff --git a/definitions/grib2/tables/34/4.228.table b/definitions/grib2/tables/34/4.228.table
new file mode 100644
index 000000000..048a69f0b
--- /dev/null
+++ b/definitions/grib2/tables/34/4.228.table
@@ -0,0 +1,8 @@
+# Code table 4.228 - Icing severity
+0 0 None
+1 1 Trace
+2 2 Light
+3 3 Moderate
+4 4 Severe
+# 5-254 Reserved
+255 255 Missing value
diff --git a/definitions/grib2/tables/34/4.230.table b/definitions/grib2/tables/34/4.230.table
new file mode 100644
index 000000000..1871fb176
--- /dev/null
+++ b/definitions/grib2/tables/34/4.230.table
@@ -0,0 +1,601 @@
+# Code table 4.230 - Atmospheric chemical constituent type
+0 0 Ozone O3
+1 1 Water vapour H2O
+2 2 Methane CH4
+3 3 Carbon dioxide CO2
+4 4 Carbon monoxide CO
+5 5 Nitrogen dioxide NO2
+6 6 Nitrous oxide N2O
+7 7 Formaldehyde HCHO
+8 8 Sulphur dioxide SO2
+9 9 Ammonia NH3
+10 10 Ammonium cation NH4+
+11 11 Nitrogen monoxide NO
+12 12 Atomic oxygen O
+13 13 Nitrate radical NO3*
+14 14 Hydroperoxyl radical HOO*
+15 15 Dinitrogen pentoxide N2O5
+16 16 Nitrous acid HONO
+17 17 Nitric acid HNO3
+18 18 Peroxynitric acid HO2NO2
+19 19 Hydrogen peroxide H2O2
+20 20 Dihydrogen H2
+21 21 Atomic nitrogen N
+22 22 Sulphate anion SO42-
+23 23 Atomic Radon Rn
+24 24 Mercury vapour Hg(0)
+25 25 Mercury(II) cation Hg2+
+26 26 Atomic chlorine Cl
+27 27 Chlorine monoxide ClO
+28 28 Dichlorine peroxide Cl2O2
+29 29 Hypochlorous acid HClO
+30 30 Chlorine nitrate ClONO2
+31 31 Chlorine dioxide ClO2
+32 32 Atomic bromine Br
+33 33 Bromine monoxide BrO
+34 34 Bromine chloride BrCl
+35 35 Hydrogen bromide HBr
+36 36 Hypobromous acid HBrO
+37 37 Bromine nitrate BrONO2
+38 38 Dioxygen O2
+39 39 Nitryl chloride NO2Cl
+40 40 Sulphuric acid H2SO4
+41 41 Hydrogen sulphide H2S
+42 42 Sulphur trioxide SO3
+43 43 Bromine Br2
+44 44 Hydrofluoric acid HF
+45 45 Sulphur hexafluoride SF6
+46 46 Chlorine Cl2
+# 47-9999 Reserved
+10000 10000 Hydroxyl radical HO*
+10001 10001 Methyl peroxy radical CH3OO*
+10002 10002 Methyl hydroperoxide CH3OOH
+10004 10004 Methanol CH3OH
+10005 10005 Formic acid HCOOH
+10006 10006 Hydrogen cyanide HCN
+10007 10007 Aceto nitrile CH3CN
+10008 10008 Ethane C2H6
+10009 10009 Ethene (= Ethylene) C2H4
+10010 10010 Ethyne (= Acetylene) C2H2
+10011 10011 Ethanol C2H5OH
+10012 10012 Acetic acid C2H5OOH
+10013 10013 Peroxyacetyl nitrate CH3C(O)OONO2
+10014 10014 Propane C3H8
+10015 10015 Propene C3H6
+10016 10016 Butane (all isomers) C4H10
+10017 10017 Isoprene C5H10
+10018 10018 Alpha pinene C10H16
+10019 10019 Beta pinene C10H16
+10020 10020 Limonene C10H16
+10021 10021 Benzene C6H6
+10022 10022 Toluene C7H8
+10023 10023 Xylene C8H10
+10024 10024 Methanesulphonic acid CH3SO3H
+10025 10025 Methylglyoxal (2-oxopropanal) CH3C(O)CHO
+10026 10026 Peroxyacetyl radical CH3C(O)OO*
+10027 10027 Methacrylic acid (2-methylprop-2-enoic acid) CH2C(CH3)COOH
+10028 10028 Methacrolein (2-methylprop-2-enal) CH2C(CH3)CHO
+10029 10029 Acetone (propan-2-one) CH3C(O)CH3
+10030 10030 Ethyl dioxidanyl radical CH3CH2OO*
+10031 10031 Butadiene (buta-1,3-diene) (CH2CH)2
+10032 10032 Acetaldehyde (ethanal) CH3CHO
+10033 10033 Glycolaldehyde (hydroxyethanal) HOCH2CHO
+10034 10034 Cresol (methylphenol), all isomers CH3C6H4OH
+10035 10035 Peracetic acid (ethaneperoxoic acid) CH3C(O)OOH
+10036 10036 2-hydroxyethyl oxidanyl radical HOCH2CH2O*
+10037 10037 2-hydroxyethyl dioxidanyl radical HOCH2CH2OO*
+10038 10038 Glyoxal (oxaldehyde) OCHCHO
+10039 10039 Isopropyl dioxidanyl radical (CH3)2CHOO*
+10040 10040 Isopropyl hydroperoxide (2-hydroperoxypropane) (CH3)2CHOOH
+10041 10041 Hydroxyacetone (1-hydroxypropan-2-one) CH3C(O)CH2OH
+10042 10042 Peroxyacetic acid (ethaneperoxoic acid) CH3C(O)OOH
+10043 10043 Methyl vinyl ketone (but-3-en-2-one) CH3C(O)CHCH2
+10044 10044 Phenoxy radical C6H5O*
+10045 10045 Methyl radical CH3*
+10046 10046 Carbonyl sulphide (carbon oxide sulphide) OCS
+10047 10047 Dibromomethane CH2Br2
+10048 10048 Methoxy radical CH3O*
+10049 10049 Tribromomethane CHBr3
+10050 10050 Formyl radical (oxomethyl radical) HOC*
+10051 10051 Hydroxymethyl dioxidanyl radical HOCH2OO*
+10052 10052 Ethyl hydroperoxide CH3CH2OOH
+10053 10053 3-hydroxypropyl dioxidanyl radical HOCH2CH2CH2OO*
+10054 10054 3-hydroxypropyl hydroperoxide HOCH2CH2CH2OOH
+10055 10055 Methyl-peroxy-nitrate (nitroperoxy-methane) CH3OONO2
+10056 10056 2-lambda^1-oxidanyloxy-2-methylbut-3-en-1-ol (4-hydroxy-3-methyl-1-butene-3-ylperoxy radical) HOCH2C(CH3)(OO*)CHCH2
+10057 10057 2-lambda^1-oxidanyloxy-3-methylbut-3-en-1-ol (2-hydroxy-1-isopropenylethylperoxy radical) HOCH2CH(OO*)C(CH3)CH2
+10058 10058 (Z)-4-hydroperoxy-2-methyl-2-butenal CH2(OOH)CHC(CH3)CHO
+10059 10059 (Z)-4-hydroperoxy-3-methyl-2-butenal CH2(OOH)C(CH3)CHCHO
+# 10060-10499 Reserved for other simple organic molecules (e.g. higher aldehydes, alcohols, peroxides, etc.)
+10500 10500 Dimethyl sulphide CH3SCH3 (DMS)
+10501 10501 DMSO (dimethyl sulfoxide) (CH3)2SO
+# 10502-20000 Reserved
+20001 20001 Hydrogen chloride HCl
+20002 20002 CFC-11 (trichlorofluoromethane) CCl3F
+20003 20003 CFC-12 (dichlorodifluoromethane) CCl2F2
+20004 20004 CFC-113 (1,1,2-trichloro-1,2,2-trifluoroethane) Cl2FC-CClF2
+20005 20005 CFC-113a (1,1,1-trichloro-2,2,2-trifluoroethane) Cl3C-CF3
+20006 20006 CFC-114 (1,2-dichloro-1,1,2,2-tetrafluoroethane) ClF2C-CClF2
+20007 20007 CFC-115 (1-chloro-1,1,2,2,2-pentafluoroethane) ClF2C-CF3
+20008 20008 HCFC-22 (chlorodifluoromethane) CHClF2
+20009 20009 HCFC-141b (1,1-dichloro-1-fluoroethane) Cl2FC-CH3
+20010 20010 HCFC-142b (1-chloro-1,1-difluoroethane) ClF2C-CH3
+20011 20011 Halon-1202 (dibromodifluoromethane) CBr2F2
+20012 20012 Halon-1211 (bromochlorodifluoromethane) CBrClF2
+20013 20013 Halon-1301 (bromotrifluoromethane) CBrF3
+20014 20014 Halon-2402 (1,2-dibromo-1,1,2,2-tetrafluoroethane) BrF2C-CBrF2
+20015 20015 HCC-40 (methyl chloride) CH3Cl
+20016 20016 HCC-10 (carbon tetrachloride) CCl4
+20017 20017 HCC-140a (1,1,1-trichloroethane) Cl3C-CH3
+20018 20018 HBC-40B1 (methyl bromide) CH3Br
+20019 20019 HCH (hexachlorocyclohexane) all isomers C6H6Cl6
+20020 20020 alpha-HCH (alpha-hexachlorocyclohexane) both enantiomers alpha-C6H6Cl6
+20021 20021 PCB-153 (2,2',4,4',5,5'-hexachlorobiphenyl) (C6H2Cl3)2
+20022 20022 HCFC-141a (1,1-dichloro-2-fluoroethane) Cl2HC-CH2F
+# 20023-29999 Reserved
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+# 30001-30009 Reserved
+30010 30010 Tritium (Hydrogen 3) H-3
+30011 30011 Tritium organic bounded H-3o
+30012 30012 Tritium inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulphur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44 Ti-44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+30295 30295 Carbon-13 C-13
+30296 30296 Lead Pb
+30297 30297 Tellurium 131 Te-131
+30298 30298 Neodymium 137 Nd-137
+30299 30299 Pseudo radionuclide
+30300 30300 Silver 112 Ag-112
+30301 30301 Silver 115 Ag-115
+30302 30302 Barium 139 Ba-139
+30303 30303 Barium 141 Ba-141
+30304 30304 Barium 142 Ba-142
+30305 30305 Bromine 84 Br-84
+30306 30306 Cadminum 115 Cd-115
+30307 30307 Cadminum 117 Cd-117
+30308 30308 Cadminum 117 metastable Cd-117m
+30309 30309 Cerium 145 Ce-145
+30310 30310 Cerium 146 Ce-146
+30311 30311 Cobalt 58 metastable Co-58m
+30312 30312 Ceasium 138 Cs-138
+30313 30313 Ceasium 139 Cs-139
+30314 30314 Iodine 130 aerosol I-130a
+30315 30315 Iodine 130 elementary gaseous I-130e
+30316 30316 Iodine 130 organic bounded I-130o
+30317 30317 Iodine 132 metastable I-132m
+30318 30318 Iodine 134 metastable I-134m
+30319 30319 Indium 115 metastable In-115m
+30320 30320 Indium 117 metastable In-117m
+30321 30321 Krypton 83 metastable Kr-83m
+30322 30322 Lanthanum 142 La-142
+30323 30323 Lanthanum 143 La-143
+30324 30324 Manganese 56 Mn-56
+30325 30325 Molybdenum 101 Mo-101
+30326 30326 Molybdenum 102 Mo-102
+30327 30327 Neodymium 149 Nd-149
+30328 30328 Neodymium 151 Nd-151
+30329 30329 Palladium 109 Pd-109
+30330 30330 Palladium 112 Pd-112
+30331 30331 Praseodymium 145 Pr-145
+30332 30332 Praseodymium 146 Pr-146
+30333 30333 Praseodymium 147 Pr-147
+30334 30334 Rubidium 89 Rb-89
+30335 30335 Rubidium 90 Rb-90
+30336 30336 Rubidium 90 metastable Rb-90m
+30337 30337 Rhodium 105 metastable Rh-105m
+30338 30338 Rhodium 107 Rh-107
+30339 30339 Antimony 128 Sb-128
+30340 30340 Antimony 128 metastable Sb-128m
+30341 30341 Antimony 129 metastable Sb-129m
+30342 30342 Antimony 130 Sb-130
+30343 30343 Antimony 130 metastable Sb-130m
+30344 30344 Antimony 131 Sb-131
+30345 30345 Antimony 132 Sb-132
+30346 30346 Antimony 132 metastable Sb-132m
+30347 30347 Antimony 133 Sb-133
+30348 30348 Selenium 83 Se-83
+30349 30349 Tin 127 Sn-127
+30350 30350 Tin 127 metastable Sn-127m
+30351 30351 Tin 128 Sn-128
+30352 30352 Tin 129 metastable Sn-129m
+30353 30353 Tin 130 Sn-130
+30354 30354 Strontium 93 Sr-93
+30355 30355 Technetium 101 Tc-101
+30356 30356 Technetium 102 Tc-102
+30357 30357 Technetium 104 Tc-104
+30358 30358 Technetium 105 Tc-105
+30359 30359 Tellurium 133 Te-133
+30360 30360 Tellurium 133 metastable Te-133m
+30361 30361 Tellurium 134 Te-134
+30362 30362 Yttrium 93 metastable Y-93m
+30363 30363 Yttrium 94 Y-94
+30364 30364 Yttrium 95 Y-95
+30365 30365 Zirconium 96 Zr-96
+# 30366-39999 Reserved
+40000 40000 Singlet sigma oxygen (dioxygen (sigma singlet)) O2
+40001 40001 Singlet delta oxygen (dioxygen (delta singlet)) O2
+40002 40002 Singlet excited oxygen atom O(1D)
+40003 40003 Triplet ground state oxygen atom O(3P)
+# 40004-59999 Reserved
+60000 60000 HOx radical (OH+HO2) HOx*
+60001 60001 Total inorganic and organic peroxy radicals (HOO* + ROO*) ROO*
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon NMVOC
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon aNMVOC
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon bNMVOC
+60016 60016 Lumped oxygenated hydrocarbons OVOC
+60017 60017 NOx expressed as nitrogen dioxide (NO2) NOx
+60018 60018 Organic aldehydes RCHO
+60019 60019 Organic peroxides ROOH
+60020 60020 Organic nitrates RNO3
+60021 60021 Ethers ROR'
+60022 60022 Amines NRR'R''
+60023 60023 Ketones RC(O)R'
+60024 60024 Dicarbonyls unsaturated RC(O)CH2C(O)R'
+60025 60025 Hydroxy dicarbonyls unsaturated RC(O)CHOHC(O)R'
+60026 60026 Hydroxy ketones RC(OH)C(O)R'
+60027 60027 Oxides Ox
+60028 60028 Peroxyacyl nitrates RC(O)OONO2
+60029 60029 Aromatic peroxide radical (Aryl dioxydanyl radicals) ArOO*
+60030 60030 Biogenic secondary organic compound
+60031 60031 Anthropogenic secondary organic compound
+60032 60032 All hydroxy-peroxides products of the reaction of hydroxy-isoprene adducts with O2 ISOPOOH
+60033 60033 Anthropogenic volatile organic compounds aVOC
+60034 60034 Biomass burning volatile organic compounds bbVOC
+# 60035-61999 Reserved
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
+# 62019 Reserved
+62020 62020 Smoke - high absorption
+62021 62021 Smoke - low absorption
+62022 62022 Aerosol - high absorption
+62023 62023 Aerosol - low absorption
+# 62024 Reserved
+62025 62025 Volcanic ash
+62026 62026 Particulate matter (PM)
+# 62027 Reserved
+62028 62028 Total aerosol hydrophilic
+62029 62029 Total aerosol hydrophobic
+62030 62030 Primary particulate inorganic matter dry
+62031 62031 Secondary particulate inorganic matter dry
+62032 62032 Biogenic secondary organic aerosol
+62033 62033 Anthropogenic secondary organic aerosol
+62034 62034 Rain water H2Orain
+62035 62035 Cloud water H2Ocloud
+62036 62036 Brown carbon dry
+# 62037-62099 Reserved
+62100 62100 Alnus (alder) pollen
+62101 62101 Betula (birch) pollen
+62102 62102 Castanea (chestnut) pollen
+62103 62103 Carpinus (hornbeam) pollen
+62104 62104 Corylus (hazel) pollen
+62105 62105 Fagus (beech) pollen
+62106 62106 Fraxinus (ash) pollen
+62107 62107 Pinus (pine) pollen
+62108 62108 Platanus (plane) pollen
+62109 62109 Populus (cottonwood, poplar) pollen
+62110 62110 Quercus (oak) pollen
+62111 62111 Salix (willow) pollen
+62112 62112 Taxus (yew) pollen
+62113 62113 Tilia (lime, linden) pollen
+62114 62114 Ulmus (elm) pollen
+62115 62115 Olea (olive) pollen
+# 62116-62199 Reserved
+62200 62200 Ambrosia (ragweed, burr-ragweed) pollen
+62201 62201 Artemisia (sagebrush, wormwood, mugwort) pollen
+62202 62202 Brassica (rape, broccoli, Brussels sprouts, cabbage, cauliflower, collards, kale, kohlrabi, mustard, rutabaga) pollen
+62203 62203 Plantago (plantain) pollen
+62204 62204 Rumex (dock, sorrel) pollen
+62205 62205 Urtica (nettle) pollen
+# 62206-62299 Reserved
+62300 62300 Poaceae (grass family) pollen
+# 62301-62999 Reserved
+# 63000-65534 For experimental use at local level
+65535 65535 Missing
diff --git a/definitions/grib2/tables/34/4.233.table b/definitions/grib2/tables/34/4.233.table
new file mode 100644
index 000000000..00b837c93
--- /dev/null
+++ b/definitions/grib2/tables/34/4.233.table
@@ -0,0 +1,601 @@
+# Code table 4.233 - Aerosol type
+0 0 Ozone O3
+1 1 Water vapour H2O
+2 2 Methane CH4
+3 3 Carbon dioxide CO2
+4 4 Carbon monoxide CO
+5 5 Nitrogen dioxide NO2
+6 6 Nitrous oxide N2O
+7 7 Formaldehyde HCHO
+8 8 Sulphur dioxide SO2
+9 9 Ammonia NH3
+10 10 Ammonium cation NH4+
+11 11 Nitrogen monoxide NO
+12 12 Atomic oxygen O
+13 13 Nitrate radical NO3*
+14 14 Hydroperoxyl radical HOO*
+15 15 Dinitrogen pentoxide N2O5
+16 16 Nitrous acid HONO
+17 17 Nitric acid HNO3
+18 18 Peroxynitric acid HO2NO2
+19 19 Hydrogen peroxide H2O2
+20 20 Dihydrogen H2
+21 21 Atomic nitrogen N
+22 22 Sulphate anion SO42-
+23 23 Atomic Radon Rn
+24 24 Mercury vapour Hg(0)
+25 25 Mercury(II) cation Hg2+
+26 26 Atomic chlorine Cl
+27 27 Chlorine monoxide ClO
+28 28 Dichlorine peroxide Cl2O2
+29 29 Hypochlorous acid HClO
+30 30 Chlorine nitrate ClONO2
+31 31 Chlorine dioxide ClO2
+32 32 Atomic bromine Br
+33 33 Bromine monoxide BrO
+34 34 Bromine chloride BrCl
+35 35 Hydrogen bromide HBr
+36 36 Hypobromous acid HBrO
+37 37 Bromine nitrate BrONO2
+38 38 Dioxygen O2
+39 39 Nitryl chloride NO2Cl
+40 40 Sulphuric acid H2SO4
+41 41 Hydrogen sulphide H2S
+42 42 Sulphur trioxide SO3
+43 43 Bromine Br2
+44 44 Hydrofluoric acid HF
+45 45 Sulphur hexafluoride SF6
+46 46 Chlorine Cl2
+# 47-9999 Reserved
+10000 10000 Hydroxyl radical HO*
+10001 10001 Methyl peroxy radical CH3OO*
+10002 10002 Methyl hydroperoxide CH3OOH
+10004 10004 Methanol CH3OH
+10005 10005 Formic acid HCOOH
+10006 10006 Hydrogen cyanide HCN
+10007 10007 Aceto nitrile CH3CN
+10008 10008 Ethane C2H6
+10009 10009 Ethene (= Ethylene) C2H4
+10010 10010 Ethyne (= Acetylene) C2H2
+10011 10011 Ethanol C2H5OH
+10012 10012 Acetic acid C2H5OOH
+10013 10013 Peroxyacetyl nitrate CH3C(O)OONO2
+10014 10014 Propane C3H8
+10015 10015 Propene C3H6
+10016 10016 Butane (all isomers) C4H10
+10017 10017 Isoprene C5H10
+10018 10018 Alpha pinene C10H16
+10019 10019 Beta pinene C10H16
+10020 10020 Limonene C10H16
+10021 10021 Benzene C6H6
+10022 10022 Toluene C7H8
+10023 10023 Xylene C8H10
+10024 10024 Methanesulphonic acid CH3SO3H
+10025 10025 Methylglyoxal (2-oxopropanal) CH3C(O)CHO
+10026 10026 Peroxyacetyl radical CH3C(O)OO*
+10027 10027 Methacrylic acid (2-methylprop-2-enoic acid) CH2C(CH3)COOH
+10028 10028 Methacrolein (2-methylprop-2-enal) CH2C(CH3)CHO
+10029 10029 Acetone (propan-2-one) CH3C(O)CH3
+10030 10030 Ethyl dioxidanyl radical CH3CH2OO*
+10031 10031 Butadiene (buta-1,3-diene) (CH2CH)2
+10032 10032 Acetaldehyde (ethanal) CH3CHO
+10033 10033 Glycolaldehyde (hydroxyethanal) HOCH2CHO
+10034 10034 Cresol (methylphenol), all isomers CH3C6H4OH
+10035 10035 Peracetic acid (ethaneperoxoic acid) CH3C(O)OOH
+10036 10036 2-hydroxyethyl oxidanyl radical HOCH2CH2O*
+10037 10037 2-hydroxyethyl dioxidanyl radical HOCH2CH2OO*
+10038 10038 Glyoxal (oxaldehyde) OCHCHO
+10039 10039 Isopropyl dioxidanyl radical (CH3)2CHOO*
+10040 10040 Isopropyl hydroperoxide (2-hydroperoxypropane) (CH3)2CHOOH
+10041 10041 Hydroxyacetone (1-hydroxypropan-2-one) CH3C(O)CH2OH
+10042 10042 Peroxyacetic acid (ethaneperoxoic acid) CH3C(O)OOH
+10043 10043 Methyl vinyl ketone (but-3-en-2-one) CH3C(O)CHCH2
+10044 10044 Phenoxy radical C6H5O*
+10045 10045 Methyl radical CH3*
+10046 10046 Carbonyl sulphide (carbon oxide sulphide) OCS
+10047 10047 Dibromomethane CH2Br2
+10048 10048 Methoxy radical CH3O*
+10049 10049 Tribromomethane CHBr3
+10050 10050 Formyl radical (oxomethyl radical) HOC*
+10051 10051 Hydroxymethyl dioxidanyl radical HOCH2OO*
+10052 10052 Ethyl hydroperoxide CH3CH2OOH
+10053 10053 3-hydroxypropyl dioxidanyl radical HOCH2CH2CH2OO*
+10054 10054 3-hydroxypropyl hydroperoxide HOCH2CH2CH2OOH
+10055 10055 Methyl-peroxy-nitrate (nitroperoxy-methane) CH3OONO2
+10056 10056 2-lambda^1-oxidanyloxy-2-methylbut-3-en-1-ol (4-hydroxy-3-methyl-1-butene-3-ylperoxy radical) HOCH2C(CH3)(OO*)CHCH2
+10057 10057 2-lambda^1-oxidanyloxy-3-methylbut-3-en-1-ol (2-hydroxy-1-isopropenylethylperoxy radical) HOCH2CH(OO*)C(CH3)CH2
+10058 10058 (Z)-4-hydroperoxy-2-methyl-2-butenal CH2(OOH)CHC(CH3)CHO
+10059 10059 (Z)-4-hydroperoxy-3-methyl-2-butenal CH2(OOH)C(CH3)CHCHO
+# 10060-10499 Reserved for other simple organic molecules (e.g. higher aldehydes, alcohols, peroxides, etc.)
+10500 10500 Dimethyl sulphide CH3SCH3 (DMS)
+10501 10501 DMSO (dimethyl sulfoxide) (CH3)2SO
+# 10502-20000 Reserved
+20001 20001 Hydrogen chloride HCl
+20002 20002 CFC-11 (trichlorofluoromethane) CCl3F
+20003 20003 CFC-12 (dichlorodifluoromethane) CCl2F2
+20004 20004 CFC-113 (1,1,2-trichloro-1,2,2-trifluoroethane) Cl2FC-CClF2
+20005 20005 CFC-113a (1,1,1-trichloro-2,2,2-trifluoroethane) Cl3C-CF3
+20006 20006 CFC-114 (1,2-dichloro-1,1,2,2-tetrafluoroethane) ClF2C-CClF2
+20007 20007 CFC-115 (1-chloro-1,1,2,2,2-pentafluoroethane) ClF2C-CF3
+20008 20008 HCFC-22 (chlorodifluoromethane) CHClF2
+20009 20009 HCFC-141b (1,1-dichloro-1-fluoroethane) Cl2FC-CH3
+20010 20010 HCFC-142b (1-chloro-1,1-difluoroethane) ClF2C-CH3
+20011 20011 Halon-1202 (dibromodifluoromethane) CBr2F2
+20012 20012 Halon-1211 (bromochlorodifluoromethane) CBrClF2
+20013 20013 Halon-1301 (bromotrifluoromethane) CBrF3
+20014 20014 Halon-2402 (1,2-dibromo-1,1,2,2-tetrafluoroethane) BrF2C-CBrF2
+20015 20015 HCC-40 (methyl chloride) CH3Cl
+20016 20016 HCC-10 (carbon tetrachloride) CCl4
+20017 20017 HCC-140a (1,1,1-trichloroethane) Cl3C-CH3
+20018 20018 HBC-40B1 (methyl bromide) CH3Br
+20019 20019 HCH (hexachlorocyclohexane) all isomers C6H6Cl6
+20020 20020 alpha-HCH (alpha-hexachlorocyclohexane) both enantiomers alpha-C6H6Cl6
+20021 20021 PCB-153 (2,2',4,4',5,5'-hexachlorobiphenyl) (C6H2Cl3)2
+20022 20022 HCFC-141a (1,1-dichloro-2-fluoroethane) Cl2HC-CH2F
+# 20023-29999 Reserved
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+# 30001-30009 Reserved
+30010 30010 Tritium (Hydrogen 3) H-3
+30011 30011 Tritium organic bounded H-3o
+30012 30012 Tritium inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulphur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44 Ti-44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+30295 30295 Carbon-13 C-13
+30296 30296 Lead Pb
+30297 30297 Tellurium 131 Te-131
+30298 30298 Neodymium 137 Nd-137
+30299 30299 Pseudo radionuclide
+30300 30300 Silver 112 Ag-112
+30301 30301 Silver 115 Ag-115
+30302 30302 Barium 139 Ba-139
+30303 30303 Barium 141 Ba-141
+30304 30304 Barium 142 Ba-142
+30305 30305 Bromine 84 Br-84
+30306 30306 Cadminum 115 Cd-115
+30307 30307 Cadminum 117 Cd-117
+30308 30308 Cadminum 117 metastable Cd-117m
+30309 30309 Cerium 145 Ce-145
+30310 30310 Cerium 146 Ce-146
+30311 30311 Cobalt 58 metastable Co-58m
+30312 30312 Ceasium 138 Cs-138
+30313 30313 Ceasium 139 Cs-139
+30314 30314 Iodine 130 aerosol I-130a
+30315 30315 Iodine 130 elementary gaseous I-130e
+30316 30316 Iodine 130 organic bounded I-130o
+30317 30317 Iodine 132 metastable I-132m
+30318 30318 Iodine 134 metastable I-134m
+30319 30319 Indium 115 metastable In-115m
+30320 30320 Indium 117 metastable In-117m
+30321 30321 Krypton 83 metastable Kr-83m
+30322 30322 Lanthanum 142 La-142
+30323 30323 Lanthanum 143 La-143
+30324 30324 Manganese 56 Mn-56
+30325 30325 Molybdenum 101 Mo-101
+30326 30326 Molybdenum 102 Mo-102
+30327 30327 Neodymium 149 Nd-149
+30328 30328 Neodymium 151 Nd-151
+30329 30329 Palladium 109 Pd-109
+30330 30330 Palladium 112 Pd-112
+30331 30331 Praseodymium 145 Pr-145
+30332 30332 Praseodymium 146 Pr-146
+30333 30333 Praseodymium 147 Pr-147
+30334 30334 Rubidium 89 Rb-89
+30335 30335 Rubidium 90 Rb-90
+30336 30336 Rubidium 90 metastable Rb-90m
+30337 30337 Rhodium 105 metastable Rh-105m
+30338 30338 Rhodium 107 Rh-107
+30339 30339 Antimony 128 Sb-128
+30340 30340 Antimony 128 metastable Sb-128m
+30341 30341 Antimony 129 metastable Sb-129m
+30342 30342 Antimony 130 Sb-130
+30343 30343 Antimony 130 metastable Sb-130m
+30344 30344 Antimony 131 Sb-131
+30345 30345 Antimony 132 Sb-132
+30346 30346 Antimony 132 metastable Sb-132m
+30347 30347 Antimony 133 Sb-133
+30348 30348 Selenium 83 Se-83
+30349 30349 Tin 127 Sn-127
+30350 30350 Tin 127 metastable Sn-127m
+30351 30351 Tin 128 Sn-128
+30352 30352 Tin 129 metastable Sn-129m
+30353 30353 Tin 130 Sn-130
+30354 30354 Strontium 93 Sr-93
+30355 30355 Technetium 101 Tc-101
+30356 30356 Technetium 102 Tc-102
+30357 30357 Technetium 104 Tc-104
+30358 30358 Technetium 105 Tc-105
+30359 30359 Tellurium 133 Te-133
+30360 30360 Tellurium 133 metastable Te-133m
+30361 30361 Tellurium 134 Te-134
+30362 30362 Yttrium 93 metastable Y-93m
+30363 30363 Yttrium 94 Y-94
+30364 30364 Yttrium 95 Y-95
+30365 30365 Zirconium 96 Zr-96
+# 30366-39999 Reserved
+40000 40000 Singlet sigma oxygen (dioxygen (sigma singlet)) O2
+40001 40001 Singlet delta oxygen (dioxygen (delta singlet)) O2
+40002 40002 Singlet excited oxygen atom O(1D)
+40003 40003 Triplet ground state oxygen atom O(3P)
+# 40004-59999 Reserved
+60000 60000 HOx radical (OH+HO2) HOx*
+60001 60001 Total inorganic and organic peroxy radicals (HOO* + ROO*) ROO*
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon NMVOC
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon aNMVOC
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon bNMVOC
+60016 60016 Lumped oxygenated hydrocarbons OVOC
+60017 60017 NOx expressed as nitrogen dioxide (NO2) NOx
+60018 60018 Organic aldehydes RCHO
+60019 60019 Organic peroxides ROOH
+60020 60020 Organic nitrates RNO3
+60021 60021 Ethers ROR'
+60022 60022 Amines NRR'R''
+60023 60023 Ketones RC(O)R'
+60024 60024 Dicarbonyls unsaturated RC(O)CH2C(O)R'
+60025 60025 Hydroxy dicarbonyls unsaturated RC(O)CHOHC(O)R'
+60026 60026 Hydroxy ketones RC(OH)C(O)R'
+60027 60027 Oxides Ox
+60028 60028 Peroxyacyl nitrates RC(O)OONO2
+60029 60029 Aromatic peroxide radical (Aryl dioxydanyl radicals) ArOO*
+60030 60030 Biogenic secondary organic compound
+60031 60031 Anthropogenic secondary organic compound
+60032 60032 All hydroxy-peroxides products of the reaction of hydroxy-isoprene adducts with O2 ISOPOOH
+60033 60033 Anthropogenic volatile organic compounds aVOC
+60034 60034 Biomass burning volatile organic compounds bbVOC
+# 60035-61999 Reserved
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
+# 62019 Reserved
+62020 62020 Smoke - high absorption
+62021 62021 Smoke - low absorption
+62022 62022 Aerosol - high absorption
+62023 62023 Aerosol - low absorption
+# 62024 Reserved
+62025 62025 Volcanic ash
+62026 62026 Particulate matter (PM)
+# 62027 Reserved
+62028 62028 Total aerosol hydrophilic
+62029 62029 Total aerosol hydrophobic
+62030 62030 Primary particulate inorganic matter dry
+62031 62031 Secondary particulate inorganic matter dry
+62032 62032 Biogenic secondary organic aerosol
+62033 62033 Anthropogenic secondary organic aerosol
+62034 62034 Rain water H2Orain
+62035 62035 Cloud water H2Ocloud
+62036 62036 Brown carbon dry
+# 62037-62099 Reserved
+62100 62100 Alnus (alder) pollen
+62101 62101 Betula (birch) pollen
+62102 62102 Castanea (chestnut) pollen
+62103 62103 Carpinus (hornbeam) pollen
+62104 62104 Corylus (hazel) pollen
+62105 62105 Fagus (beech) pollen
+62106 62106 Fraxinus (ash) pollen
+62107 62107 Pinus (pine) pollen
+62108 62108 Platanus (plane) pollen
+62109 62109 Populus (cottonwood, poplar) pollen
+62110 62110 Quercus (oak) pollen
+62111 62111 Salix (willow) pollen
+62112 62112 Taxus (yew) pollen
+62113 62113 Tilia (lime, linden) pollen
+62114 62114 Ulmus (elm) pollen
+62115 62115 Olea (olive) pollen
+# 62116-62199 Reserved
+62200 62200 Ambrosia (ragweed, burr-ragweed) pollen
+62201 62201 Artemisia (sagebrush, wormwood, mugwort) pollen
+62202 62202 Brassica (rape, broccoli, Brussels sprouts, cabbage, cauliflower, collards, kale, kohlrabi, mustard, rutabaga) pollen
+62203 62203 Plantago (plantain) pollen
+62204 62204 Rumex (dock, sorrel) pollen
+62205 62205 Urtica (nettle) pollen
+# 62206-62299 Reserved
+62300 62300 Poaceae (grass family) pollen
+# 62301-62999 Reserved
+# 63000-65534 For experimental use at local level
+65535 65535 Missing
diff --git a/definitions/grib2/tables/34/4.234.table b/definitions/grib2/tables/34/4.234.table
new file mode 100644
index 000000000..3b05b4515
--- /dev/null
+++ b/definitions/grib2/tables/34/4.234.table
@@ -0,0 +1,21 @@
+# Code table 4.234 - Canopy cover fraction (to be used as partitioned parameter in product definition template 4.53 or 4.54)
+1 1 Crops, mixed farming
+2 2 Short grass
+3 3 Evergreen needleleaf trees
+4 4 Deciduous needleleaf trees
+5 5 Deciduous broadleaf trees
+6 6 Evergreen broadleaf trees
+7 7 Tall grass
+8 8 Desert
+9 9 Tundra
+10 10 Irrigated crops
+11 11 Semidesert
+12 12 Ice caps and glaciers
+13 13 Bogs and marshes
+14 14 Inland water
+15 15 Ocean
+16 16 Evergreen shrubs
+17 17 Deciduous shrubs
+18 18 Mixed forest
+19 19 Interrupted forest
+20 20 Water and land mixtures
diff --git a/definitions/grib2/tables/34/4.236.table b/definitions/grib2/tables/34/4.236.table
new file mode 100644
index 000000000..9c58b488c
--- /dev/null
+++ b/definitions/grib2/tables/34/4.236.table
@@ -0,0 +1,8 @@
+# Code table 4.236 - Soil texture fraction (to be used as partitioned parameter in product definition template 4.53 or 4.54)
+1 1 Coarse
+2 2 Medium
+3 3 Medium-fine
+4 4 Fine
+5 5 Very-fine
+6 6 Organic
+7 7 Tropical-organic
diff --git a/definitions/grib2/tables/34/4.238.table b/definitions/grib2/tables/34/4.238.table
new file mode 100644
index 000000000..8351021b4
--- /dev/null
+++ b/definitions/grib2/tables/34/4.238.table
@@ -0,0 +1,43 @@
+# Code table 4.238 - Source or sink
+0 0 Other
+1 1 Aviation
+2 2 Lightning
+3 3 Biogenic sources
+4 4 Anthropogenic sources
+5 5 Wild fires
+6 6 Natural sources
+7 7 Volcanoes
+8 8 Bio-fuel
+9 9 Fossil-fuel
+10 10 Wetlands
+11 11 Oceans
+12 12 Elevated anthropogenic sources
+13 13 Surface anthropogenic sources
+14 14 Agriculture livestock
+15 15 Agriculture soils
+16 16 Agriculture waste burning
+17 17 Agriculture (all)
+18 18 Residential, commercial and other combustion
+19 19 Power generation
+20 20 Super power stations
+21 21 Fugitives
+22 22 Industrial process
+23 23 Solvents
+24 24 Ships
+25 25 Wastes (solid and water)
+26 26 Road transportation
+27 27 Off-road transportation
+28 28 Nuclear power plant
+29 29 Nuclear weapon
+30 30 Commercial buildings heating
+31 31 Residential heating
+32 32 Oil refineries and transformation industry
+33 33 Gas production
+34 34 Vegetation
+35 35 Biomass burning
+36 36 Settlements
+37 37 Soil
+38 38 Wild animals
+# 39-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.239.table b/definitions/grib2/tables/34/4.239.table
new file mode 100644
index 000000000..f095b14a0
--- /dev/null
+++ b/definitions/grib2/tables/34/4.239.table
@@ -0,0 +1,17 @@
+# Code table 4.239 - Wetland Type
+0 0 Reserved
+1 1 Bog
+2 2 Drained
+3 3 Fen
+4 4 Floodplain
+5 5 Mangrove
+6 6 Marsh
+7 7 Rice
+8 8 Riverine
+9 9 Salt marsh
+10 10 Swamp
+11 11 Upland
+12 12 Wet tundra
+# 13-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.240.table b/definitions/grib2/tables/34/4.240.table
new file mode 100644
index 000000000..2a31fb2ab
--- /dev/null
+++ b/definitions/grib2/tables/34/4.240.table
@@ -0,0 +1,13 @@
+# Code table 4.240 - Type of distribution function
+0 0 No specific distribution function given
+1 1 Delta functions with spatially variable concentration and fixed diameters Dl (p1) in metre
+2 2 Delta functions with spatially variable concentration and fixed masses Ml (p1) in kg
+3 3 Gaussian (normal) distribution with spatially variable concentration and fixed mean diameter Dl(p1) and variance(p2)
+4 4 Gaussian (normal) distribution with spatially variable concentration, mean diameter and variance
+5 5 Log-normal distribution with spatially variable number density, mean diameter and variance
+6 6 Log-normal distribution with spatially variable number density, mean diameter and fixed variance(p1)
+7 7 Log-normal distribution with spatially variable number density and mass density and fixed variance(p1) and fixed particle density(p2)
+8 8 No distribution function. The encoded variable is derived from variables characterized by type of distribution function of type No. 7 (see above) with fixed variance(p1) and fixed particle density(p2)
+# 9-49151 Reserved
+# 49152-65534 Reserved for local use
+65535 65535 Missing value
diff --git a/definitions/grib2/tables/34/4.241.table b/definitions/grib2/tables/34/4.241.table
new file mode 100644
index 000000000..743e5f6e2
--- /dev/null
+++ b/definitions/grib2/tables/34/4.241.table
@@ -0,0 +1,12 @@
+# Code table 4.241 - Coverage attributes
+0 UNDEF Undefined
+1 UNMOD Unmodified
+2 SNOW Snow covered
+3 FLOOD Flooded
+4 ICE Ice covered
+5 ITCW With intercepted water
+6 ITCS With intercepted snow
+7 AGG Aggregated
+# 8-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing value
diff --git a/definitions/grib2/tables/34/4.242.table b/definitions/grib2/tables/34/4.242.table
new file mode 100644
index 000000000..9574142da
--- /dev/null
+++ b/definitions/grib2/tables/34/4.242.table
@@ -0,0 +1,10 @@
+# Code table 4.242 - Tile classification
+0 0 Reserved
+1 GCV2009 Land use classes according to ESA-GlobCover GCV2009
+2 GLC2000 Land use classes according to European Commission-Global Land Cover Project GLC2000
+3 ECOCLIMAP Land use classes according to ECOCLIMAP
+4 ECOCLIMAP-SG Land use classes according to ECOCLIMAP-SG
+5 GLCCv2BATS Land use classes according to USGS EROS Global Land Cover Characterization (GLCC) v2.0 BATS Classification
+# 6-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing value
diff --git a/definitions/grib2/tables/34/4.243.table b/definitions/grib2/tables/34/4.243.table
new file mode 100644
index 000000000..24d21b719
--- /dev/null
+++ b/definitions/grib2/tables/34/4.243.table
@@ -0,0 +1,43 @@
+# Code table 4.243 - Tile class
+0 0 Reserved
+1 1 Evergreen broadleaved forest
+2 2 Deciduous broadleaved closed forest
+3 3 Deciduous broadleaved open forest
+4 4 Evergreen needle-leaf forest
+5 5 Deciduous needle-leaf forest
+6 6 Mixed leaf trees
+7 7 Freshwater flooded trees
+8 8 Saline water flooded trees
+9 9 Mosaic tree/natural vegetation
+10 10 Burnt tree cover
+11 11 Evergreen shrubs closed-open
+12 12 Deciduous shrubs closed-open
+13 13 Herbaceous vegetation closed-open
+14 14 Sparse herbaceous or grass
+15 15 Flooded shrubs or herbaceous
+16 16 Cultivated and managed areas
+17 17 Mosaic crop/tree/natural vegetation
+18 18 Mosaic crop/shrub/grass
+19 19 Bare areas
+20 20 Water
+21 21 Snow and ice
+22 22 Artificial surface
+23 23 Ocean
+24 24 Irrigated croplands
+25 25 Rainfed croplands
+26 26 Mosaic cropland (50-70%) - vegetation (20-50%)
+27 27 Mosaic vegetation (50-70%) - cropland (20-50%)
+28 28 Closed broadleaved evergreen forest
+29 29 Closed needle-leaved evergreen forest
+30 30 Open needle-leaved deciduous forest
+31 31 Mixed broadleaved and needle-leaved forest
+32 32 Mosaic shrubland (50-70%) - grassland (20-50%)
+33 33 Mosaic grassland (50-70%) - shrubland (20-50%)
+34 34 Closed to open shrubland
+35 35 Sparse vegetation
+36 36 Closed to open forest regularly flooded
+37 37 Closed forest or shrubland permanently flooded
+38 38 Closed to open grassland regularly flooded
+39 39 Undefined
+# 40-32767 Reserved
+# 32768- Reserved for local use
diff --git a/definitions/grib2/tables/34/4.244.table b/definitions/grib2/tables/34/4.244.table
new file mode 100644
index 000000000..a4470cd56
--- /dev/null
+++ b/definitions/grib2/tables/34/4.244.table
@@ -0,0 +1,7 @@
+# Code table 4.244 - Quality indicator
+0 0 No quality information available
+1 1 Failed
+2 2 Passed
+# 3-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.246.table b/definitions/grib2/tables/34/4.246.table
new file mode 100644
index 000000000..0ca9c0c98
--- /dev/null
+++ b/definitions/grib2/tables/34/4.246.table
@@ -0,0 +1,7 @@
+# Code table 4.246 - Thunderstorm intensity
+0 0 No thunderstorm occurrence
+1 1 Weak thunderstorm
+2 2 Moderate thunderstorm
+3 3 Severe thunderstorm
+# 4-254 Reserved
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.247.table b/definitions/grib2/tables/34/4.247.table
new file mode 100644
index 000000000..6da16e396
--- /dev/null
+++ b/definitions/grib2/tables/34/4.247.table
@@ -0,0 +1,7 @@
+# Code table 4.247 - Precipitation intensity
+0 0 No precipitation occurrence
+1 1 Light precipitation
+2 2 Moderate precipitation
+3 3 Heavy precipitation
+# 4-254 Reserved
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.248.table b/definitions/grib2/tables/34/4.248.table
new file mode 100644
index 000000000..04e365c97
--- /dev/null
+++ b/definitions/grib2/tables/34/4.248.table
@@ -0,0 +1,6 @@
+# Code table 4.248 - Method used to derive data values for a given local time
+0 0 Nearest forecast or analysis time to specified local time
+1 1 Interpolated to be valid at the specified local time
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.249.table b/definitions/grib2/tables/34/4.249.table
new file mode 100644
index 000000000..bd1c944c4
--- /dev/null
+++ b/definitions/grib2/tables/34/4.249.table
@@ -0,0 +1,7 @@
+# Code table 4.249 - Character of precipitation
+0 0 None
+1 1 Showers
+2 2 Intermittent
+3 3 Continuous
+# 4-254 Reserved
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.250.table b/definitions/grib2/tables/34/4.250.table
new file mode 100644
index 000000000..a249158ca
--- /dev/null
+++ b/definitions/grib2/tables/34/4.250.table
@@ -0,0 +1,14 @@
+# Code table 4.250 - Drainage direction
+0 0 Reserved
+1 1 South-west
+2 2 South
+3 3 South-east
+4 4 West
+5 5 No direction
+6 6 East
+7 7 North-west
+8 8 North
+9 9 North-east
+# 10-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.251.table b/definitions/grib2/tables/34/4.251.table
new file mode 100644
index 000000000..3a78e713e
--- /dev/null
+++ b/definitions/grib2/tables/34/4.251.table
@@ -0,0 +1,7 @@
+# Code table 4.251 - Wave direction and frequency formulae
+0 0 Undefined sequence
+1 1 Geometric sequence
+2 2 Arithmetic sequence
+# 3-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.252.table b/definitions/grib2/tables/34/4.252.table
new file mode 100644
index 000000000..187d3ee43
--- /dev/null
+++ b/definitions/grib2/tables/34/4.252.table
@@ -0,0 +1,162 @@
+# Code table 4.252 - Tile classes and groupings
+0 0 Reserved
+1 SEOC Seas and oceans
+2 INWB Inland water bodies
+3 BARE Bare areas
+4 HIV High vegetation
+5 LOV Low vegetation
+6 URBAN Urban
+# 7-1000 Reserved for intercomparison tile classes/groupings
+1001 SEAO Sea and oceans
+1002 LAKE Lakes
+1003 RIVE Rivers
+1004 NO Bare land
+1005 ROCK Bare rock
+1006 SNOW Permanent snow
+1007 BOBD Boreal broadleaf deciduous
+1008 TEBD Temperate broadleaf deciduous
+1009 TRBD Tropical broadleaf deciduous
+1010 TEBE Temperate broadleaf evergreen
+1011 TRBE Tropical broadleaf evergreen
+1012 BONE Boreal needleleaf evergreen
+1013 TENE Temperate needleleaf evergreen
+1014 BOND Boreal needleleaf deciduous
+1015 SHRB Shrubs
+1016 BOGR Boreal grassland
+1017 GRAS Temperate grassland
+1018 TROG Tropical grassland
+1019 C3W Winter C3 crops
+1020 C3S Summer C3 crops
+1021 C4 C4 crops
+1022 FLTR Flooded trees
+1023 FLGR Flooded grassland
+1024 LCZ1 Local climate zone 1: compact high-rise (buildings)
+1025 LCZ2 Local climate zone 2: compact midrise (buildings)
+1026 LCZ3 Local climate zone 3: compact low-rise (buildings)
+1027 LCZ4 Local climate zone 4: open high-rise (buildings)
+1028 LCZ5 Local climate zone 5: open midrise (buildings)
+1029 LCZ6 Local climate zone 6: open low-rise (buildings)
+1030 LCZ7 Local climate zone 7: lightweight low-rise (buildings)
+1031 LCZ8 Local climate zone 8: large low-rise (buildings)
+1032 LCZ9 Local climate zone 9: sparsely built (buildings)
+1033 LCZ10 Local climate zone 10: heavy industry (buildings)
+1034 TEBDU Urban temperate broadleaf deciduous
+1035 TRBDU Urban tropical broadleaf deciduous
+1036 TEBEU Urban temperate broadleaf evergreen
+1037 TRBEU Urban tropical broadleaf evergreen
+1038 BONEU Urban boreal needleleaf evergreen
+1039 TENEU Urban temperate needleleaf evergreen
+1040 BONDU Urban boreal needleleaf deciduous
+# 1041-1500 Reserved for tile class entries for tile models using the ECOCLIMAP-SG land cover survey
+1501 GNATU Nature grouping (NO + ROCK + SNOW + BOBD + TEBD + TRBD + TEBE + TRBE + BONE + TENE + BOND + SHRB + BOGR + GRAS + TROG + C3W + C3S + C4 + FLTR + FLGR)
+1502 GNOFO Non-forest grouping (NO + ROCK + SNOW + BOGR + GRAS + TROG + C3W + C3S + C4 + FLTR + FLGR)
+1503 GFORE Forest grouping (BOBD + TEBD + TRBD + TEBE + TRBE + BONE + TENE + BOND + SHRB)
+1504 GNOVE Non-vegetated grouping (NO + ROCK + SNOW)
+1505 GTREE Trees grouping (BOBD + TEBD + TRBD + TEBE + TRBE + BONE + TENE + BOND + SHRB + FLTR)
+1506 GLVEG Low vegetation grouping (BOGR + GRAS + TROG + C3W + C3S + C4 + FLGR)
+1507 GNFLV Non-flooded low vegetation grouping (BOGR + GRAS + TROG + C3W + C3S + C4)
+1508 GCROP Crops grouping (C3W + C3S + C4)
+1509 GGRAS Grassland grouping (BOGR + GRAS + TROG)
+1510 GBARO Bare and rock grouping (NO + ROCK)
+1511 GC3CR C3 crops grouping (C3W + C3S)
+1512 GBFOR Broadleaf forest grouping (BOBD + TEBD + TRBD + TEBE + TRBE + SHRB)
+1513 GNFOR Needleleaf forest grouping (BONE + TENE + BOND)
+1514 GDBFO Deciduous broadleaf forest grouping (BOBD + TEBD + TRBD + TEBE + SHRB)
+1515 GTGRA Temperate grassland grouping (BOGR + GRAS)
+1516 GNFNF Non-forest (no FLTR) grouping (NO + ROCK + SNOW + BOGR + GRAS + TROG + C3W + C3S + C4 + FLGR)
+1517 GBFFT Broadleaf forest (with FLTR) grouping (BOBD + TEBD + TRBD + TEBE + TRBE + SHRB + FLTR)
+1518 GBTRE Broadleaf trees grouping (BOBD + TEBD + TRBD + TEBE + TRBE + FLTR)
+1519 GCGRA C3/C4 grasslands grouping (BOGR + GRAS + FLGR)
+1520 GBDTR Broadleaf deciduous trees grouping (BOBD + TEBD + TRBD + FLTR)
+1521 GBETR Broadleaf evergreen trees grouping (TEBE + TRBE)
+1522 GNETR Needleleaf evergreen trees grouping (BONE + TENE)
+1523 GLCZU LCZ or urban grouping (LCZ1 + LCZ2 + LCZ3 + LCZ4 + LCZ5 + LCZ6 + LCZ7 + LCZ8 + LCZ9 + LCZ10)
+1524 GIWAT Inland water grouping (LAKE + RIVE)
+1525 GPTEBD Urban parks and gardens TEBD grouping (NO + GRAS + TEBDU)
+1526 GPTRBD Urban parks and gardens TRBD grouping (NO + GRAS + TRBDU)
+1527 GPTEBE Urban parks and gardens TEBE grouping (NO + GRAS + TEBEU)
+1528 GPTRBE Urban parks and gardens TRBE grouping (NO + GRAS + TRBEU)
+1529 GPBONE Urban parks and gardens BONE grouping (NO + GRAS + BONEU)
+1530 GPTENE Urban parks and gardens TENE grouping (NO + GRAS + TENEU)
+1531 GPBOND Urban parks and gardens BOND grouping (NO + GRAS + BONDU)
+# 1532-2000 Reserved for tile grouping entries for tile models using the ECOCLIMAP-SG land cover survey
+2001 CRMF Crops, mixed farming
+2002 SHGR Short grass
+2003 EVNE Evergreen needleleaf trees
+2004 DENE Deciduous needleleaf trees
+2005 DEBR Deciduous broadleaf trees
+2006 EVBR Evergreen broadleaf trees
+2007 TAGR Tall grass
+2008 DESE Desert
+2009 TUND Tundra
+2010 IRCR Irrigated crops
+2011 SEDE Semidesert
+2012 ICGL Ice caps and glaciers
+2013 BOMA Bogs and marshes
+2014 INWA Inland water
+2015 OCEA Ocean
+2016 EVSH Evergreen shrubs
+2017 DESH Deciduous shrubs
+2018 MFWO Mixed forest/woodland
+2019 INFO Interrupted forest
+2020 WLMI Water and land mixtures
+2021 BASO Bare soil
+2022 URBA Urban
+2023 LORI Low-rise building
+2024 HIRI High-rise building
+# 2025-2500 Reserved for tile class entries for tile models using the GLCC v2.0 BATS Classification survey
+2501 GLVE Low vegetation grouping (CRMF + SHGR + TAGR + TUND + IRCR + SEDE + BOMA + EVSH + DESH + WLMI)
+2502 GHVE High vegetation grouping (EVNE + DENE + DEBR + EVBR + MFWO + INFO)
+# 2503-3000 Reserved for tile grouping entries for tile models using the GLCC v2.0 BATS Classification survey
+3001 PFIC Post-flooding or irrigated croplands
+3002 RACR Rainfed croplands
+3003 MCVE Mosaic cropland (50-70%) / vegetation (grassland, shrubland, forest) (20-50%)
+3004 MVCR Mosaic vegetation (grassland, shrubland, forest) (50-70%) / cropland (20-50%)
+3005 COBS Closed to open (>15%) broadleaved evergreen and/or semi-deciduous forest (>5m)
+3006 CLBD Closed (>40%) broadleaved deciduous forest (>5m)
+3007 OPBD Open (15-40%) broadleaved deciduous forest (>5m)
+3008 CLNE Closed (>40%) needleleaved evergreen forest (>5m)
+3009 ONDE Open (15-40%) needleleaved deciduous or evergreen forest (>5m)
+3010 COBN Closed to open (>15%) mixed broadleaved and needleleaved forest (>5m)
+3011 MFSG Mosaic forest/shrubland (50-70%) / grassland (20-50%)
+3012 MGFS Mosaic grassland (50-70%) / forest / shrubland (20-50%)
+3013 COSH Closed to open (>15%) shrubland (<5m)
+3014 COHV Closed to open (>15%) herbaceous vegetation
+3015 SPVE Sparse (<15%) vegetation (woody vegetation, shrubs, grassland)
+3016 COBFF Closed to open (>15%) broadleaved forest regularly flooded (semi-permanently or temporarily) - fresh or brackish water
+3017 CLBFF Closed (>40%) broadleaved forest or shrubland permanently flooded - saline or brackish water
+3018 COVEF Closed to open (>15%) vegetation (grassland, shrubland, woody vegetation) on regularly flooded or waterlogged soil - fresh, brackish or saline water
+3019 ASAA Artificial surfaces and associated areas (urban areas >50%)
+3020 BAAR Bare areas
+3021 WABO Water bodies
+3022 PESI Permanent snow and ice
+# 3023-3500 Reserved for tile class entries for tile models using the ESA-GlobCover GCV2009 survey
+3501 GRDT Grouping using the dominant tiles approach (dominant tile varies per gridbox)
+# 3502-4000 Reserved for tile grouping entries for tile models using the ESA-GlobCover GCV2009 survey
+4001 TBECO Tree cover, broadleaved evergreen, closed to open (>15%)
+4002 TBDC Tree cover, broadleaved deciduous, closed (>40%)
+4003 TBDO Tree cover, broadleaved deciduous, open (15-40%)
+4004 TNECO Tree cover, needleleaved evergreen, closed to open (>15%)
+4005 TNDCO Tree cover, needleleaved decidous, closed to open (>15%)
+4006 TMLCO Tree cover, mixed leaftype, closed to open (>15%)
+4007 TCOFF Tree cover, closed to open (>15%), regularly flooded, fresh or brackish water: swamp forests
+4008 TCOFS Tree cover, closed to open (>15%), regularly flooded, saline water: mangrove forests
+4009 MTVG Mosaic of tree cover and other natural vegetation (crop component possible)
+4010 TBURN Tree Cover, burnt (mainly boreal forests)
+4011 SCOE Shrubcover, closed to open (>15%), evergreen (broadleaved or needleleaved)
+4012 SCOD Shrubcover, closed to open (>15%), deciduous (broadleaved)
+4013 HCCO Herbaceous cover, closed to open (>15%)
+4014 SHSC Sparse herbaceous or sparse shrub cover
+4015 FSHCO Regularly flooded (>2 month) shrub or herbaceous cover, closed to open
+4016 CROP Cropland (upland crops or inundated/ flooded crops)
+4017 MCTNV Mosaic of cropland / tree cover/ other natural vegetation
+4018 MCSH Mosaic of cropland / shrub or herbaceous cover
+4019 BAARE Bare areas
+4020 WBNA Water bodies (natural or artificial)
+4021 SINA Snow or ice (natural or artificial)
+4022 URAR Urban areas
+# 4023-4500 Reserved for tile class entries for tile models using the European Commission-Global Land Cover Project GLC2000 survey
+# 4501-5000 Reserved for tile grouping entries for tile models using the European Commission-Global Land Cover Project GLC2000 survey
+# 5001-32767 Reserved for additional land cover surveys
+# 32768-65534 Reserved for local use
+65535 65535 Missing
diff --git a/definitions/grib2/tables/34/4.3.table b/definitions/grib2/tables/34/4.3.table
new file mode 100644
index 000000000..8f3ba9195
--- /dev/null
+++ b/definitions/grib2/tables/34/4.3.table
@@ -0,0 +1,27 @@
+# Code table 4.3 - Type of generating process
+0 0 Analysis
+1 1 Initialization
+2 2 Forecast
+3 3 Bias corrected forecast
+4 4 Ensemble forecast
+5 5 Probability forecast
+6 6 Forecast error
+7 7 Analysis error
+8 8 Observation
+9 9 Climatological
+10 10 Probability-weighted forecast
+11 11 Bias-corrected ensemble forecast
+12 12 Post-processed analysis
+13 13 Post-processed forecast
+14 14 Nowcast
+15 15 Hindcast
+16 16 Physical retrieval
+17 17 Regression analysis
+18 18 Difference between two forecasts
+19 19 First guess
+20 20 Analysis increment
+21 21 Initialization increment for analysis
+22 22 Blended forecast
+# 23-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.333.table b/definitions/grib2/tables/34/4.333.table
new file mode 100644
index 000000000..1367d35c6
--- /dev/null
+++ b/definitions/grib2/tables/34/4.333.table
@@ -0,0 +1,12 @@
+# Code table 4.333 - Transport dispersion model
+1 1 DERMA (Danish Emergency Response Model of the Atmosphere)
+2 2 E-EMEP (Emergency EMEP model)
+3 3 FLEXPART (Particle dispersion model)
+4 4 MLDP (Modèle lagrangien de dispersion de particules)
+5 5 MATCH (Multi-scale Atmospheric Transport Model)
+6 6 SILAM (System for Integrated modeLling of Atmospheric composition)
+7 7 SNAP (Severe Nuclear Accident Program)
+8 8 WRF-Chem (Weather Research and Forecasting Chemical model)
+9 9 Trajectoire (Trajectory model)
+# 10-254 Reserved
+255 255 Missing value
diff --git a/definitions/grib2/tables/34/4.335.table b/definitions/grib2/tables/34/4.335.table
new file mode 100644
index 000000000..f47807cf6
--- /dev/null
+++ b/definitions/grib2/tables/34/4.335.table
@@ -0,0 +1,7 @@
+# Code table 4.335 - Emission scenario origin
+1 1 ARGOS (Accident Reporting and Guiding Operational System)
+2 2 JRODOS (Java version of Real time Online Decision SuppOrt System)
+3 3 Assimilated (Scenario retrieved from measurements)
+4 4 Centre (scenario by originating centre)
+# 5-254 Reserved
+255 255 Missing value
diff --git a/definitions/grib2/tables/34/4.336.table b/definitions/grib2/tables/34/4.336.table
new file mode 100644
index 000000000..c7855abea
--- /dev/null
+++ b/definitions/grib2/tables/34/4.336.table
@@ -0,0 +1,13 @@
+# Code table 4.336 - NWP model
+1 1 AROME (Meso scale NWP, Meteo-France)
+2 2 ARPEGE (Global scale NWP, Meteo-France)
+3 3 GFS (Global forecast system, NCEP)
+4 4 HARMONIE (HIRLAM-ALADIN Research on Mesoscale Operational NWP)
+5 5 HIRLAM (HIgh resolution Limited Area Model)
+6 6 IFS (Integrated Forecast System)
+7 7 GEM GDPS (Canadian Global Deterministic Prediction System)
+8 8 GEM RDPS (Canadian Regional Deterministic Prediction System)
+9 9 GEM HRDPS (Canadian High Resolution Deterministic Prediction System)
+10 10 WRF (Weather Research and Forecasting)
+# 11-254 Reserved
+255 255 Missing value
diff --git a/definitions/grib2/tables/34/4.4.table b/definitions/grib2/tables/34/4.4.table
new file mode 100644
index 000000000..6e63e069c
--- /dev/null
+++ b/definitions/grib2/tables/34/4.4.table
@@ -0,0 +1,17 @@
+# Code table 4.4 - Indicator of unit of time range
+0 m Minute
+1 h Hour
+2 D Day
+3 M Month
+4 Y Year
+5 10Y Decade (10 years)
+6 30Y Normal (30 years)
+7 C Century (100 years)
+# 8-9 Reserved
+10 3h 3 hours
+11 6h 6 hours
+12 12h 12 hours
+13 s Second
+# 14-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.5.table b/definitions/grib2/tables/34/4.5.table
new file mode 100644
index 000000000..f139bc109
--- /dev/null
+++ b/definitions/grib2/tables/34/4.5.table
@@ -0,0 +1,95 @@
+# Code table 4.5 - Fixed surface types and units
+0 0 Reserved
+1 sfc Ground or water surface (-)
+2 2 Cloud base level (-)
+3 3 Level of cloud tops (-)
+4 4 Level of 0 degree C isotherm (-)
+5 5 Level of adiabatic condensation lifted from the surface (-)
+6 6 Maximum wind level (-)
+7 sfc Tropopause (-)
+8 sfc Nominal top of the atmosphere (-)
+9 9 Sea bottom (-)
+10 10 Entire atmosphere (-)
+11 11 Cumulonimbus (CB) base (m)
+12 12 Cumulonimbus (CB) top (m)
+13 13 Lowest level where vertically integrated cloud cover exceeds the specified percentage (cloud base for a given percentage cloud cover) (%)
+14 14 Level of free convection (LFC) (-)
+15 15 Convective condensation level (CCL) (-)
+16 16 Level of neutral buoyancy or equilibrium level (LNB) (-)
+17 sfc Departure level of the most unstable parcel of air (MUDL)
+18 sfc Departure level of a mixed layer parcel of air with specified layer depth (Pa)
+19 19 Lowest level where cloud cover exceeds the specified percentage (%)
+20 20 Isothermal level (K)
+21 21 Lowest level where mass density exceeds the specified value (base for a given threshold of mass density) (kg m-3)
+22 22 Highest level where mass density exceeds the specified value (top for a given threshold of mass density) (kg m-3)
+23 23 Lowest level where air concentration exceeds the specified value (base for a given threshold of air concentration) (Bq m-3)
+24 24 Highest level where air concentration exceeds the specified value (top for a given threshold of air concentration) (Bq m-3)
+25 25 Highest level where radar reflectivity exceeds the specified value (echo top for a given threshold of reflectivity) (dBZ)
+26 26 Convective cloud layer base (m)
+27 27 Convective cloud layer top (m)
+# 28-29 Reserved
+30 30 Specified radius from the centre of the Sun (m)
+31 31 Solar photosphere
+32 32 Ionospheric D-region level
+33 33 Ionospheric E-region level
+34 34 Ionospheric F1-region level
+35 35 Ionospheric F2-region level
+# 36-99 Reserved
+100 pl Isobaric surface (Pa)
+101 sfc Mean sea level
+102 102 Specific altitude above mean sea level (m)
+103 sfc Specified height level above ground (m)
+104 104 Sigma level (sigma value)
+105 ml Hybrid level (-)
+106 sfc Depth below land surface (m)
+107 pt Isentropic (theta) level (K)
+108 108 Level at specified pressure difference from ground to level (Pa)
+109 pv Potential vorticity surface (K m2 kg-1 s-1)
+110 110 Reserved
+111 111 Eta level (-)
+112 112 Reserved
+113 113 Logarithmic hybrid level
+114 sol Snow level (Numeric)
+115 115 Sigma height level
+# 116 Reserved
+117 117 Mixed layer depth (m)
+118 hhl Hybrid height level (-)
+119 hpl Hybrid pressure level (-)
+# 120-149 Reserved
+150 150 Generalized vertical height coordinate
+151 sol Soil level (Numeric)
+152 sol Sea-ice level (Numeric)
+# 153-159 Reserved
+160 160 Depth below sea level (m)
+161 161 Depth below water surface (m)
+162 sfc Lake or river bottom (-)
+163 163 Bottom of sediment layer (-)
+164 164 Bottom of thermally active sediment layer (-)
+165 165 Bottom of sediment layer penetrated by thermal wave (-)
+166 sfc Mixing layer (-)
+167 167 Bottom of root zone (-)
+168 168 Ocean model level (Numeric)
+169 169 Ocean level defined by water density (sigma-theta) difference from near-surface to level (kg m-3)
+170 170 Ocean level defined by water potential temperature difference from near-surface to level (K)
+171 171 Ocean level defined by vertical eddy diffusivity difference from near-surface to level (m2 s-1)
+172 172 Ocean level defined by water density (rho) difference from near-surface to level (m)
+173 173 Top of snow over sea ice on sea, lake or river
+174 sfc Top surface of ice on sea, lake or river
+175 175 Top surface of ice, under snow cover, on sea, lake or river
+176 176 Bottom surface (underside) ice on sea, lake or river
+177 sfc Deep soil (of indefinite depth)
+# 178 Reserved
+179 179 Top surface of glacier ice and inland ice
+180 180 Deep inland or glacier ice (of indefinite depth)
+181 181 Grid tile land fraction as a model surface
+182 182 Grid tile water fraction as a model surface
+183 183 Grid tile ice fraction on sea, lake or river as a model surface
+184 184 Grid tile glacier ice and inland ice fraction as a model surface
+185 185 Roof level
+186 186 Wall level
+187 187 Road level
+188 188 Melt pond top surface
+189 189 Melt pond bottom surface
+# 190-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.6.table b/definitions/grib2/tables/34/4.6.table
new file mode 100644
index 000000000..736c8d7c6
--- /dev/null
+++ b/definitions/grib2/tables/34/4.6.table
@@ -0,0 +1,14 @@
+# Code table 4.6 - Type of ensemble forecast
+0 0 Unperturbed high-resolution control forecast
+1 1 Unperturbed low-resolution control forecast
+2 2 Negatively perturbed forecast
+3 3 Positively perturbed forecast
+4 4 Multi-model forecast
+5 5 Unperturbed forecast
+6 6 Perturbed forecast
+7 7 Initial conditions perturbations
+8 8 Model physics perturbations
+9 9 Initial conditions and model physics perturbations
+# 10-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.7.table b/definitions/grib2/tables/34/4.7.table
new file mode 100644
index 000000000..128fa317f
--- /dev/null
+++ b/definitions/grib2/tables/34/4.7.table
@@ -0,0 +1,15 @@
+# Code table 4.7 - Derived forecast
+0 0 Unweighted mean of all members
+1 1 Weighted mean of all members
+2 2 Standard deviation with respect to cluster mean
+3 3 Standard deviation with respect to cluster mean, normalized
+4 4 Spread of all members
+5 5 Large anomaly index of all members
+6 6 Unweighted mean of the cluster members
+7 7 Interquartile range (range between the 25th and 75th quantile)
+8 8 Minimum of all ensemble members
+9 9 Maximum of all ensemble members
+10 10 Variance of all ensemble members
+# 11-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.8.table b/definitions/grib2/tables/34/4.8.table
new file mode 100644
index 000000000..78467454a
--- /dev/null
+++ b/definitions/grib2/tables/34/4.8.table
@@ -0,0 +1,6 @@
+# Code table 4.8 - Clustering method
+0 0 Anomaly correlation
+1 1 Root mean square
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.9.table b/definitions/grib2/tables/34/4.9.table
new file mode 100644
index 000000000..fff022d72
--- /dev/null
+++ b/definitions/grib2/tables/34/4.9.table
@@ -0,0 +1,15 @@
+# Code table 4.9 - Probability type
+0 0 Probability of event below lower limit
+1 1 Probability of event above upper limit
+2 2 Probability of event between lower and upper limits (the range includes the lower limit but not the upper limit)
+3 3 Probability of event above lower limit
+4 4 Probability of event below upper limit
+5 5 Probability of event equal to lower limit
+6 6 Probability of event in above normal category
+7 7 Probability of event in near normal category
+8 8 Probability of event in below normal category
+9 9 Probability based on counts of categorical boolean
+10 10 Probability of event within the quantile of the probability distribution function
+# 11-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/4.91.table b/definitions/grib2/tables/34/4.91.table
new file mode 100644
index 000000000..1a0f215f0
--- /dev/null
+++ b/definitions/grib2/tables/34/4.91.table
@@ -0,0 +1,16 @@
+# Code table 4.91 - Type of Interval
+0 0 Smaller than first limit
+1 1 Greater than second limit
+2 2 Between first and second limit. The range includes the first limit but not the second limit
+3 3 Greater than first limit
+4 4 Smaller than second limit
+5 5 Smaller or equal first limit
+6 6 Greater or equal second limit
+7 7 Between first and second. The range includes the first limit and the second limit
+8 8 Greater or equal first limit
+9 9 Smaller or equal second limit
+10 10 Between first and second limit. The range includes the second limit but not the first limit
+11 11 Equal to first limit
+# 12-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/5.0.table b/definitions/grib2/tables/34/5.0.table
new file mode 100644
index 000000000..5e00004b0
--- /dev/null
+++ b/definitions/grib2/tables/34/5.0.table
@@ -0,0 +1,22 @@
+# Code table 5.0 - Data representation template number
+0 0 Grid point data - simple packing
+1 1 Matrix value at grid point - simple packing
+2 2 Grid point data - complex packing
+3 3 Grid point data - complex packing and spatial differencing
+4 4 Grid point data - IEEE floating point data
+# 5-39 Reserved
+40 40 Grid point data - JPEG 2000 code stream format
+41 41 Grid point data - Portable Network Graphics (PNG)
+42 42 Grid point data - CCSDS recommended lossless compression
+# 43-49 Reserved
+50 50 Spectral data - simple packing
+51 51 Spherical harmonics data - complex packing
+# 52 Reserved
+53 53 Spectral data for limited area models - complex packing
+# 54-60 Reserved
+61 61 Grid point data - simple packing with logarithm pre-processing
+# 62-199 Reserved
+200 200 Run length packing with level values
+# 201-49151 Reserved
+# 49152-65534 Reserved for local use
+65535 65535 Missing
diff --git a/definitions/grib2/tables/34/5.1.table b/definitions/grib2/tables/34/5.1.table
new file mode 100644
index 000000000..1189b5e46
--- /dev/null
+++ b/definitions/grib2/tables/34/5.1.table
@@ -0,0 +1,6 @@
+# Code table 5.1 - Type of original field values
+0 0 Floating point
+1 1 Integer
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/5.2.table b/definitions/grib2/tables/34/5.2.table
new file mode 100644
index 000000000..60d557a0d
--- /dev/null
+++ b/definitions/grib2/tables/34/5.2.table
@@ -0,0 +1,8 @@
+# Code table 5.2 - Matrix coordinate value function definition
+0 0 Explicit coordinate values set
+1 1 Linear coordinates f(1) = C1, f(n) = f(n-1) + C2
+# 2-10 Reserved
+11 11 Geometric coordinates f(1) = C1, f(n) = C2 * f(n-1)
+# 12-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/5.25.table b/definitions/grib2/tables/34/5.25.table
new file mode 100644
index 000000000..79e9fd69a
--- /dev/null
+++ b/definitions/grib2/tables/34/5.25.table
@@ -0,0 +1,9 @@
+# Code table 5.25 - type of bi-Fourier subtruncation
+# 0-76 Reserved
+77 77 Rectangular
+# 78-87 Reserved
+88 88 Elliptic
+# 89-98 Reserved
+99 99 Diamond
+# 100-254 Reserved
+255 255 Missing
diff --git a/definitions/grib2/tables/34/5.26.table b/definitions/grib2/tables/34/5.26.table
new file mode 100644
index 000000000..298f3fcd0
--- /dev/null
+++ b/definitions/grib2/tables/34/5.26.table
@@ -0,0 +1,5 @@
+# Code table 5.26 - packing mode for axes
+0 0 Spectral coefficients for axes are packed
+1 1 Spectral coefficients for axes included in the unpacked subset
+# 2-254 Reserved
+255 255 Missing
diff --git a/definitions/grib2/tables/34/5.3.table b/definitions/grib2/tables/34/5.3.table
new file mode 100644
index 000000000..481331791
--- /dev/null
+++ b/definitions/grib2/tables/34/5.3.table
@@ -0,0 +1,7 @@
+# Code table 5.3 - Matrix coordinate parameter
+1 1 Direction degrees true
+2 2 Frequency (s-1)
+3 3 Radial number (2pi/lambda) (m-1)
+# 4-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/5.4.table b/definitions/grib2/tables/34/5.4.table
new file mode 100644
index 000000000..e84ab1901
--- /dev/null
+++ b/definitions/grib2/tables/34/5.4.table
@@ -0,0 +1,6 @@
+# Code table 5.4 - Group splitting method
+0 0 Row by row splitting
+1 1 General group splitting
+# 2-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/5.40.table b/definitions/grib2/tables/34/5.40.table
new file mode 100644
index 000000000..97e8880ab
--- /dev/null
+++ b/definitions/grib2/tables/34/5.40.table
@@ -0,0 +1,5 @@
+# Code table 5.40 - Type of compression
+0 0 Lossless
+1 1 Lossy
+# 2-254 Reserved
+255 255 Missing
diff --git a/definitions/grib2/tables/34/5.5.table b/definitions/grib2/tables/34/5.5.table
new file mode 100644
index 000000000..f2316975a
--- /dev/null
+++ b/definitions/grib2/tables/34/5.5.table
@@ -0,0 +1,7 @@
+# Code table 5.5 - Missing value management for complex packing
+0 0 No explicit missing values included within data values
+1 1 Primary missing values included within data values
+2 2 Primary and secondary missing values included within data values
+# 3-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/5.6.table b/definitions/grib2/tables/34/5.6.table
new file mode 100644
index 000000000..db68ead9c
--- /dev/null
+++ b/definitions/grib2/tables/34/5.6.table
@@ -0,0 +1,7 @@
+# Code table 5.6 - Order of spatial differencing
+0 0 Reserved
+1 1 First-order spatial differencing
+2 2 Second-order spatial differencing
+# 3-191 Reserved
+# 192-254 Reserved for local use
+255 255 Missing
diff --git a/definitions/grib2/tables/34/5.7.table b/definitions/grib2/tables/34/5.7.table
new file mode 100644
index 000000000..e54862c19
--- /dev/null
+++ b/definitions/grib2/tables/34/5.7.table
@@ -0,0 +1,7 @@
+# Code table 5.7 - Precision of floating-point numbers
+0 0 Reserved
+1 1 IEEE 32-bit (I=4 in section 7)
+2 2 IEEE 64-bit (I=8 in section 7)
+3 3 IEEE 128-bit (I=16 in section 7)
+# 4-254 Reserved
+255 255 Missing
diff --git a/definitions/grib2/tables/34/6.0.table b/definitions/grib2/tables/34/6.0.table
new file mode 100644
index 000000000..a8f30f5a4
--- /dev/null
+++ b/definitions/grib2/tables/34/6.0.table
@@ -0,0 +1,6 @@
+# Code table 6.0 - Bit map indicator
+0 0 A bit map applies to this product and is specified in this Section
+1 1  A bit map pre-determined by the originating/generating centre applies to this product and is not specified in this Section
+# 1-253 A bit map predetermined by the originating/generating centre applies to this product and is not specified in this Section
+254 254 A bit map defined previously in the same GRIB message applies to this product
+255 255 A bit map does not apply to this product
diff --git a/definitions/grib2/tables/local/edzw/1/2.230.table b/definitions/grib2/tables/local/edzw/1/2.230.table
new file mode 100644
index 000000000..c85ab25b1
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/2.230.table
@@ -0,0 +1,21 @@
+# This file is automatically generated, don't edit!
+#
+# Table 2.230 contains the Local Production System
+#
+# Notes:
+# (1) "Unused" stands for "Not in use" or "Does not apply"
+#
+# IMPORTANT "Meaning" must not contain numbers and parentheses, except in the "(unit)"!!!
+#
+# 2*(Code figure) Meaning
+#
+0 0  Unused
+# 1 - 999 Reserved for Numerical Weather Prediction - Context of Operational Production
+250 250  COSMO
+252 252  Ensemble system incl. postprocessing
+253 253  Ensemble system
+254 254  Deterministic system
+255 255  Conforms to Missing
+65535 65535  Missing
+
+
diff --git a/definitions/grib2/tables/local/edzw/1/2.231.1.table b/definitions/grib2/tables/local/edzw/1/2.231.1.table
new file mode 100644
index 000000000..ae1e85fc3
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/2.231.1.table
@@ -0,0 +1,25 @@
+# This file is automatically generated, don't edit!
+#
+# Table 2.231.1 contains the Local Models and Model Components
+#
+# Notes:
+# (1) "Unused" stands for "Not in use" or "Does not apply"
+#
+# IMPORTANT "Meaning" must not contain numbers and parentheses, except in the "(unit)"!!!
+#
+# 2*(Code figure) Meaning
+#
+0 0 Unused
+# 1 - 19999 Reserved for components that model physical (sub-)systems
+255 255  Conforms to Missing
+## 1000 - 1999 Reserved for components that model the Atmosphere
+### 1000 - 1199 Reserved for the ICON Model (ICOsahedral Non-hydrostatic Model)
+1000 1000  ICON-NWP
+## 2000 - 2999 Reserved for components that model Atmospheric Chemistry
+### 2000 - 2199 Reserved for the ART Model (Aerosol and Reactive Trace gases)
+2000 2000  ART-NWP
+## 3000 - 3999 Reserved for components that model the Ocean
+3000 3000  Ocean-NWP
+## 4000 - 4999 Reserved for components that model Ocean Waves
+4000 4000  Waves-NWP
+65535 65535  Missing
diff --git a/definitions/grib2/tables/local/edzw/1/2.231.table b/definitions/grib2/tables/local/edzw/1/2.231.table
new file mode 100644
index 000000000..79a31f001
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/2.231.table
@@ -0,0 +1,15 @@
+# This file is automatically generated, don't edit!
+#
+# Table 2.231 contains the Local Information on the Origin of the Product
+#
+# Notes:
+# (1) "Unused" stands for "Not in use" or "Does not apply"
+#
+# IMPORTANT "Meaning" must not contain numbers and parentheses, except in the "(unit)"!!!
+#
+# 2*(Code figure) Meaning
+#
+0 0  Unused
+1 1  Product is generated by a process that is based on a model or model composition described by the following 17 octets
+255 255  Conforms to Missing
+65535 65535  Missing
diff --git a/definitions/grib2/tables/local/edzw/1/2.232.table b/definitions/grib2/tables/local/edzw/1/2.232.table
new file mode 100644
index 000000000..bd3bf9701
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/2.232.table
@@ -0,0 +1,15 @@
+# This file is automatically generated, don't edit!
+#
+# Table 2.232 contains the Local Meaning of the Version (Number) of the Model (Composition)
+#
+# Notes:
+# (1) "Unused" stands for "Not in use" or "Does not apply"
+#
+# IMPORTANT "Meaning" must not contain numbers and parentheses, except in the "(unit)"!!!
+#
+# 2*(Code figure) Meaning
+#
+0 0  Unused
+1 1  Version of Model Component ICON-NWP
+255 255  Conforms to Missing
+65535 65535  Missing
diff --git a/definitions/grib2/tables/local/edzw/1/2.233.table b/definitions/grib2/tables/local/edzw/1/2.233.table
new file mode 100644
index 000000000..83e2cebfe
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/2.233.table
@@ -0,0 +1,14 @@
+# This file is automatically generated, don't edit!
+#
+# Table 2.233 contains Local Production Context
+#
+# Notes:
+# (1) "Unused" stands for "Not in use" or "Does not apply"
+#
+# IMPORTANT "Meaning" must not contain numbers and parentheses, except in the "(unit)"!!!
+#
+# 2*(Code figure) Meaning
+#
+0 0  Unused
+255 255  Conforms to Missing
+65535 65535  Missing
diff --git a/definitions/grib2/tables/local/edzw/1/2.234.table b/definitions/grib2/tables/local/edzw/1/2.234.table
new file mode 100644
index 000000000..1e94cb8a0
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/2.234.table
@@ -0,0 +1,14 @@
+# This file is automatically generated, don't edit!
+#
+# Table 2.234 contains Local Production Notes
+#
+# Notes:
+# (1) "Unused" stands for "Not in use" or "Does not apply"
+#
+# IMPORTANT "Meaning" must not contain numbers and parentheses, except in the "(unit)"!!!
+#
+# 2*(Code figure) Meaning
+#
+0 0  Unused
+255 255  Conforms to Missing
+65535 65535  Missing
diff --git a/definitions/grib2/tables/local/edzw/1/2.235.table b/definitions/grib2/tables/local/edzw/1/2.235.table
new file mode 100644
index 000000000..1c02e49d7
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/2.235.table
@@ -0,0 +1,14 @@
+# This file is automatically generated, don't edit!
+#
+# Table 2.235 contains Local Projects
+#
+# Notes:
+# (1) "Unused" stands for "Not in use" or "Does not apply"
+#
+# IMPORTANT "Meaning" must not contain numbers and parentheses, except in the "(unit)"!!!
+#
+# 2*(Code figure) Meaning
+#
+0 0  Unused
+255 255  Conforms to Missing
+65535 65535  Missing
diff --git a/definitions/grib2/tables/local/edzw/1/2.236.table b/definitions/grib2/tables/local/edzw/1/2.236.table
new file mode 100644
index 000000000..0b898fa42
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/2.236.table
@@ -0,0 +1,14 @@
+# This file is automatically generated, don't edit!
+#
+# Table 2.236 contains Local Meaning of Consecutive Numbering
+#
+# Notes:
+# (1) "Unused" stands for "Not in use" or "Does not apply"
+#
+# IMPORTANT "Meaning" must not contain numbers and parentheses, except in the "(unit)"!!!
+#
+# 2*(Code figure) Meaning
+#
+0 0  Unused
+255 255  Conforms to Missing
+65535 65535  Missing
diff --git a/definitions/grib2/tables/local/edzw/1/2.237.table b/definitions/grib2/tables/local/edzw/1/2.237.table
new file mode 100644
index 000000000..858f06908
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/2.237.table
@@ -0,0 +1,14 @@
+# This file is automatically generated, don't edit!
+#
+# Table 2.237 contains Local (Processing) Events in the (Change) History of a Product
+#
+# Notes:
+# (1) "Unused" stands for "Not in use" or "Does not apply"
+#
+# IMPORTANT "Meaning" must not contain numbers and parentheses, except in the "(unit)"!!!
+#
+# 2*(Code figure) Meaning
+#
+0 0  Unused
+255 255  Conforms to Missing
+65535 65535  Missing
diff --git a/definitions/grib2/tables/local/edzw/1/2.238.table b/definitions/grib2/tables/local/edzw/1/2.238.table
new file mode 100644
index 000000000..50a93ddbb
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/2.238.table
@@ -0,0 +1,19 @@
+# This file is automatically generated, don't edit!
+#
+# Table 2.238 contains Local Meaning of Additional Attributes
+#
+# Notes:
+# (1) "Unused" stands for "Not in use" or "Does not apply"
+#
+# IMPORTANT "Meaning" must not contain numbers and parentheses, except in the "(unit)"!!!
+#
+# 2*(Code figure) Meaning
+#
+0 0  Unused
+255 255  Conforms to Missing
+# 1000 - 9999 Reserved for Meaning of Table-only Attributes
+# 10000 - 19999 Reserved for Meaning of Numerical Attributes
+# 20000 - 29999 Reserved for Meaning of UUID Attributes
+20100 20100  Matching UUIDs mean that corresponding products (most probably) originate from one and the same realization of the generating process
+# 30000 - 39999 Reserved for Meaning of Date Attributes
+65535 65535  Missing
diff --git a/definitions/grib2/tables/local/edzw/1/2.239.1.table b/definitions/grib2/tables/local/edzw/1/2.239.1.table
new file mode 100644
index 000000000..504377f5a
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/2.239.1.table
@@ -0,0 +1,16 @@
+# This file is automatically generated, don't edit!
+#
+# Table 2.239.1 contains the Local Meaning of the Version Number for Software Package: ecCodes
+#
+# Notes:
+# (1) "Unused" stands for "Not in use" or "Does not apply"
+#
+# IMPORTANT "Meaning" must not contain numbers and parentheses, except in the "(unit)"!!!
+#
+# 2*(Code figure) Meaning
+#
+0 0  Unused
+1 1  Version of ecCodes application
+2 2  Version of EDZW-Definitions (DWD-Definitions)
+255 255  Conforms to Missing
+65535 65535  Missing
diff --git a/definitions/grib2/tables/local/edzw/1/2.239.table b/definitions/grib2/tables/local/edzw/1/2.239.table
new file mode 100644
index 000000000..fa602f1a9
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/2.239.table
@@ -0,0 +1,15 @@
+# This file is automatically generated, don't edit!
+#
+# Table 2.239 contains the Local Software Packages that are used to generate a GRIB file
+#
+# Notes:
+# (1) "Unused" stands for "Not in use" or "Does not apply"
+#
+# IMPORTANT "Meaning" must not contain numbers and parentheses, except in the "(unit)"!!!
+#
+# 2*(Code figure) Meaning
+#
+0 0  Unused
+1 1  ecCodes
+255 255  Conforms to Missing
+65535 65535  Missing
diff --git a/definitions/grib2/tables/local/edzw/1/4.0.table b/definitions/grib2/tables/local/edzw/1/4.0.table
index 0281910a4..b3d037905 100644
--- a/definitions/grib2/tables/local/edzw/1/4.0.table
+++ b/definitions/grib2/tables/local/edzw/1/4.0.table
@@ -4,6 +4,14 @@
 40034 40034 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval for simulated (synthetic) satellite data
 40055 40055 tiles parameters at a horizontal level or in a horizontal layer at a point in time
 40056 40056 tiles  Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for ........... parameters
+40180 40180 Derived categorical ensemble product, optionally a composite of several source products, categories based on a single object parameter, at a horizontal level or in a horizontal layer at a point in time
+40181 40181 Derived categorical ensemble product, optionally a composite of several source products, categories based on a single object parameter, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+40182 40182 Probability ensemble product, optionally a composite of several source products, at a horizontal level or in a horizontal layer at a point in time
+40183 40183 Probability ensemble product, optionally a composite of several source products, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+40184 40184 Percentile ensemble product, optionally a composite of several source products, at a horizontal level or in a horizontal layer at a point in time
+40185 40185 Percentile ensemble product, optionally a composite of several source products, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+40186 40186 Ensemble product, optionally a composite of several source products, at a horizontal level or in a horizontal layer at a point in time
+40187 40187 Ensemble product, optionally a composite of several source products, at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
 40455 40455 ???tiles parameters at a horizontal level or in a horizontal layer, in a continuous or non-continuous interval
 50001 50001 Forecasting Systems with Variable Resolution in a point in time
 50011 50011 Forecasting Systems with Variable Resolution in a continous or non countinous time interval
diff --git a/definitions/grib2/tables/local/edzw/1/4.1.0.table b/definitions/grib2/tables/local/edzw/1/4.1.0.table
index ab283d465..1af5fa073 100644
--- a/definitions/grib2/tables/local/edzw/1/4.1.0.table
+++ b/definitions/grib2/tables/local/edzw/1/4.1.0.table
@@ -8,5 +8,7 @@
 196 196 Probabilities from WarnMOS
 197 197 Mineral dust
 198 198 Covariance
+201 201 Derived categorical properties - storm cells
+210 210 Model-specific auxiliary quantities for operational production
 254 254 DUMMIES for testing 
 255 255 Missing
diff --git a/definitions/grib2/tables/local/edzw/1/4.1.10.table b/definitions/grib2/tables/local/edzw/1/4.1.10.table
new file mode 100644
index 000000000..24d3513b7
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/4.1.10.table
@@ -0,0 +1,6 @@
+# This file is automatically generated, don't edit!
+# Discipline 10: Oceanographic products
+# Category Description
+# 192-254 Reserved for local use
+192 192 Model-specific properties
+255 255 Missing
diff --git a/definitions/grib2/tables/local/edzw/1/4.2.0.15.table b/definitions/grib2/tables/local/edzw/1/4.2.0.15.table
index 515f55529..a276ec7da 100644
--- a/definitions/grib2/tables/local/edzw/1/4.2.0.15.table
+++ b/definitions/grib2/tables/local/edzw/1/4.2.0.15.table
@@ -7,3 +7,11 @@
 197 197 Radar blacklist (Numeric)
 198 198 Height of radar beam above ground (m)
 200 200 Reflectivity (dB)
+220 220 NowCastMIX-AutoWARN (Warnpolygone: Gewitter, Starkregen, Schnee, gefrierender Regen) (numeric)
+221 221 NowCastMIX-AutoWARN (Schneepolygon-Attribute) (numeric)
+222 222 NowCastMIX-Aviation (Konvektiver Status, Radolan-Gebiet) (numeric)
+223 223 NowCastMIX-Aviation (Konvektiver Status, EuCOM-Gebiet) (numeric)
+224 224 NowCastMIX-Winterwetter (Schnee, gefrierender Regen, Radolan-Gebiet) (numeric)
+225 225 NowCastMIX-AutoWARN (Gewitter-Warnkeulen mit variablen L??ngen) (numeric)
+226 226 NowCastMIX-Aviation (Starkregen, Radolan-Gebiet) (numeric)
+227 227 NowCastMIX-AutoWARN (Schneefallgrenze) (m)
diff --git a/definitions/grib2/tables/local/edzw/1/4.2.0.201.table b/definitions/grib2/tables/local/edzw/1/4.2.0.201.table
new file mode 100644
index 000000000..3177fae99
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/4.2.0.201.table
@@ -0,0 +1,13 @@
+#Discipline 0: Meteorological products
+#Category 201: Derived categorical properties - storm cells
+#
+# Notes:
+# (1) Only a subset of the product definition tamplates provides specifying the units for derived categorical products.
+#     Currently, these are: 4.40180 and 4.40181 (see Code table 4.0).
+#
+#0 0 Reserved
+1 1 Storm cell severity (defined by template, see Note 1)
+2 2 Hail category (defined by template, see Note 1)
+3 3 Wind category (defined by template, see Note 1)
+4 4 Heavy-rain category (defined by template, see Note 1)
+255 255 Missing
diff --git a/definitions/grib2/tables/local/edzw/1/4.2.0.210.table b/definitions/grib2/tables/local/edzw/1/4.2.0.210.table
new file mode 100644
index 000000000..ded4bbaf5
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/4.2.0.210.table
@@ -0,0 +1,4 @@
+# This file is automatically generated, don't edit!
+0 0 Temperature - time-filtered assimilation increment, daytime weighting (K)
+1 1 Relative humidity - time-filtered assimilation increment, daytime weighting (Proportion)
+255 255 Missing
diff --git a/definitions/grib2/tables/local/edzw/1/4.2.10.192.table b/definitions/grib2/tables/local/edzw/1/4.2.10.192.table
new file mode 100644
index 000000000..25f84c011
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/4.2.10.192.table
@@ -0,0 +1,3 @@
+# This file is automatically generated, don't edit!
+20 20 Stretching factor of rescaled height coordinate zstar (Numeric)
+255 255 Missing
diff --git a/definitions/grib2/tables/local/edzw/1/4.2.10.2.table b/definitions/grib2/tables/local/edzw/1/4.2.10.2.table
new file mode 100644
index 000000000..923b2b22c
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/4.2.10.2.table
@@ -0,0 +1,3 @@
+# This file is automatically generated, don't edit!
+192 192 Snow depth over sea ice (total depth)(m)
+255 255 Missing
diff --git a/definitions/grib2/tables/local/edzw/1/4.5.table b/definitions/grib2/tables/local/edzw/1/4.5.table
index 4cfa7a984..ea8fc8807 100644
--- a/definitions/grib2/tables/local/edzw/1/4.5.table
+++ b/definitions/grib2/tables/local/edzw/1/4.5.table
@@ -12,4 +12,8 @@
 203 vN  Surface: vertical plane facing north
 204 vS  Surface: vertical plane facing south
 205 vW  Surface: vertical plane facing west
+206 N   Surface: plane normal to the sun (radiation)
+207 NO  Surface: plane normal to the sun without orographic shading (radiation)
+208 208 Surface: horizontal plane including orographic shading (radiation)
+209 209 Surface: tangent plane to terrain including orographic shading (radiation)
 255 255 Missing
diff --git a/definitions/grib2/tables/local/edzw/1/4.categoryClassification.table b/definitions/grib2/tables/local/edzw/1/4.categoryClassification.table
new file mode 100644
index 000000000..b8c662a5c
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/4.categoryClassification.table
@@ -0,0 +1,11 @@
+# Local tabel for category classification
+#
+# Notes:
+# (1) Implies ordering of the associated (warning) levels (integer values >= 0): The greater the level the greater the severity.
+# (2) Implies ordering of the associated (warning) levels (integer values >= 0): The greater the level the greater the intensity.
+#
+#0 0 Reserved
+1 1 Severities (see Note 1)
+2 2 Intensities (see Note 2)
+255 255 Conforms to Missing
+65535 65535 Missing
diff --git a/definitions/grib2/tables/local/edzw/1/4.labelOfCategory.table b/definitions/grib2/tables/local/edzw/1/4.labelOfCategory.table
new file mode 100644
index 000000000..a88d33cd7
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/4.labelOfCategory.table
@@ -0,0 +1,13 @@
+# Local table for label of category
+#0 0 Reserved
+1 1 None (severity)
+2 2 Weak (severity)
+3 3 Light (severity)
+4 4 Moderate (severity)
+5 5 Heavy (severity)
+6 6 Severe (severity)
+7 7 Extreme (severity)
+#8 - 100 Reserved for Severities
+#101 - 200 Reserved for Intensities
+255 255 Conforms to Missing
+65535 65535 Missing
diff --git a/definitions/grib2/tables/local/edzw/1/4.meaningOfUUIDAttribute.table b/definitions/grib2/tables/local/edzw/1/4.meaningOfUUIDAttribute.table
new file mode 100644
index 000000000..e393ee170
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/4.meaningOfUUIDAttribute.table
@@ -0,0 +1,5 @@
+# Local table for meaning of universally unique identifier (UUID) attribute
+#0 0 Reserved
+1 1 Matching UUIDs mean that corresponding products (most probably) originate from one and the same realization of the generating process
+255 255 Conforms to Missing
+65535 65535 Missing
diff --git a/definitions/grib2/tables/local/edzw/1/4.parameterAttribute.table b/definitions/grib2/tables/local/edzw/1/4.parameterAttribute.table
new file mode 100644
index 000000000..9dc07d187
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/4.parameterAttribute.table
@@ -0,0 +1,4 @@
+# Local table for parameter attributes
+#0 0 Reserved
+255 255 Conforms to Missing
+65535 65535 Missing
diff --git a/definitions/grib2/tables/local/edzw/1/4.typeOfAnalysisOfCategory.table b/definitions/grib2/tables/local/edzw/1/4.typeOfAnalysisOfCategory.table
new file mode 100644
index 000000000..773866385
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/4.typeOfAnalysisOfCategory.table
@@ -0,0 +1,13 @@
+# Local table for type of analysis of category
+#
+# Notes:
+# (1) The data values of the GRIB message are the category levels itselves.
+# (2) Level and index of a category are defined by template.
+#
+0 0 None (see Note 1)
+1 1 Probability of occurrence (in %) of a specified category (specified by level, see Note 2)
+2 2 Probability of occurrence (in %) of a specified category (specified by index, see Note 2)
+3 3 Probability of occurrence (in %) of any category with level >= level of a specified category (specified by level, see Note 2)
+4 4 Probability of occurrence (in %) of any category with levle >= level of a specified category (specified by index, see Note 2)
+255 255 Conforms to Missing
+65535 65535 Missing
diff --git a/definitions/grib2/tables/local/edzw/1/4.typeOfTemplateConfiguration.table b/definitions/grib2/tables/local/edzw/1/4.typeOfTemplateConfiguration.table
new file mode 100644
index 000000000..a6f3eec1f
--- /dev/null
+++ b/definitions/grib2/tables/local/edzw/1/4.typeOfTemplateConfiguration.table
@@ -0,0 +1,4 @@
+# Local table for template configuration
+#0 0 Reserved
+255 255 Conforms to Missing
+65535 65535 Missing
diff --git a/definitions/grib2/tables/local/edzw/1/generatingProcessIdentifier.table b/definitions/grib2/tables/local/edzw/1/generatingProcessIdentifier.table
index 2596d361d..28d278993 100644
--- a/definitions/grib2/tables/local/edzw/1/generatingProcessIdentifier.table
+++ b/definitions/grib2/tables/local/edzw/1/generatingProcessIdentifier.table
@@ -36,6 +36,7 @@
 058 em3_an em3_an (old name: EM3AN)
 059 em3_fc em3_fc (old name: EM3MO)
 061 ecgm_fc ecgm_fc (old name: ECMFM)
+062 ecgme_fc ecgme_fc (EZMW-EPS based)
 064 064 064 (old name: KWBCM)
 065 mfrgm_fc mfrgm_fc (old name: LFPWM)
 068 noasice1_fc noasice1_fc (old name: KWB01)
@@ -111,3 +112,7 @@
 218 c6e_an c6e_an (old name: LM6AN)
 219 c7e_fc c7e_fc (old name:LM7MO,LEPS)
 225 225 225 (old name: SGBS1)
+230 230 STEPS-DWD (Nowcasting based on gridded data)
+231 231 KONRAD3D-EPS (Nowcasting based on storm cell objects)
+232 232 KONRAD3D-SINFONY (Nowcasting-NWP combination based on KONRAD3D-EPS and ICON-RUC)
+233 233 INTENSE (Nowcasting-NWP combination based on STEPS-DWD and ICON-RUC)
diff --git a/definitions/grib2/templates/template.4.generalised_tile.def b/definitions/grib2/templates/template.4.generalised_tile.def
index 5eb4be333..6dc43dd19 100644
--- a/definitions/grib2/templates/template.4.generalised_tile.def
+++ b/definitions/grib2/templates/template.4.generalised_tile.def
@@ -42,5 +42,5 @@ alias tile.nTileAtt=nTileAtt;
 alias mars.tile=typeOfTile;
 alias mars.tileattribute=tileAttribute;
 constant paramTypeTile = "tile";
-unalias mars.paramtype;
-alias mars.paramtype=paramTypeTile;
+# unalias paramtype;
+alias paramtype=paramTypeTile;
diff --git a/definitions/grib2/templates/template.4.statistical.def b/definitions/grib2/templates/template.4.statistical.def
index fde76eba3..ee458ecbf 100644
--- a/definitions/grib2/templates/template.4.statistical.def
+++ b/definitions/grib2/templates/template.4.statistical.def
@@ -69,6 +69,7 @@ if (numberOfTimeRanges == 1 || numberOfTimeRanges == 2) {
     "sum"     = {typeOfStatisticalProcessing=11;}
     "severity" = {typeOfStatisticalProcessing=100;}
     "mode"     = {typeOfStatisticalProcessing=101;}
+    "index"    = {typeOfStatisticalProcessing=102;}
   }
   meta startStep step_in_units(forecastTime,indicatorOfUnitOfTimeRange,stepUnits,
     indicatorOfUnitForTimeRange,lengthOfTimeRange) : no_copy;
diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def
index aa2e3925d..c76e16d95 100644
--- a/definitions/grib2/units.def
+++ b/definitions/grib2/units.def
@@ -985,6 +985,18 @@
 	 scaleFactorOfLowerLimit = 0 ;
 	 probabilityType = 3 ;
 	}
+#10 metre convective gust of at least 25 m/s
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfLowerLimit = 25 ;
+	 scaleFactorOfLowerLimit = 0 ;
+	 probabilityType = 3 ;
+	}
 #Probability of temperature standardized anomaly greater than 1 standard deviation
 '%' = {
 	 discipline = 0 ;
@@ -1619,6 +1631,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean peak wave period of wind waves
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of total swell
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of first swell partition
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of second swell partition
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave period of third swell partition
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction (total)
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of wind waves
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of total swell
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of first swell partition
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of second swell partition
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean peak wave direction of third swell partition
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean whitecap fraction
+'Fraction' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean wave Spectral Skewness
 'Numeric' = {
 	 discipline = 10 ;
@@ -2084,6 +2180,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Time-maximum peak wave period of wind waves
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of total swell
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of first swell partition
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of second swell partition
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave period of third swell partition
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction (total)
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of wind waves
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of total swell
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of first swell partition
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of second swell partition
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum peak wave direction of third swell partition
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum whitecap fraction
+'Fraction' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
 #Time-maximum wave Spectral Skewness
 'Numeric' = {
 	 discipline = 10 ;
@@ -2549,6 +2729,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 3 ;
 	}
+#Time-minimum peak wave period of wind waves
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of total swell
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of first swell partition
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of second swell partition
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave period of third swell partition
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction (total)
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of wind waves
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of total swell
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of first swell partition
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of second swell partition
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum peak wave direction of third swell partition
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum whitecap fraction
+'Fraction' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
 #Time-minimum wave Spectral Skewness
 'Numeric' = {
 	 discipline = 10 ;
@@ -3014,6 +3278,90 @@
 	 parameterNumber = 97 ;
 	 typeOfStatisticalProcessing = 6 ;
 	}
+#Time-standard-deviation peak wave period of wind waves
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 35 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of total swell
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 36 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of first swell partition
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 65 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of second swell partition
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 66 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave period of third swell partition
+'s' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 67 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction (total)
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 46 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of wind waves
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 71 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of total swell
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 72 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of first swell partition
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 68 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of second swell partition
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 69 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation peak wave direction of third swell partition
+'Degree true' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 70 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation whitecap fraction
+'Fraction' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 73 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
 #Time-standard-deviation wave Spectral Skewness
 'Numeric' = {
 	 discipline = 10 ;
@@ -3742,6 +4090,13 @@
 	 typeOfGeneratingProcess = 20 ;
 	 is_aerosol = 1 ;
 	}
+#Cosine of solar zenith angle
+'Numeric' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
 #Dry deposition of ammonium aerosol
 'kg m**-2 s**-1' = {
 	 discipline = 0 ;
@@ -8113,6 +8468,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean cosine of solar zenith angle
+'Numeric' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean freezing rain precipitation rate
 'kg m**-2 s**-1' = {
 	 discipline = 0 ;
@@ -8488,6 +8851,58 @@
 	 parameterNumber = 51 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean land surface heat net flux
+'W m**-2' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean surface direct normal short-wave radiation flux, clear sky
+'W m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean 10 metre convective gust
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean 10 metre turbulent gust
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-integrated land surface heat net flux
+'J m**-2' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Time-integrated surface direct normal short-wave radiation flux, clear sky
+'J m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Time-maximum temperature tendency due to short-wave radiation
 'K s**-1' = {
 	 discipline = 0 ;
@@ -9883,6 +10298,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Time-maximum cosine of solar zenith angle
+'Numeric' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
 #Time-maximum freezing rain precipitation rate
 'kg m**-2 s**-1' = {
 	 discipline = 0 ;
@@ -10258,6 +10681,42 @@
 	 parameterNumber = 51 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Time-maximum land surface heat net flux
+'W m**-2' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum surface direct normal short-wave radiation flux, clear sky
+'W m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum 10 metre convective gust
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum 10 metre turbulent gust
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
 #Time-minimum temperature tendency due to short-wave radiation
 'K s**-1' = {
 	 discipline = 0 ;
@@ -11681,6 +12140,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 3 ;
 	}
+#Time-minimum cosine of solar zenith angle
+'Numeric' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
 #Time-minimum freezing rain rate water equivalent
 'kg m**-2 s**-1' = {
 	 discipline = 0 ;
@@ -12056,6 +12523,42 @@
 	 parameterNumber = 51 ;
 	 typeOfStatisticalProcessing = 3 ;
 	}
+#Time-minimum land surface heat net flux
+'W m**-2' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum surface direct normal short-wave radiation flux, clear sky
+'W m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum 10 metre convective gust
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum 10 metre turbulent gust
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
 #Time-standard-deviation temperature tendency due to short-wave radiation
 'K s**-1' = {
 	 discipline = 0 ;
@@ -13487,6 +13990,14 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 6 ;
 	}
+#Time-standard-deviation cosine of solar zenith angle
+'Numeric' = {
+	 discipline = 3 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 24 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
 #Time-standard-deviation freezing rain rate water equivalent
 'kg m**-2 s**-1' = {
 	 discipline = 0 ;
@@ -13855,6 +14366,42 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 6 ;
 	}
+#Time-standard-deviation land surface heat net flux
+'W m**-2' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation surface direct normal short-wave radiation flux, clear sky
+'W m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 10 metre convective gust
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 10 metre turbulent gust
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
 #Cross sectional area of flow in channel
 'm**2' = {
 	 discipline = 1 ;
@@ -16120,6 +16667,38 @@
 	 parameterNumber = 67 ;
 	 typeOfFirstFixedSurface = 1 ;
 	}
+#Land surface heat net flux
+'W m**-2' = {
+	 discipline = 2 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Surface direct normal short-wave radiation flux, clear sky
+'W m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 62 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#10 metre convective gust
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 68 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#10 metre turbulent gust
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 69 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
 #Universal thermal climate index
 'K' = {
 	 discipline = 20 ;
@@ -17194,6 +17773,22 @@
 	 typeOfFirstFixedSurface = 168 ;
 	 typeOfSecondFixedSurface = 168 ;
 	}
+#Northward mass transport
+'kg m**-2 s**-1' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 46 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	}
+#Eastward mass transport
+'kg m**-2 s**-1' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 47 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	}
 #Net short wave radiation rate at sea surface
 'W m**-2' = {
 	 discipline = 0 ;
@@ -18339,6 +18934,24 @@
 	 typeOfSecondFixedSurface = 168 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean northward mass transport
+'kg m**-2 s**-1' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 46 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean eastward mass transport
+'kg m**-2 s**-1' = {
+	 discipline = 10 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 47 ;
+	 typeOfFirstFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean net short wave radiation rate at sea surface
 'W m**-2' = {
 	 discipline = 0 ;
@@ -18898,14 +19511,12 @@
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 107 ;
-	 typeOfFirstFixedSurface = 8 ;
 	}
 #Aerosol backscatter from ground
 'm**-1 sr**-1' = {
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 108 ;
-	 typeOfFirstFixedSurface = 1 ;
 	}
 #Aerosol extinction coefficient
 'm**-1' = {
@@ -18915,26 +19526,26 @@
 	}
 #Mass mixing ratio difference
 'kg kg**-1' = {
-         discipline = 0 ;
-         parameterCategory = 20 ;
-         parameterNumber = 2 ;
-         typeOfGeneratingProcess = 20 ;
-        }
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 2 ;
+	 typeOfGeneratingProcess = 20 ;
+	}
 #Mass mixing ratio from volcanoes difference
 'kg kg**-1' = {
-         discipline = 0 ;
-         parameterCategory = 20 ;
-         parameterNumber = 2 ;
-         sourceSinkChemicalPhysicalProcess = 7 ;
-         typeOfGeneratingProcess = 20 ;
-        }
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 2 ;
+	 typeOfGeneratingProcess = 20 ;
+	 sourceSinkChemicalPhysicalProcess = 7 ;
+	}
 #Emission mass flux from wild fires
 'kg m**-2 s**-1' = {
-         discipline = 0 ;
-         parameterCategory = 20 ;
-         parameterNumber = 77 ;
-         sourceSinkChemicalPhysicalProcess = 5 ;
-        }
+	 discipline = 0 ;
+	 parameterCategory = 20 ;
+	 parameterNumber = 77 ;
+	 sourceSinkChemicalPhysicalProcess = 5 ;
+	}
 #Pressure tendency
 'Pa s**-1' = {
 	 discipline = 0 ;
diff --git a/eccodes_config.h.in b/eccodes_config.h.in
index 29877a3d9..a003e802d 100644
--- a/eccodes_config.h.in
+++ b/eccodes_config.h.in
@@ -114,6 +114,7 @@
 #cmakedefine HAVE_NETCDF
 
 #cmakedefine HAVE_GEOGRAPHY
+#cmakedefine HAVE_ECKIT_GEO
 #cmakedefine HAVE_MEMFS
 #cmakedefine HAVE_FORTRAN
 
diff --git a/examples/F90/CMakeLists.txt b/examples/F90/CMakeLists.txt
index c98f234df..cde95e77f 100644
--- a/examples/F90/CMakeLists.txt
+++ b/examples/F90/CMakeLists.txt
@@ -18,6 +18,7 @@ if( HAVE_BUILD_TOOLS )
           bufr_ecc-1284
           bufr_ecc-1019
           get_native_type
+          key_is_computed
           grib_ecc-671 )
     list( APPEND tests_extra
           grib_index
@@ -81,6 +82,7 @@ else()
           codes_set_paths
           codes_f90_misc
           get_native_type
+          key_is_computed
           grib_ecc-671 )
     list( APPEND tests_extra
           grib_index
diff --git a/examples/F90/key_is_computed.f90 b/examples/F90/key_is_computed.f90
new file mode 100644
index 000000000..6b047fca8
--- /dev/null
+++ b/examples/F90/key_is_computed.f90
@@ -0,0 +1,38 @@
+! (C) Copyright 2005- ECMWF.
+!
+! This software is licensed under the terms of the Apache Licence Version 2.0
+! which can be obtained at http://www.apache.org/licenses/LICENSECODES_INTERNAL_ERROR.0.
+!
+! In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+! virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+!
+program key_is_computed
+   use eccodes
+   implicit none
+   integer :: ihandle, is_computed=0
+
+   CALL codes_grib_new_from_samples(ihandle, "regular_ll_sfc_grib2")
+
+   CALL codes_key_is_computed(ihandle, 'edition', is_computed)
+   IF (is_computed /= 0) THEN
+      call codes_check(CODES_INTERNAL_ERROR, 'Error', 'key edition is coded')
+   END IF
+
+   CALL codes_key_is_computed(ihandle, 'longitudeOfLastGridPoint', is_computed)
+   IF (is_computed /= 0) THEN
+      call codes_check(CODES_INTERNAL_ERROR, 'Error', 'key longitudeOfLastGridPoint is coded')
+   END IF
+
+   CALL codes_key_is_computed(ihandle, 'longitudeOfLastGridPointInDegrees', is_computed)
+   IF (is_computed /= 1) THEN
+      call codes_check(CODES_INTERNAL_ERROR, 'Error', 'key longitudeOfLastGridPointInDegrees is computed')
+   END IF
+
+   CALL codes_key_is_computed(ihandle, 'gridType', is_computed)
+   IF (is_computed /= 1) THEN
+      call codes_check(CODES_INTERNAL_ERROR, 'Error', 'key gridType is computed')
+   END IF
+
+   CALL codes_release(ihandle)
+
+end program key_is_computed
diff --git a/examples/F90/key_is_computed.sh b/examples/F90/key_is_computed.sh
new file mode 100755
index 000000000..975cd001f
--- /dev/null
+++ b/examples/F90/key_is_computed.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# (C) Copyright 2005- ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+# 
+# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+#
+
+. ./include.ctest.sh
+
+label="f_key_is_computed"
+
+${examples_dir}/eccodes_f_key_is_computed
+
diff --git a/fortran/eccodes_f90_tail.f90 b/fortran/eccodes_f90_tail.f90
index 14dad7118..02f176381 100644
--- a/fortran/eccodes_f90_tail.f90
+++ b/fortran/eccodes_f90_tail.f90
@@ -1710,6 +1710,36 @@
     call grib_is_defined(msgid, key, is_defined, status)
   end subroutine codes_is_defined
 
+!!!
+  !> Check if a key is computed(virtual) or coded
+  !>
+  !> In case of error, if the status parameter (optional) is not given, the program will
+  !> exit with an error message.\n Otherwise the error message can be
+  !> gathered with @ref codes_get_error_string.
+  !>
+  !> @param msgid        id of the message loaded in memory
+  !> @param key          key name
+  !> @param is_computed  0->coded, 1->computed
+  !> @param status       CODES_SUCCESS if OK, integer value on error
+  subroutine codes_key_is_computed(msgid, key, is_computed, status)
+    integer(kind=kindOfInt), intent(in)            :: msgid
+    character(len=*), intent(in)                   :: key
+    integer(kind=kindOfInt), intent(out)           :: is_computed
+    integer(kind=kindOfInt), optional, intent(out) :: status
+    integer(kind=kindOfInt)                        :: iret
+
+    iret = grib_f_key_is_computed(msgid, key, is_computed)
+    if (iret /= 0) then
+      call grib_f_write_on_fail(msgid)
+    end if
+    if (present(status)) then
+      status = iret
+    else
+      call grib_check(iret, 'key_is_computed', key)
+    end if
+  end subroutine codes_key_is_computed
+!!!
+
   !> Get the real(4) value of a key from a message.
   !>
   !> In case of error, if the status parameter (optional) is not given, the program will
diff --git a/fortran/eccodes_visibility.h b/fortran/eccodes_visibility.h
index 9e720f1cd..9fe5d46e5 100644
--- a/fortran/eccodes_visibility.h
+++ b/fortran/eccodes_visibility.h
@@ -1,4 +1,4 @@
-public :: codes_get, codes_set, codes_set_force, codes_grib_get_data, codes_is_missing, codes_is_defined
+public :: codes_get, codes_set, codes_set_force, codes_grib_get_data, codes_is_missing, codes_is_defined, codes_key_is_computed
 public :: codes_open_file, codes_close_file,codes_read_bytes,codes_write_bytes
 public :: codes_grib_multi_support_on, codes_grib_multi_support_off
 public :: codes_keys_iterator_new, &
diff --git a/fortran/grib_api_externals.h b/fortran/grib_api_externals.h
index 496143c1b..feb9896b3 100644
--- a/fortran/grib_api_externals.h
+++ b/fortran/grib_api_externals.h
@@ -48,7 +48,7 @@ integer, external :: grib_f_get_int, grib_f_get_long,grib_f_get_int_array, &
                      grib_f_get_real4_elements, grib_f_get_real8_elements, &
                      grib_f_get_string,grib_f_get_string_array, &
                      codes_f_bufr_copy_data, &
-                     grib_f_is_missing,grib_f_is_defined
+                     grib_f_is_missing, grib_f_is_defined, grib_f_key_is_computed
 integer, external :: grib_f_new_from_index, &
                      grib_f_index_new_from_file, &
                      grib_f_index_add_file, &
diff --git a/fortran/grib_fortran.cc b/fortran/grib_fortran.cc
index 7ea9b6319..1f9af48c6 100644
--- a/fortran/grib_fortran.cc
+++ b/fortran/grib_fortran.cc
@@ -2223,7 +2223,7 @@ int grib_f_is_missing_(int* gid, char* key,int* isMissing,int len)
     int err=0;
     grib_handle *h = get_handle(*gid);
     char buf[1024];
-    if(!h)  return GRIB_INVALID_GRIB;
+    if (!h) return GRIB_INVALID_GRIB;
 
     *isMissing=grib_is_missing(h, cast_char(buf,key,len),&err);
     return err;
@@ -2240,6 +2240,18 @@ int grib_f_is_defined_(int* gid, char* key,int* isDefined,int len)
     return GRIB_SUCCESS;
 }
 
+/*****************************************************************************/
+int grib_f_key_is_computed_(int* gid, char* key,int* isComputed,int len)
+{
+    int err = 0;
+    grib_handle *h = get_handle(*gid);
+    char buf[1024];
+    if (!h) return GRIB_INVALID_GRIB;
+
+    *isComputed = codes_key_is_computed(h, cast_char(buf,key,len), &err);
+    return err;
+}
+
 /*****************************************************************************/
 int grib_f_set_real4_(int* gid, char* key, float* val, int len)
 {
diff --git a/fortran/grib_fortran_prototypes.h b/fortran/grib_fortran_prototypes.h
index 8fb2f240f..db1b69836 100644
--- a/fortran/grib_fortran_prototypes.h
+++ b/fortran/grib_fortran_prototypes.h
@@ -327,6 +327,7 @@ int grib_f_datetime_to_julian_(long* year,long* month,long* day, long* hour,long
 int grib_f_set_string_array_(int* gid, char* key, char* val,int* nvals,int* slen, int len);
 int codes_f_bufr_keys_iterator_get_name_(int* iterid, char* name, int len);
 int codes_f_bufr_multi_element_constant_arrays_off_();
+int grib_f_key_is_computed_(int *gid, char *key, int *isComputed, int len);
 
 
 #ifdef __cplusplus
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 01d497bb1..efa74c7e4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,8 +11,8 @@
 
 include_directories(
     "${CMAKE_CURRENT_SOURCE_DIR}/accessor"
-    "${CMAKE_CURRENT_SOURCE_DIR}/geo_iterator"
-    "${CMAKE_CURRENT_SOURCE_DIR}/geo_nearest"
+    "${CMAKE_CURRENT_SOURCE_DIR}/geo/iterator"
+    "${CMAKE_CURRENT_SOURCE_DIR}/geo/nearest"
     )
 
 list( APPEND eccodes_src_files
@@ -124,6 +124,7 @@ list( APPEND eccodes_src_files
     accessor/grib_accessor_class_data_g22order_packing.cc
     accessor/grib_accessor_class_mars_step.cc
     accessor/grib_accessor_class_message_copy.cc
+    accessor/grib_accessor_class_message_is_valid.cc
     accessor/grib_accessor_class_dictionary.cc
     accessor/grib_accessor_class_latlon_increment.cc
     accessor/grib_accessor_class_g2date.cc
@@ -262,7 +263,7 @@ list( APPEND eccodes_src_files
     accessor/grib_accessor_class_sexagesimal2decimal.cc
     accessor/grib_accessor_class_vector.cc
     accessor/grib_accessor_class_long_vector.cc
-    grib_gaussian_reduced.cc
+    geo/grib_gaussian_reduced.cc
     accessor/grib_accessor_class_abstract_vector.cc
     accessor/grib_accessor_class_abstract_long_vector.cc
     grib_loader_from_handle.cc
@@ -293,7 +294,7 @@ list( APPEND eccodes_src_files
     grib_date.cc
     grib_fieldset.cc
     grib_filepool.cc
-    grib_geography.cc
+    geo/grib_geography.cc
     grib_handle.cc
     grib_hash_keys.cc
     grib_io.cc
@@ -310,48 +311,54 @@ list( APPEND eccodes_src_files
     grib_dependency.cc
     grib_value.cc
     grib_errors.cc
-    grib_expression_class_binop.cc
-    grib_expression_class_logical_and.cc
-    grib_expression_class_logical_or.cc
-    grib_expression_class_is_in_dict.cc
-    grib_expression_class_true.cc
-    grib_expression_class_string_compare.cc
-    grib_expression_class_unop.cc
-    grib_expression_class_functor.cc
-    grib_expression_class_accessor.cc
-    grib_expression_class_is_in_list.cc
-    grib_expression_class_is_integer.cc
-    grib_expression_class_length.cc
-    grib_expression_class_long.cc
-    grib_expression_class_double.cc
-    grib_expression_class_string.cc
-    grib_expression_class_sub_string.cc
-    geo_nearest/grib_nearest.cc
-    geo_nearest/grib_nearest_class_gen.cc
-    geo_nearest/grib_nearest_class_healpix.cc
-    geo_nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc
-    geo_nearest/grib_nearest_class_lambert_conformal.cc
-    geo_nearest/grib_nearest_class_latlon_reduced.cc
-    geo_nearest/grib_nearest_class_mercator.cc
-    geo_nearest/grib_nearest_class_polar_stereographic.cc
-    geo_nearest/grib_nearest_class_reduced.cc
-    geo_nearest/grib_nearest_class_regular.cc
-    geo_nearest/grib_nearest_class_space_view.cc
-    geo_iterator/grib_iterator.cc
-    geo_iterator/grib_iterator_class_gaussian.cc
-    geo_iterator/grib_iterator_class_gaussian_reduced.cc
-    geo_iterator/grib_iterator_class_gen.cc
-    geo_iterator/grib_iterator_class_healpix.cc
-    geo_iterator/grib_iterator_class_lambert_azimuthal_equal_area.cc
-    geo_iterator/grib_iterator_class_lambert_conformal.cc
-    geo_iterator/grib_iterator_class_latlon.cc
-    geo_iterator/grib_iterator_class_latlon_reduced.cc
-    geo_iterator/grib_iterator_class_mercator.cc
-    geo_iterator/grib_iterator_class_polar_stereographic.cc
-    geo_iterator/grib_iterator_class_regular.cc
-    geo_iterator/grib_iterator_class_space_view.cc
-    geo_iterator/grib_iterator_class_unstructured.cc
-    grib_expression.cc
+
+    expression/grib_arguments.cc
+
+    expression/grib_expression.cc
+    expression/grib_expression_class_binop.cc
+    expression/grib_expression_class_logical_and.cc
+    expression/grib_expression_class_logical_or.cc
+    expression/grib_expression_class_is_in_dict.cc
+    expression/grib_expression_class_true.cc
+    expression/grib_expression_class_string_compare.cc
+    expression/grib_expression_class_unop.cc
+    expression/grib_expression_class_functor.cc
+    expression/grib_expression_class_accessor.cc
+    expression/grib_expression_class_is_in_list.cc
+    expression/grib_expression_class_is_integer.cc
+    expression/grib_expression_class_length.cc
+    expression/grib_expression_class_long.cc
+    expression/grib_expression_class_double.cc
+    expression/grib_expression_class_string.cc
+    expression/grib_expression_class_sub_string.cc
+
+    geo/nearest/grib_nearest.cc
+    geo/nearest/grib_nearest_class_gen.cc
+    geo/nearest/grib_nearest_class_healpix.cc
+    geo/nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc
+    geo/nearest/grib_nearest_class_lambert_conformal.cc
+    geo/nearest/grib_nearest_class_latlon_reduced.cc
+    geo/nearest/grib_nearest_class_mercator.cc
+    geo/nearest/grib_nearest_class_polar_stereographic.cc
+    geo/nearest/grib_nearest_class_reduced.cc
+    geo/nearest/grib_nearest_class_regular.cc
+    geo/nearest/grib_nearest_class_space_view.cc
+
+    geo/iterator/grib_iterator.cc
+    geo/iterator/grib_iterator_class_gaussian.cc
+    geo/iterator/grib_iterator_class_gaussian_reduced.cc
+    geo/iterator/grib_iterator_class_gen.cc
+    geo/iterator/grib_iterator_class_healpix.cc
+    geo/iterator/grib_iterator_class_lambert_azimuthal_equal_area.cc
+    geo/iterator/grib_iterator_class_lambert_conformal.cc
+    geo/iterator/grib_iterator_class_latlon.cc
+    geo/iterator/grib_iterator_class_latlon_reduced.cc
+    geo/iterator/grib_iterator_class_mercator.cc
+    geo/iterator/grib_iterator_class_polar_stereographic.cc
+    geo/iterator/grib_iterator_class_regular.cc
+    geo/iterator/grib_iterator_class_space_view.cc
+    geo/iterator/grib_iterator_class_unstructured.cc
+
     codes_util.cc
     grib_util.cc
     bufr_util.cc
@@ -411,6 +418,15 @@ if( HAVE_MEMFS )
     list(APPEND ECCODES_EXTRA_LIBRARIES eccodes_memfs)
 endif()
 
+if( eccodes_HAVE_GEOGRAPHY AND eccodes_HAVE_ECKIT_GEO )
+    list( APPEND eccodes_src_files
+        geo/GeoIterator.cc
+        geo/GeoIterator.h
+        geo/GribSpec.cc
+        geo/GribSpec.h )
+    list( APPEND ECCODES_EXTRA_LIBRARIES eckit_geo )
+endif()
+
 ecbuild_add_library( TARGET    eccodes
                      SOURCES   ${CMAKE_CURRENT_BINARY_DIR}/grib_api_version.cc
                               # griby.cc gribl.cc
diff --git a/src/accessor/grib_accessor_class_ascii.cc b/src/accessor/grib_accessor_class_ascii.cc
index 6fa3f4cbc..71ae3f37b 100644
--- a/src/accessor/grib_accessor_class_ascii.cc
+++ b/src/accessor/grib_accessor_class_ascii.cc
@@ -139,7 +139,7 @@ int grib_accessor_ascii_t::unpack_long(long* v, size_t* len)
 
     *v = strtol(val, &last, 10);
 
-    grib_context_log(this->context_, GRIB_LOG_DEBUG, " Casting string %s to long", name_);
+    grib_context_log(this->context_, GRIB_LOG_DEBUG, "Casting string %s to long", name_);
     return GRIB_SUCCESS;
 }
 
@@ -155,7 +155,7 @@ int grib_accessor_ascii_t::unpack_double(double* v, size_t* len)
     *v = strtod(val, &last);
 
     if (*last == 0) {
-        grib_context_log(this->context_, GRIB_LOG_DEBUG, " Casting string %s to long", name_);
+        grib_context_log(this->context_, GRIB_LOG_DEBUG, "Casting string %s to long", name_);
         return GRIB_SUCCESS;
     }
 
diff --git a/src/accessor/grib_accessor_class_bit.cc b/src/accessor/grib_accessor_class_bit.cc
index 0bd9ffbf6..28ae01874 100644
--- a/src/accessor/grib_accessor_class_bit.cc
+++ b/src/accessor/grib_accessor_class_bit.cc
@@ -17,8 +17,8 @@ void grib_accessor_bit_t::init(const long len, grib_arguments* arg)
 {
     grib_accessor_long_t::init(len, arg);
     length_    = 0;
-    owner_     = grib_arguments_get_name(grib_handle_of_accessor(this), arg, 0);
-    bit_index_ = grib_arguments_get_long(grib_handle_of_accessor(this), arg, 1);
+    owner_     = arg->get_name(grib_handle_of_accessor(this), 0);
+    bit_index_ = arg->get_long(grib_handle_of_accessor(this), 1);
 }
 
 int grib_accessor_bit_t::unpack_long(long* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_bitmap.cc b/src/accessor/grib_accessor_class_bitmap.cc
index 206a9f918..dd8c9ae2b 100644
--- a/src/accessor/grib_accessor_class_bitmap.cc
+++ b/src/accessor/grib_accessor_class_bitmap.cc
@@ -54,10 +54,10 @@ void grib_accessor_bitmap_t::init(const long len, grib_arguments* arg)
     grib_handle* hand = grib_handle_of_accessor(this);
     int n             = 0;
 
-    tableReference_ = grib_arguments_get_name(hand, arg, n++);
-    missing_value_  = grib_arguments_get_name(hand, arg, n++);
-    offsetbsec_     = grib_arguments_get_name(hand, arg, n++);
-    sLength_        = grib_arguments_get_name(hand, arg, n++);
+    tableReference_ = arg->get_name(hand, n++);
+    missing_value_  = arg->get_name(hand, n++);
+    offsetbsec_     = arg->get_name(hand, n++);
+    sLength_        = arg->get_name(hand, n++);
 
     compute_size();
 }
diff --git a/src/accessor/grib_accessor_class_bits.cc b/src/accessor/grib_accessor_class_bits.cc
index d34e5f401..b03255af3 100644
--- a/src/accessor/grib_accessor_class_bits.cc
+++ b/src/accessor/grib_accessor_class_bits.cc
@@ -23,12 +23,12 @@ void grib_accessor_bits_t::init(const long l, grib_arguments* c)
     int n              = 0;
     referenceValue_    = 0;
 
-    argument_ = grib_arguments_get_name(hand, c, n++);
-    start_    = grib_arguments_get_long(hand, c, n++);
-    len_      = grib_arguments_get_long(hand, c, n++);
-    e         = grib_arguments_get_expression(hand, c, n++);
+    argument_ = c->get_name(hand, n++);
+    start_    = c->get_long(hand, n++);
+    len_      = c->get_long(hand, n++);
+    e         = c->get_expression(hand, n++);
     if (e) {
-        grib_expression_evaluate_double(hand, e, &(referenceValue_));
+        e->evaluate_double(hand, &(referenceValue_));
         referenceValuePresent_ = 1;
     }
     else {
@@ -36,7 +36,7 @@ void grib_accessor_bits_t::init(const long l, grib_arguments* c)
     }
     scale_ = 1;
     if (referenceValuePresent_) {
-        scale_ = grib_arguments_get_double(hand, c, n++);
+        scale_ = c->get_double(hand, n++);
     }
 
     Assert(len_ <= sizeof(long) * 8);
diff --git a/src/accessor/grib_accessor_class_bits_per_value.cc b/src/accessor/grib_accessor_class_bits_per_value.cc
index 0023bbcc0..bd5e8d6bb 100644
--- a/src/accessor/grib_accessor_class_bits_per_value.cc
+++ b/src/accessor/grib_accessor_class_bits_per_value.cc
@@ -17,8 +17,8 @@ void grib_accessor_bits_per_value_t::init(const long l, grib_arguments* args)
 {
     grib_accessor_long_t::init(l, args);
     int n           = 0;
-    values_         = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    bits_per_value_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
+    values_         = args->get_name(grib_handle_of_accessor(this), n++);
+    bits_per_value_ = args->get_name(grib_handle_of_accessor(this), n++);
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     length_ = 0;
 }
diff --git a/src/accessor/grib_accessor_class_blob.cc b/src/accessor/grib_accessor_class_blob.cc
index cf7d86ae8..972d73e7a 100644
--- a/src/accessor/grib_accessor_class_blob.cc
+++ b/src/accessor/grib_accessor_class_blob.cc
@@ -17,7 +17,7 @@ void grib_accessor_blob_t::init(const long len, grib_arguments* arg)
 {
     grib_accessor_gen_t::init(len, arg);
     grib_get_long_internal(grib_handle_of_accessor(this),
-                           grib_arguments_get_name(parent_->h, arg, 0), &length_);
+                           arg->get_name(parent_->h, 0), &length_);
     Assert(length_ >= 0);
 }
 
diff --git a/src/accessor/grib_accessor_class_budgdate.cc b/src/accessor/grib_accessor_class_budgdate.cc
index 3b44f62a4..8488b1af4 100644
--- a/src/accessor/grib_accessor_class_budgdate.cc
+++ b/src/accessor/grib_accessor_class_budgdate.cc
@@ -18,9 +18,9 @@ void grib_accessor_budgdate_t::init(const long l, grib_arguments* c)
     grib_accessor_long_t::init(l, c);
     int n = 0;
 
-    year_  = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    month_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    day_   = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    year_  = c->get_name(grib_handle_of_accessor(this), n++);
+    month_ = c->get_name(grib_handle_of_accessor(this), n++);
+    day_   = c->get_name(grib_handle_of_accessor(this), n++);
 }
 
 int grib_accessor_budgdate_t::unpack_long(long* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_bufr_data_array.cc b/src/accessor/grib_accessor_class_bufr_data_array.cc
index 80bae77e7..1f4f077ba 100644
--- a/src/accessor/grib_accessor_class_bufr_data_array.cc
+++ b/src/accessor/grib_accessor_class_bufr_data_array.cc
@@ -195,13 +195,13 @@ void grib_accessor_bufr_data_array_t::init(const long v, grib_arguments* params)
     tempStrings_                           = NULL;
 
 
-    bufrDataEncodedName_          = grib_arguments_get_name(grib_handle_of_accessor(this), params, n++);
-    numberOfSubsetsName_          = grib_arguments_get_name(grib_handle_of_accessor(this), params, n++);
-    expandedDescriptorsName_      = grib_arguments_get_name(grib_handle_of_accessor(this), params, n++);
-    flagsName_                    = grib_arguments_get_name(grib_handle_of_accessor(this), params, n++);
-    elementsDescriptorsIndexName_ = grib_arguments_get_name(grib_handle_of_accessor(this), params, n++);
-    compressedDataName_           = grib_arguments_get_name(grib_handle_of_accessor(this), params, n++);
-    dataKeysName                  = grib_arguments_get_name(grib_handle_of_accessor(this), params, n++);
+    bufrDataEncodedName_          = params->get_name(grib_handle_of_accessor(this), n++);
+    numberOfSubsetsName_          = params->get_name(grib_handle_of_accessor(this), n++);
+    expandedDescriptorsName_      = params->get_name(grib_handle_of_accessor(this), n++);
+    flagsName_                    = params->get_name(grib_handle_of_accessor(this), n++);
+    elementsDescriptorsIndexName_ = params->get_name(grib_handle_of_accessor(this), n++);
+    compressedDataName_           = params->get_name(grib_handle_of_accessor(this), n++);
+    dataKeysName                  = params->get_name(grib_handle_of_accessor(this), n++);
 
     dataKeysAcc               = grib_find_accessor(grib_handle_of_accessor(this), dataKeysName);
     dataKeys_                 = dataKeysAcc->parent_;
@@ -1775,21 +1775,15 @@ grib_accessor* grib_accessor_bufr_data_array_t::create_accessor_from_descriptor(
                                                                                 long ide, long subset, int add_dump_flag, int add_coord_flag,
                                                                                 int count, int add_extra_attributes)
 {
-    char code[10] = {
-        0,
-    };
+    char code[10] = {0,};
     char* temp_str              = NULL;
     int idx                     = 0;
     unsigned long flags         = GRIB_ACCESSOR_FLAG_READ_ONLY;
-    grib_action operatorCreator = {
-        0,
-    };
+    grib_action operatorCreator = {0,};
     grib_accessor* accessor = NULL;
     grib_accessor_bufr_data_element_t* elementAccessor = NULL;
     grib_accessor_variable_t* variableAccessor = NULL;
-    grib_action creator            = {
-        0,
-    };
+    grib_action creator            = {0,};
     creator.op         = (char*)"bufr_data_element";
     creator.name_space = (char*)"";
     creator.set        = 0;
@@ -2492,7 +2486,6 @@ int grib_accessor_bufr_data_array_t::create_keys(long onlySubset, long startSubs
             }
 
             if (ide == 0 && !compressedData_) {
-                
                 long subsetNumber     = iss + 1;
                 size_t len            = 1;
                 grib_action creatorsn = {
diff --git a/src/accessor/grib_accessor_class_bufr_data_element.h b/src/accessor/grib_accessor_class_bufr_data_element.h
index c2bb80da9..47e8293d1 100644
--- a/src/accessor/grib_accessor_class_bufr_data_element.h
+++ b/src/accessor/grib_accessor_class_bufr_data_element.h
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
diff --git a/src/accessor/grib_accessor_class_bufr_elements_table.cc b/src/accessor/grib_accessor_class_bufr_elements_table.cc
index 73d631303..233dfc118 100644
--- a/src/accessor/grib_accessor_class_bufr_elements_table.cc
+++ b/src/accessor/grib_accessor_class_bufr_elements_table.cc
@@ -47,9 +47,9 @@ void grib_accessor_bufr_elements_table_t::init(const long len, grib_arguments* p
     grib_accessor_gen_t::init(len, params);
     int n = 0;
 
-    dictionary_ = grib_arguments_get_string(grib_handle_of_accessor(this), params, n++);
-    masterDir_  = grib_arguments_get_name(grib_handle_of_accessor(this), params, n++);
-    localDir_   = grib_arguments_get_name(grib_handle_of_accessor(this), params, n++);
+    dictionary_ = params->get_string(grib_handle_of_accessor(this), n++);
+    masterDir_  = params->get_name(grib_handle_of_accessor(this), n++);
+    localDir_   = params->get_name(grib_handle_of_accessor(this), n++);
 
     length_ = 0;
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
diff --git a/src/accessor/grib_accessor_class_bufr_extract_area_subsets.cc b/src/accessor/grib_accessor_class_bufr_extract_area_subsets.cc
index e6d9185c8..0ac88d0d0 100644
--- a/src/accessor/grib_accessor_class_bufr_extract_area_subsets.cc
+++ b/src/accessor/grib_accessor_class_bufr_extract_area_subsets.cc
@@ -20,16 +20,16 @@ void grib_accessor_bufr_extract_area_subsets_t::init(const long len, grib_argume
     int n = 0;
 
     length_                       = 0;
-    doExtractSubsets_             = grib_arguments_get_name(h, arg, n++);
-    numberOfSubsets_              = grib_arguments_get_name(h, arg, n++);
-    extractSubsetList_            = grib_arguments_get_name(h, arg, n++);
-    extractAreaWestLongitude_     = grib_arguments_get_name(h, arg, n++);
-    extractAreaEastLongitude_     = grib_arguments_get_name(h, arg, n++);
-    extractAreaNorthLatitude_     = grib_arguments_get_name(h, arg, n++);
-    extractAreaSouthLatitude_     = grib_arguments_get_name(h, arg, n++);
-    extractAreaLongitudeRank_     = grib_arguments_get_name(h, arg, n++);
-    extractAreaLatitudeRank_      = grib_arguments_get_name(h, arg, n++);
-    extractedAreaNumberOfSubsets_ = grib_arguments_get_name(h, arg, n++);
+    doExtractSubsets_             = arg->get_name(h, n++);
+    numberOfSubsets_              = arg->get_name(h, n++);
+    extractSubsetList_            = arg->get_name(h, n++);
+    extractAreaWestLongitude_     = arg->get_name(h, n++);
+    extractAreaEastLongitude_     = arg->get_name(h, n++);
+    extractAreaNorthLatitude_     = arg->get_name(h, n++);
+    extractAreaSouthLatitude_     = arg->get_name(h, n++);
+    extractAreaLongitudeRank_     = arg->get_name(h, n++);
+    extractAreaLatitudeRank_      = arg->get_name(h, n++);
+    extractedAreaNumberOfSubsets_ = arg->get_name(h, n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
 }
diff --git a/src/accessor/grib_accessor_class_bufr_extract_datetime_subsets.cc b/src/accessor/grib_accessor_class_bufr_extract_datetime_subsets.cc
index 9b5df9995..a696ed2b1 100644
--- a/src/accessor/grib_accessor_class_bufr_extract_datetime_subsets.cc
+++ b/src/accessor/grib_accessor_class_bufr_extract_datetime_subsets.cc
@@ -19,9 +19,9 @@ void grib_accessor_bufr_extract_datetime_subsets_t::init(const long len, grib_ar
     int n = 0;
 
     length_            = 0;
-    doExtractSubsets_  = grib_arguments_get_name(grib_handle_of_accessor(this), arg, n++);
-    numberOfSubsets_   = grib_arguments_get_name(grib_handle_of_accessor(this), arg, n++);
-    extractSubsetList_ = grib_arguments_get_name(grib_handle_of_accessor(this), arg, n++);
+    doExtractSubsets_  = arg->get_name(grib_handle_of_accessor(this), n++);
+    numberOfSubsets_   = arg->get_name(grib_handle_of_accessor(this), n++);
+    extractSubsetList_ = arg->get_name(grib_handle_of_accessor(this), n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
 }
diff --git a/src/accessor/grib_accessor_class_bufr_extract_subsets.cc b/src/accessor/grib_accessor_class_bufr_extract_subsets.cc
index afa289026..60ffa3490 100644
--- a/src/accessor/grib_accessor_class_bufr_extract_subsets.cc
+++ b/src/accessor/grib_accessor_class_bufr_extract_subsets.cc
@@ -29,8 +29,8 @@ void grib_accessor_bufr_extract_subsets_t::init(const long len, grib_arguments*
     int n = 0;
 
     length_        = 0;
-    numericValues_ = grib_arguments_get_name(grib_handle_of_accessor(this), arg, n++);
-    pack_          = grib_arguments_get_name(grib_handle_of_accessor(this), arg, n++);
+    numericValues_ = arg->get_name(grib_handle_of_accessor(this), n++);
+    pack_          = arg->get_name(grib_handle_of_accessor(this), n++);
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
 
     numericValuesAccessor_ = NULL;
diff --git a/src/accessor/grib_accessor_class_bufr_simple_thinning.cc b/src/accessor/grib_accessor_class_bufr_simple_thinning.cc
index 42d6641fe..b2a3aa69c 100644
--- a/src/accessor/grib_accessor_class_bufr_simple_thinning.cc
+++ b/src/accessor/grib_accessor_class_bufr_simple_thinning.cc
@@ -20,12 +20,12 @@ void grib_accessor_bufr_simple_thinning_t::init(const long len, grib_arguments*
     int n          = 0;
 
     length_                      = 0;
-    doExtractSubsets_            = grib_arguments_get_name(h, arg, n++);
-    numberOfSubsets_             = grib_arguments_get_name(h, arg, n++);
-    extractSubsetList_           = grib_arguments_get_name(h, arg, n++);
-    simpleThinningStart_         = grib_arguments_get_name(h, arg, n++);
-    simpleThinningMissingRadius_ = grib_arguments_get_name(h, arg, n++);
-    simpleThinningSkip_          = grib_arguments_get_name(h, arg, n++);
+    doExtractSubsets_            = arg->get_name(h, n++);
+    numberOfSubsets_             = arg->get_name(h, n++);
+    extractSubsetList_           = arg->get_name(h, n++);
+    simpleThinningStart_         = arg->get_name(h, n++);
+    simpleThinningMissingRadius_ = arg->get_name(h, n++);
+    simpleThinningSkip_          = arg->get_name(h, n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
 }
diff --git a/src/accessor/grib_accessor_class_bufr_string_values.cc b/src/accessor/grib_accessor_class_bufr_string_values.cc
index e95f43a59..50b963083 100644
--- a/src/accessor/grib_accessor_class_bufr_string_values.cc
+++ b/src/accessor/grib_accessor_class_bufr_string_values.cc
@@ -18,7 +18,7 @@ void grib_accessor_bufr_string_values_t::init(const long len, grib_arguments* ar
 {
     grib_accessor_ascii_t::init(len, args);
     int n             = 0;
-    dataAccessorName_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
+    dataAccessorName_ = args->get_name(grib_handle_of_accessor(this), n++);
     dataAccessor_     = NULL;
     length_           = 0;
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
diff --git a/src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.cc b/src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.cc
index 1b769121a..a6e6dbe3e 100644
--- a/src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.cc
+++ b/src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.cc
@@ -17,7 +17,7 @@ void grib_accessor_bufrdc_expanded_descriptors_t::init(const long len, grib_argu
 {
     grib_accessor_long_t::init(len, args);
     int n                        = 0;
-    expandedDescriptors_         = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
+    expandedDescriptors_         = args->get_name(grib_handle_of_accessor(this), n++);
     expandedDescriptorsAccessor_ = 0;
     length_                      = 0;
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
diff --git a/src/accessor/grib_accessor_class_cf_var_name.cc b/src/accessor/grib_accessor_class_cf_var_name.cc
index 8685e1dfb..072a3ba49 100644
--- a/src/accessor/grib_accessor_class_cf_var_name.cc
+++ b/src/accessor/grib_accessor_class_cf_var_name.cc
@@ -17,7 +17,7 @@ void grib_accessor_cf_var_name_t::init(const long l, grib_arguments* arg)
 {
     grib_accessor_ascii_t::init(l, arg);
     grib_handle* h = grib_handle_of_accessor(this);
-    defaultKey_    = grib_arguments_get_name(h, arg, 0);
+    defaultKey_    = arg->get_name(h, 0);
 }
 
 int grib_accessor_cf_var_name_t::unpack_string(char* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_change_alternative_row_scanning.cc b/src/accessor/grib_accessor_class_change_alternative_row_scanning.cc
index 67bb0eca8..92709f07f 100644
--- a/src/accessor/grib_accessor_class_change_alternative_row_scanning.cc
+++ b/src/accessor/grib_accessor_class_change_alternative_row_scanning.cc
@@ -18,10 +18,10 @@ void grib_accessor_change_alternative_row_scanning_t::init(const long len, grib_
     grib_accessor_gen_t::init(len, args);
     int n = 0;
 
-    values_                 = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    Ni_                     = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    Nj_                     = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    alternativeRowScanning_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
+    values_                 = args->get_name(grib_handle_of_accessor(this), n++);
+    Ni_                     = args->get_name(grib_handle_of_accessor(this), n++);
+    Nj_                     = args->get_name(grib_handle_of_accessor(this), n++);
+    alternativeRowScanning_ = args->get_name(grib_handle_of_accessor(this), n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_change_scanning_direction.cc b/src/accessor/grib_accessor_class_change_scanning_direction.cc
index f85d80674..c6446562e 100644
--- a/src/accessor/grib_accessor_class_change_scanning_direction.cc
+++ b/src/accessor/grib_accessor_class_change_scanning_direction.cc
@@ -19,14 +19,14 @@ void grib_accessor_change_scanning_direction_t::init(const long len, grib_argume
     grib_handle* h = grib_handle_of_accessor(this);
     int n          = 0;
 
-    values_             = grib_arguments_get_name(h, args, n++);
-    Ni_                 = grib_arguments_get_name(h, args, n++);
-    Nj_                 = grib_arguments_get_name(h, args, n++);
-    i_scans_negatively_ = grib_arguments_get_name(h, args, n++);
-    j_scans_positively_ = grib_arguments_get_name(h, args, n++);
-    first_              = grib_arguments_get_name(h, args, n++);
-    last_               = grib_arguments_get_name(h, args, n++);
-    axis_               = grib_arguments_get_name(h, args, n++);
+    values_             = args->get_name(h, n++);
+    Ni_                 = args->get_name(h, n++);
+    Nj_                 = args->get_name(h, n++);
+    i_scans_negatively_ = args->get_name(h, n++);
+    j_scans_positively_ = args->get_name(h, n++);
+    first_              = args->get_name(h, n++);
+    last_               = args->get_name(h, n++);
+    axis_               = args->get_name(h, n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_check_internal_version.cc b/src/accessor/grib_accessor_class_check_internal_version.cc
index 86aec25f3..ef16d6176 100644
--- a/src/accessor/grib_accessor_class_check_internal_version.cc
+++ b/src/accessor/grib_accessor_class_check_internal_version.cc
@@ -25,7 +25,7 @@ void grib_accessor_check_internal_version_t::init(const long l, grib_arguments*
     int err                    = 0;
     long defs_file_version     = 0;
     grib_handle* h             = grib_handle_of_accessor(this);
-    const char* s_defn_version = grib_arguments_get_name(h, args, 0);
+    const char* s_defn_version = args->get_name(h, 0);
     Assert(s_defn_version);
 
     err = grib_get_long_internal(h, s_defn_version, &defs_file_version);
diff --git a/src/accessor/grib_accessor_class_closest_date.cc b/src/accessor/grib_accessor_class_closest_date.cc
index 46db8c1f3..37d8dd001 100644
--- a/src/accessor/grib_accessor_class_closest_date.cc
+++ b/src/accessor/grib_accessor_class_closest_date.cc
@@ -20,15 +20,15 @@ void grib_accessor_closest_date_t::init(const long l, grib_arguments* c)
     grib_handle* h = grib_handle_of_accessor(this);
     int n          = 0;
 
-    dateLocal_    = grib_arguments_get_name(h, c, n++);
-    timeLocal_    = grib_arguments_get_name(h, c, n++);
-    numForecasts_ = grib_arguments_get_name(h, c, n++);
-    year_         = grib_arguments_get_name(h, c, n++);
-    month_        = grib_arguments_get_name(h, c, n++);
-    day_          = grib_arguments_get_name(h, c, n++);
-    hour_         = grib_arguments_get_name(h, c, n++);
-    minute_       = grib_arguments_get_name(h, c, n++);
-    second_       = grib_arguments_get_name(h, c, n++);
+    dateLocal_    = c->get_name(h, n++);
+    timeLocal_    = c->get_name(h, n++);
+    numForecasts_ = c->get_name(h, n++);
+    year_         = c->get_name(h, n++);
+    month_        = c->get_name(h, n++);
+    day_          = c->get_name(h, n++);
+    hour_         = c->get_name(h, n++);
+    minute_       = c->get_name(h, n++);
+    second_       = c->get_name(h, n++);
 
     length_ = 0;
 }
diff --git a/src/accessor/grib_accessor_class_codeflag.cc b/src/accessor/grib_accessor_class_codeflag.cc
index 07435e6c4..bd44d1de1 100644
--- a/src/accessor/grib_accessor_class_codeflag.cc
+++ b/src/accessor/grib_accessor_class_codeflag.cc
@@ -17,7 +17,7 @@ void grib_accessor_codeflag_t::init(const long len, grib_arguments* param)
 {
     grib_accessor_unsigned_t::init(len, param);
     length_    = len;
-    tablename_ = grib_arguments_get_string(grib_handle_of_accessor(this), param, 0);
+    tablename_ = param->get_string(grib_handle_of_accessor(this), 0);
     Assert(length_ >= 0);
 }
 
diff --git a/src/accessor/grib_accessor_class_codetable.cc b/src/accessor/grib_accessor_class_codetable.cc
index af9fce6fd..53f3dcb71 100644
--- a/src/accessor/grib_accessor_class_codetable.cc
+++ b/src/accessor/grib_accessor_class_codetable.cc
@@ -61,19 +61,19 @@ void grib_accessor_codetable_t::init(const long len, grib_arguments* params)
          * its length as an identifier not an integer. This identifier is
          * added to the argument list (at the beginning)
          */
-        new_len = grib_arguments_get_long(hand, params, n++);
+        new_len = params->get_long(hand, n++);
         if (new_len <= 0) {
             grib_context_log(context_, GRIB_LOG_FATAL, "%s: codetable length must be a positive integer", name_);
         }
         nbytes_ = new_len;
     }
 
-    tablename_ = grib_arguments_get_string(hand, params, n++);
+    tablename_ = params->get_string(hand, n++);
     if (tablename_ == NULL) {
         grib_context_log(context_, GRIB_LOG_FATAL, "%s: codetable table is invalid", name_);
     }
-    masterDir_ = grib_arguments_get_name(hand, params, n++); /* can be NULL */
-    localDir_  = grib_arguments_get_name(hand, params, n++); /* can be NULL */
+    masterDir_ = params->get_name(hand, n++); /* can be NULL */
+    localDir_  = params->get_name(hand, n++); /* can be NULL */
 
     /*if (flags_ & GRIB_ACCESSOR_FLAG_STRING_TYPE)
     printf("-------- %s type string (%ld)\n",a->name,flags_ );*/
@@ -97,22 +97,22 @@ void grib_accessor_codetable_t::init(const long len, grib_arguments* params)
             int ret = 0;
             double d;
             char tmp[1024];
-            grib_expression* expression = grib_arguments_get_expression(hand, act->default_value, 0);
-            int type                    = grib_expression_native_type(hand, expression);
+            grib_expression* expression = act->default_value->get_expression(hand, 0);
+            int type                    = expression->native_type(hand);
             switch (type) {
                 case GRIB_TYPE_DOUBLE:
-                    grib_expression_evaluate_double(hand, expression, &d);
+                    expression->evaluate_double(hand, &d);
                     pack_double(&d, &s_len);
                     break;
 
                 case GRIB_TYPE_LONG:
-                    grib_expression_evaluate_long(grib_handle_of_accessor(this), expression, &l);
+                    expression->evaluate_long(grib_handle_of_accessor(this), &l);
                     pack_long(&l, &s_len);
                     break;
 
                 default:
                     s_len = sizeof(tmp);
-                    p     = grib_expression_evaluate_string(grib_handle_of_accessor(this), expression, tmp, &s_len, &ret);
+                    p     = expression->evaluate_string(grib_handle_of_accessor(this), tmp, &s_len, &ret);
                     if (ret != GRIB_SUCCESS) {
                         grib_context_log(context_, GRIB_LOG_FATAL,
                                          "Unable to evaluate %s as string", name_);
@@ -683,22 +683,22 @@ int grib_accessor_codetable_t::pack_string(const char* buffer, size_t* len)
             int ret        = 0;
             double d       = 0;
             char tmp[1024] = {0,};
-            grib_expression* expression = grib_arguments_get_expression(grib_handle_of_accessor(this), act->default_value, 0);
-            int type                    = grib_expression_native_type(grib_handle_of_accessor(this), expression);
+            grib_expression* expression = act->default_value->get_expression(grib_handle_of_accessor(this), 0);
+            int type                    = expression->native_type(grib_handle_of_accessor(this));
             switch (type) {
                 case GRIB_TYPE_DOUBLE:
-                    grib_expression_evaluate_double(grib_handle_of_accessor(this), expression, &d);
+                    expression->evaluate_double(grib_handle_of_accessor(this), &d);
                     pack_double(&d, &s_len);
                     break;
 
                 case GRIB_TYPE_LONG:
-                    grib_expression_evaluate_long(grib_handle_of_accessor(this), expression, &l);
+                    expression->evaluate_long(grib_handle_of_accessor(this), &l);
                     pack_long(&l, &s_len);
                     break;
 
                 default:
                     s_len = sizeof(tmp);
-                    p     = grib_expression_evaluate_string(grib_handle_of_accessor(this), expression, tmp, &s_len, &ret);
+                    p     = expression->evaluate_string(grib_handle_of_accessor(this), tmp, &s_len, &ret);
                     if (ret != GRIB_SUCCESS) {
                         grib_context_log(context_, GRIB_LOG_ERROR,
                                          "%s: Unable to evaluate default value of %s as string expression", __func__, name_);
@@ -735,19 +735,19 @@ int grib_accessor_codetable_t::pack_expression(grib_expression* e)
     size_t len        = 1;
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    if (strcmp(e->cclass->name, "long") == 0) {
-        grib_expression_evaluate_long(hand, e, &lval); /* TODO: check return value */
+    if (strcmp(e->class_name(), "long") == 0) {
+        e->evaluate_long(hand, &lval); /* TODO: check return value */
         // if (hand->context->debug) printf("ECCODES DEBUG grib_accessor_codetable::pack_expression %s %ld\n", name_ ,lval);
         ret = pack_long(&lval, &len);
     }
     else {
         char tmp[1024];
         len  = sizeof(tmp);
-        cval = grib_expression_evaluate_string(hand, e, tmp, &len, &ret);
+        cval = e->evaluate_string(hand, tmp, &len, &ret);
         if (ret != GRIB_SUCCESS) {
             grib_context_log(context_, GRIB_LOG_ERROR,
                              "grib_accessor_codetable.%s: Unable to evaluate string %s to be set in %s",
-                             __func__, grib_expression_get_name(e), name_);
+                             __func__, e->get_name(), name_);
             return ret;
         }
         len = strlen(cval) + 1;
diff --git a/src/accessor/grib_accessor_class_codetable_title.cc b/src/accessor/grib_accessor_class_codetable_title.cc
index 6e247ad1b..480bca7d9 100644
--- a/src/accessor/grib_accessor_class_codetable_title.cc
+++ b/src/accessor/grib_accessor_class_codetable_title.cc
@@ -18,7 +18,7 @@ void grib_accessor_codetable_title_t::init(const long len, grib_arguments* param
 {
     grib_accessor_gen_t::init(len, params);
     int n      = 0;
-    codetable_ = grib_arguments_get_name(grib_handle_of_accessor(this), params, n++);
+    codetable_ = params->get_name(grib_handle_of_accessor(this), n++);
     length_    = 0;
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
diff --git a/src/accessor/grib_accessor_class_codetable_units.cc b/src/accessor/grib_accessor_class_codetable_units.cc
index 279de14f6..120aa885c 100644
--- a/src/accessor/grib_accessor_class_codetable_units.cc
+++ b/src/accessor/grib_accessor_class_codetable_units.cc
@@ -19,7 +19,7 @@ void grib_accessor_codetable_units_t::init(const long len, grib_arguments* param
     grib_accessor_gen_t::init(len, params);
 
     int n      = 0;
-    codetable_ = grib_arguments_get_name(grib_handle_of_accessor(this), params, n++);
+    codetable_ = params->get_name(grib_handle_of_accessor(this), n++);
     length_    = 0;
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
diff --git a/src/accessor/grib_accessor_class_concept.cc b/src/accessor/grib_accessor_class_concept.cc
index 9dd0b71a5..5da376969 100644
--- a/src/accessor/grib_accessor_class_concept.cc
+++ b/src/accessor/grib_accessor_class_concept.cc
@@ -21,8 +21,8 @@ grib_accessor* grib_accessor_concept = &_grib_accessor_concept;
 #define FALSE 0
 #define TRUE  1
 
-/* Note: A fast cut-down version of strcmp which does NOT return -1 */
-/* 0 means input strings are equal and 1 means not equal */
+// Note: A fast cut-down version of strcmp which does NOT return -1
+// 0 means input strings are equal and 1 means not equal
 GRIB_INLINE static int grib_inline_strcmp(const char* a, const char* b)
 {
     if (*a != *b)
@@ -63,20 +63,20 @@ static int grib_get_long_memoize(
     return err;
 }
 
-/* Return 1 (=True) or 0 (=False) */
+// Return 1 (=True) or 0 (=False)
 static int concept_condition_expression_true(
     grib_handle* h, grib_concept_condition* c,
     std::unordered_map<std::string_view, long>& memo)
 {
     long lval;
     long lres      = 0;
-    int ok         = FALSE; /* Boolean */
+    int ok         = FALSE; // Boolean
     int err        = 0;
-    const int type = grib_expression_native_type(h, c->expression);
+    const int type = c->expression->native_type(h);
 
     switch (type) {
         case GRIB_TYPE_LONG:
-            grib_expression_evaluate_long(h, c->expression, &lres);
+            c->expression->evaluate_long(h, &lres);
             // Use memoization for the most common type (integer keys)
             ok = (grib_get_long_memoize(h, c->name, &lval, memo) == GRIB_SUCCESS) &&
                  (lval == lres);
@@ -86,7 +86,7 @@ static int concept_condition_expression_true(
         case GRIB_TYPE_DOUBLE: {
             double dval;
             double dres = 0.0;
-            grib_expression_evaluate_double(h, c->expression, &dres);
+            c->expression->evaluate_double(h, &dres);
             ok = (grib_get_double(h, c->name, &dval) == GRIB_SUCCESS) &&
                  (dval == dres);
             break;
@@ -100,24 +100,24 @@ static int concept_condition_expression_true(
             size_t size = sizeof(tmp);
 
             ok = (grib_get_string(h, c->name, buf, &len) == GRIB_SUCCESS) &&
-                 ((cval = grib_expression_evaluate_string(h, c->expression, tmp, &size, &err)) != NULL) &&
+                 ((cval = c->expression->evaluate_string(h, tmp, &size, &err)) != NULL) &&
                  (err == 0) && (grib_inline_strcmp(buf, cval) == 0);
             break;
         }
 
         default:
-            /* TODO: */
+            // TODO
             break;
     }
     return ok;
 }
 
-/* Return 1 (=True) or 0 (=False) */
+// Return 1 (=True) or 0 (=False)
 static int concept_condition_iarray_true(grib_handle* h, grib_concept_condition* c)
 {
     long* val   = NULL;
     size_t size = 0, i;
-    int ret; /* Boolean */
+    int ret; //Boolean
     int err = 0;
 
     err = grib_get_size(h, c->name, &size);
@@ -143,7 +143,7 @@ static int concept_condition_iarray_true(grib_handle* h, grib_concept_condition*
     return ret;
 }
 
-/* Return 1 (=True) or 0 (=False) */
+// Return 1 (=True) or 0 (=False)
 static int concept_condition_true(
     grib_handle* h, grib_concept_condition* c,
     std::unordered_map<std::string_view, long>& memo)
@@ -158,16 +158,16 @@ static const char* concept_evaluate(grib_accessor* a)
 {
     int match        = 0;
     const char* best = 0;
-    /* const char* prev = 0; */
+    //const char* prev = 0;
     grib_concept_value* c = action_concept_get_concept(a);
     grib_handle* h        = grib_handle_of_accessor(a);
 
     std::unordered_map<std::string_view, long> memo; // See ECC-1905
-    
-    // fprintf(stderr, "DEBUG: concept_evaluate: %s %s\n", name_ , c->name);
+
     while (c) {
+        // printf("DEBUG: %s concept=%s while loop c->name=%s\n", __func__, a->name_, c->name);
         grib_concept_condition* e = c->conditions;
-        int cnt                   = 0;
+        int cnt = 0;
         while (e) {
             if (!concept_condition_true(h, e, memo))
                 break;
@@ -177,15 +177,17 @@ static const char* concept_evaluate(grib_accessor* a)
 
         if (e == NULL) {
             if (cnt >= match) {
-                /* prev  = (cnt > match) ? NULL : best; */
+                // prev  = (cnt > match) ? NULL : best;
                 match = cnt;
                 best  = c->name;
+                // printf("DEBUG: %s concept=%s current best=%s\n", __func__, a->name_, best);
             }
         }
 
         c = c->next;
     }
 
+    // printf("DEBUG: %s concept=%s final best=%s\n", __func__, a->name_, best);
     return best;
 }
 
@@ -201,19 +203,19 @@ static int concept_conditions_expression_apply(grib_handle* h, grib_concept_cond
     Assert(count < 1024);
     values[count].name = e->name;
 
-    values[count].type = grib_expression_native_type(h, e->expression);
+    values[count].type = e->expression->native_type(h);
     switch (values[count].type) {
         case GRIB_TYPE_LONG:
-            grib_expression_evaluate_long(h, e->expression, &lres);
+            e->expression->evaluate_long(h, &lres);
             values[count].long_value = lres;
             break;
         case GRIB_TYPE_DOUBLE:
-            grib_expression_evaluate_double(h, e->expression, &dres);
+            e->expression->evaluate_double(h, &dres);
             values[count].double_value = dres;
             break;
         case GRIB_TYPE_STRING:
             size                       = sizeof(sa->v[count]);
-            values[count].string_value = grib_expression_evaluate_string(h, e->expression, sa->v[count], &size, &err);
+            values[count].string_value = e->expression->evaluate_string(h, sa->v[count], &size, &err);
             break;
         default:
             return GRIB_NOT_IMPLEMENTED;
@@ -238,9 +240,9 @@ static int concept_conditions_apply(grib_handle* h, grib_concept_condition* c, g
 
 static int cmpstringp(const void* p1, const void* p2)
 {
-    /* The actual arguments to this function are "pointers to
-       pointers to char", but strcmp(3) arguments are "pointers
-       to char", hence the following cast plus dereference */
+    // The actual arguments to this function are "pointers to
+    // pointers to char", but strcmp(3) arguments are "pointers
+    // to char", hence the following cast plus dereference */
     return strcmp(*(char* const*)p1, *(char* const*)p2);
 }
 
@@ -278,7 +280,7 @@ static void print_user_friendly_message(grib_handle* h, const char* name, grib_c
     long dummy = 0, editionNumber = 0;
     char centre_s[32] = {0,};
     size_t centre_len = sizeof(centre_s);
-    char* all_concept_vals[MAX_NUM_CONCEPT_VALUES] = {NULL,}; /* sorted array containing concept values */
+    char* all_concept_vals[MAX_NUM_CONCEPT_VALUES] = {NULL,}; // sorted array containing concept values
     grib_concept_value* pCon = concepts;
 
     grib_context_log(h->context, GRIB_LOG_ERROR, "concept: no match for %s=%s", act->name, name);
@@ -398,12 +400,20 @@ static int grib_concept_apply(grib_accessor* a, const char* name)
                         }
                     }
                     else if (STR_EQUAL(values[i].name, "sourceSinkChemicalPhysicalProcess")) {
-                    grib_context_log(h->context, GRIB_LOG_DEBUG, "%s: Switch to chemical src/sink", __func__);
+                        grib_context_log(h->context, GRIB_LOG_DEBUG, "%s: Switch to chemical src/sink", __func__);
                         if (grib_set_long(h, "is_chemical_srcsink", 1) == GRIB_SUCCESS) {
                             resubmit = true;
                             grib_set_values(h, &values[i], 1);
                         }
                     }
+                    else if (STR_EQUAL(values[i].name, "probabilityType")) {
+                        grib_context_log(h->context, GRIB_LOG_DEBUG, "%s: Switch to probability forecasts", __func__);
+                        // TODO(masn): Add a new key e.g. is_probability_forecast
+                        if (grib_set_long(h, "productDefinitionTemplateNumber", 5) == GRIB_SUCCESS) {
+                            resubmit = true;
+                            grib_set_values(h, &values[i], 1);
+                        }
+                    }
                 }
             }
 
@@ -464,13 +474,11 @@ int grib_accessor_concept_t::pack_long(const long* val, size_t* len)
 
 int grib_accessor_concept_t::unpack_double(double* val, size_t* len)
 {
-    /*
-     * If we want to have a condition which contains tests for paramId as well
-     * as a floating point key, then need to be able to evaluate paramId as a
-     * double. E.g.
-     *   if (referenceValue > 0 && paramId == 129)
-     */
-    /*return GRIB_NOT_IMPLEMENTED*/
+    //  If we want to have a condition which contains tests for paramId as well
+    //  as a floating point key, then need to be able to evaluate paramId as a
+    //  double. E.g.
+    //     if (referenceValue > 0 && paramId == 129)
+    // return GRIB_NOT_IMPLEMENTED
     int ret = 0;
     if (flags_ & GRIB_ACCESSOR_FLAG_LONG_TYPE) {
         long lval = 0;
diff --git a/src/accessor/grib_accessor_class_count_missing.cc b/src/accessor/grib_accessor_class_count_missing.cc
index 372f6540d..6c0792c2e 100644
--- a/src/accessor/grib_accessor_class_count_missing.cc
+++ b/src/accessor/grib_accessor_class_count_missing.cc
@@ -39,10 +39,10 @@ void grib_accessor_count_missing_t::init(const long len, grib_arguments* arg)
     grib_handle* h = grib_handle_of_accessor(this);
     length_        = 0;
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    bitmap_                     = grib_arguments_get_name(h, arg, n++);
-    unusedBitsInBitmap_         = grib_arguments_get_name(h, arg, n++);
-    numberOfDataPoints_         = grib_arguments_get_name(h, arg, n++);
-    missingValueManagementUsed_ = grib_arguments_get_name(h, arg, n++); /* Can be NULL */
+    bitmap_                     = arg->get_name(h, n++);
+    unusedBitsInBitmap_         = arg->get_name(h, n++);
+    numberOfDataPoints_         = arg->get_name(h, n++);
+    missingValueManagementUsed_ = arg->get_name(h, n++); /* Can be NULL */
 }
 
 static const int used[] = { 0, 1, 3, 7, 15, 31, 63, 127, 255 };
diff --git a/src/accessor/grib_accessor_class_data_apply_bitmap.cc b/src/accessor/grib_accessor_class_data_apply_bitmap.cc
index 72a5cc148..b83c9a7f4 100644
--- a/src/accessor/grib_accessor_class_data_apply_bitmap.cc
+++ b/src/accessor/grib_accessor_class_data_apply_bitmap.cc
@@ -18,12 +18,12 @@ void grib_accessor_data_apply_bitmap_t::init(const long v, grib_arguments* args)
     grib_accessor_gen_t::init(v, args);
     int n = 0;
 
-    coded_values_          = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    bitmap_                = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    missing_value_         = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    binary_scale_factor_   = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    number_of_data_points_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    number_of_values_      = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
+    coded_values_          = args->get_name(grib_handle_of_accessor(this), n++);
+    bitmap_                = args->get_name(grib_handle_of_accessor(this), n++);
+    missing_value_         = args->get_name(grib_handle_of_accessor(this), n++);
+    binary_scale_factor_   = args->get_name(grib_handle_of_accessor(this), n++);
+    number_of_data_points_ = args->get_name(grib_handle_of_accessor(this), n++);
+    number_of_values_      = args->get_name(grib_handle_of_accessor(this), n++);
 
     length_ = 0;
 }
@@ -231,7 +231,7 @@ int grib_accessor_data_apply_bitmap_t::pack_double(const double* val, size_t* le
     return err;
 }
 
-template <typename T> 
+template <typename T>
 int grib_accessor_data_apply_bitmap_t::unpack(T* val, size_t* len)
 {
     static_assert(std::is_floating_point<T>::value, "Requires floating point numbers");
diff --git a/src/accessor/grib_accessor_class_data_apply_boustrophedonic.cc b/src/accessor/grib_accessor_class_data_apply_boustrophedonic.cc
index a711969f4..5a4588247 100644
--- a/src/accessor/grib_accessor_class_data_apply_boustrophedonic.cc
+++ b/src/accessor/grib_accessor_class_data_apply_boustrophedonic.cc
@@ -18,11 +18,11 @@ void grib_accessor_data_apply_boustrophedonic_t::init(const long v, grib_argumen
     grib_accessor_gen_t::init(v, args);
 
     int n            = 0;
-    values_          = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    numberOfRows_    = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    numberOfColumns_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    numberOfPoints_  = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    pl_              = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
+    values_          = args->get_name(grib_handle_of_accessor(this), n++);
+    numberOfRows_    = args->get_name(grib_handle_of_accessor(this), n++);
+    numberOfColumns_ = args->get_name(grib_handle_of_accessor(this), n++);
+    numberOfPoints_  = args->get_name(grib_handle_of_accessor(this), n++);
+    pl_              = args->get_name(grib_handle_of_accessor(this), n++);
 
     length_ = 0;
 }
diff --git a/src/accessor/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc b/src/accessor/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc
index a0783f98b..cdc717bd6 100644
--- a/src/accessor/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc
+++ b/src/accessor/grib_accessor_class_data_apply_boustrophedonic_bitmap.cc
@@ -19,14 +19,14 @@ void grib_accessor_data_apply_boustrophedonic_bitmap_t::init(const long v, grib_
     int n           = 0;
     grib_handle* gh = grib_handle_of_accessor(this);
 
-    coded_values_        = grib_arguments_get_name(gh, args, n++);
-    bitmap_              = grib_arguments_get_name(gh, args, n++);
-    missing_value_       = grib_arguments_get_name(gh, args, n++);
-    binary_scale_factor_ = grib_arguments_get_name(gh, args, n++);
+    coded_values_        = args->get_name(gh, n++);
+    bitmap_              = args->get_name(gh, n++);
+    missing_value_       = args->get_name(gh, n++);
+    binary_scale_factor_ = args->get_name(gh, n++);
 
-    numberOfRows_    = grib_arguments_get_name(gh, args, n++);
-    numberOfColumns_ = grib_arguments_get_name(gh, args, n++);
-    numberOfPoints_  = grib_arguments_get_name(gh, args, n++);
+    numberOfRows_    = args->get_name(gh, n++);
+    numberOfColumns_ = args->get_name(gh, n++);
+    numberOfPoints_  = args->get_name(gh, n++);
 
     length_ = 0;
 }
diff --git a/src/accessor/grib_accessor_class_data_ccsds_packing.cc b/src/accessor/grib_accessor_class_data_ccsds_packing.cc
index 99fbd2dc3..01b826343 100644
--- a/src/accessor/grib_accessor_class_data_ccsds_packing.cc
+++ b/src/accessor/grib_accessor_class_data_ccsds_packing.cc
@@ -25,16 +25,16 @@ void grib_accessor_data_ccsds_packing_t::init(const long v, grib_arguments* args
     grib_accessor_values_t::init(v, args);
 
     grib_handle* h           = grib_handle_of_accessor(this);
-    number_of_values_        = grib_arguments_get_name(h, args, carg_++);
-    reference_value_         = grib_arguments_get_name(h, args, carg_++);
-    binary_scale_factor_     = grib_arguments_get_name(h, args, carg_++);
-    decimal_scale_factor_    = grib_arguments_get_name(h, args, carg_++);
-    optimize_scaling_factor_ = grib_arguments_get_name(h, args, carg_++);
-    bits_per_value_          = grib_arguments_get_name(h, args, carg_++);
-    number_of_data_points_   = grib_arguments_get_name(h, args, carg_++);
-    ccsds_flags_             = grib_arguments_get_name(h, args, carg_++);
-    ccsds_block_size_        = grib_arguments_get_name(h, args, carg_++);
-    ccsds_rsi_               = grib_arguments_get_name(h, args, carg_++);
+    number_of_values_        = args->get_name(h, carg_++);
+    reference_value_         = args->get_name(h, carg_++);
+    binary_scale_factor_     = args->get_name(h, carg_++);
+    decimal_scale_factor_    = args->get_name(h, carg_++);
+    optimize_scaling_factor_ = args->get_name(h, carg_++);
+    bits_per_value_          = args->get_name(h, carg_++);
+    number_of_data_points_   = args->get_name(h, carg_++);
+    ccsds_flags_             = args->get_name(h, carg_++);
+    ccsds_block_size_        = args->get_name(h, carg_++);
+    ccsds_rsi_               = args->get_name(h, carg_++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
 }
diff --git a/src/accessor/grib_accessor_class_data_complex_packing.cc b/src/accessor/grib_accessor_class_data_complex_packing.cc
index 1b33fef30..b48b6179c 100644
--- a/src/accessor/grib_accessor_class_data_complex_packing.cc
+++ b/src/accessor/grib_accessor_class_data_complex_packing.cc
@@ -18,16 +18,16 @@ void grib_accessor_data_complex_packing_t::init(const long v, grib_arguments* ar
     grib_accessor_data_simple_packing_t::init(v, args);
     grib_handle* gh = grib_handle_of_accessor(this);
 
-    GRIBEX_sh_bug_present_  = grib_arguments_get_name(gh, args, carg_++);
-    ieee_floats_            = grib_arguments_get_name(gh, args, carg_++);
-    laplacianOperatorIsSet_ = grib_arguments_get_name(gh, args, carg_++);
-    laplacianOperator_      = grib_arguments_get_name(gh, args, carg_++);
-    sub_j_                  = grib_arguments_get_name(gh, args, carg_++);
-    sub_k_                  = grib_arguments_get_name(gh, args, carg_++);
-    sub_m_                  = grib_arguments_get_name(gh, args, carg_++);
-    pen_j_                  = grib_arguments_get_name(gh, args, carg_++);
-    pen_k_                  = grib_arguments_get_name(gh, args, carg_++);
-    pen_m_                  = grib_arguments_get_name(gh, args, carg_++);
+    GRIBEX_sh_bug_present_  = args->get_name(gh, carg_++);
+    ieee_floats_            = args->get_name(gh, carg_++);
+    laplacianOperatorIsSet_ = args->get_name(gh, carg_++);
+    laplacianOperator_      = args->get_name(gh, carg_++);
+    sub_j_                  = args->get_name(gh, carg_++);
+    sub_k_                  = args->get_name(gh, carg_++);
+    sub_m_                  = args->get_name(gh, carg_++);
+    pen_j_                  = args->get_name(gh, carg_++);
+    pen_k_                  = args->get_name(gh, carg_++);
+    pen_m_                  = args->get_name(gh, carg_++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
 }
diff --git a/src/accessor/grib_accessor_class_data_dummy_field.cc b/src/accessor/grib_accessor_class_data_dummy_field.cc
index 590fd9138..ee6b6a380 100644
--- a/src/accessor/grib_accessor_class_data_dummy_field.cc
+++ b/src/accessor/grib_accessor_class_data_dummy_field.cc
@@ -16,9 +16,9 @@ grib_accessor* grib_accessor_data_dummy_field = &_grib_accessor_data_dummy_field
 void grib_accessor_data_dummy_field_t::init(const long v, grib_arguments* args)
 {
     grib_accessor_data_g1simple_packing_t::init(v, args);
-    missing_value_  = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
-    numberOfPoints_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
-    bitmap_         = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
+    missing_value_  = args->get_name(grib_handle_of_accessor(this), carg_++);
+    numberOfPoints_ = args->get_name(grib_handle_of_accessor(this), carg_++);
+    bitmap_         = args->get_name(grib_handle_of_accessor(this), carg_++);
 }
 
 int grib_accessor_data_dummy_field_t::unpack_double(double* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_data_g1complex_packing.cc b/src/accessor/grib_accessor_class_data_g1complex_packing.cc
index c7795e5f1..7f0deff36 100644
--- a/src/accessor/grib_accessor_class_data_g1complex_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g1complex_packing.cc
@@ -16,11 +16,11 @@ grib_accessor* grib_accessor_data_g1complex_packing = &_grib_accessor_data_g1com
 void grib_accessor_data_g1complex_packing_t::init(const long v, grib_arguments* args)
 {
     grib_accessor_data_complex_packing_t::init(v, args);
-    half_byte_    = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
-    N_            = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
-    packingType_  = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
-    ieee_packing_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
-    precision_    = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
+    half_byte_    = args->get_name(grib_handle_of_accessor(this), carg_++);
+    N_            = args->get_name(grib_handle_of_accessor(this), carg_++);
+    packingType_  = args->get_name(grib_handle_of_accessor(this), carg_++);
+    ieee_packing_ = args->get_name(grib_handle_of_accessor(this), carg_++);
+    precision_    = args->get_name(grib_handle_of_accessor(this), carg_++);
     edition_      = 1;
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
 }
diff --git a/src/accessor/grib_accessor_class_data_g1second_order_constant_width_packing.cc b/src/accessor/grib_accessor_class_data_g1second_order_constant_width_packing.cc
index 0d7cd7e45..91ea14f52 100644
--- a/src/accessor/grib_accessor_class_data_g1second_order_constant_width_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g1second_order_constant_width_packing.cc
@@ -19,22 +19,22 @@ void grib_accessor_data_g1second_order_constant_width_packing_t::init(const long
     grib_accessor_data_simple_packing_t::init(v, args);
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    half_byte_                       = grib_arguments_get_name(hand, args, carg_++);
-    packingType_                     = grib_arguments_get_name(hand, args, carg_++);
-    ieee_packing_                    = grib_arguments_get_name(hand, args, carg_++);
-    precision_                       = grib_arguments_get_name(hand, args, carg_++);
-    widthOfFirstOrderValues_         = grib_arguments_get_name(hand, args, carg_++);
-    N1_                              = grib_arguments_get_name(hand, args, carg_++);
-    N2_                              = grib_arguments_get_name(hand, args, carg_++);
-    numberOfGroups_                  = grib_arguments_get_name(hand, args, carg_++);
-    numberOfSecondOrderPackedValues_ = grib_arguments_get_name(hand, args, carg_++);
-    extraValues_                     = grib_arguments_get_name(hand, args, carg_++);
-    Ni_                              = grib_arguments_get_name(hand, args, carg_++);
-    Nj_                              = grib_arguments_get_name(hand, args, carg_++);
-    pl_                              = grib_arguments_get_name(hand, args, carg_++);
-    jPointsAreConsecutive_           = grib_arguments_get_name(hand, args, carg_++);
-    bitmap_                          = grib_arguments_get_name(hand, args, carg_++);
-    groupWidth_                      = grib_arguments_get_name(hand, args, carg_++);
+    half_byte_                       = args->get_name(hand, carg_++);
+    packingType_                     = args->get_name(hand, carg_++);
+    ieee_packing_                    = args->get_name(hand, carg_++);
+    precision_                       = args->get_name(hand, carg_++);
+    widthOfFirstOrderValues_         = args->get_name(hand, carg_++);
+    N1_                              = args->get_name(hand, carg_++);
+    N2_                              = args->get_name(hand, carg_++);
+    numberOfGroups_                  = args->get_name(hand, carg_++);
+    numberOfSecondOrderPackedValues_ = args->get_name(hand, carg_++);
+    extraValues_                     = args->get_name(hand, carg_++);
+    Ni_                              = args->get_name(hand, carg_++);
+    Nj_                              = args->get_name(hand, carg_++);
+    pl_                              = args->get_name(hand, carg_++);
+    jPointsAreConsecutive_           = args->get_name(hand, carg_++);
+    bitmap_                          = args->get_name(hand, carg_++);
+    groupWidth_                      = args->get_name(hand, carg_++);
     edition_                         = 1;
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
 }
diff --git a/src/accessor/grib_accessor_class_data_g1second_order_general_extended_packing.cc b/src/accessor/grib_accessor_class_data_g1second_order_general_extended_packing.cc
index 2ee15e425..eab5bdfcf 100644
--- a/src/accessor/grib_accessor_class_data_g1second_order_general_extended_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g1second_order_general_extended_packing.cc
@@ -58,28 +58,28 @@ void grib_accessor_data_g1second_order_general_extended_packing_t::init(const lo
     grib_accessor_data_simple_packing_t::init(v, args);
     grib_handle* handle = grib_handle_of_accessor(this);
 
-    half_byte_                       = grib_arguments_get_name(handle, args, carg_++);
-    packingType_                     = grib_arguments_get_name(handle, args, carg_++);
-    ieee_packing_                    = grib_arguments_get_name(handle, args, carg_++);
-    precision_                       = grib_arguments_get_name(handle, args, carg_++);
-    widthOfFirstOrderValues_         = grib_arguments_get_name(handle, args, carg_++);
-    firstOrderValues_                = grib_arguments_get_name(handle, args, carg_++);
-    N1_                              = grib_arguments_get_name(handle, args, carg_++);
-    N2_                              = grib_arguments_get_name(handle, args, carg_++);
-    numberOfGroups_                  = grib_arguments_get_name(handle, args, carg_++);
-    codedNumberOfGroups_             = grib_arguments_get_name(handle, args, carg_++);
-    numberOfSecondOrderPackedValues_ = grib_arguments_get_name(handle, args, carg_++);
-    extraValues_                     = grib_arguments_get_name(handle, args, carg_++);
-    groupWidths_                     = grib_arguments_get_name(handle, args, carg_++);
-    widthOfWidths_                   = grib_arguments_get_name(handle, args, carg_++);
-    groupLengths_                    = grib_arguments_get_name(handle, args, carg_++);
-    widthOfLengths_                  = grib_arguments_get_name(handle, args, carg_++);
-    NL_                              = grib_arguments_get_name(handle, args, carg_++);
-    SPD_                             = grib_arguments_get_name(handle, args, carg_++);
-    widthOfSPD_                      = grib_arguments_get_name(handle, args, carg_++);
-    orderOfSPD_                      = grib_arguments_get_name(handle, args, carg_++);
-    numberOfPoints_                  = grib_arguments_get_name(handle, args, carg_++);
-    dataFlag_                        = grib_arguments_get_name(handle, args, carg_++);
+    half_byte_                       = args->get_name(handle, carg_++);
+    packingType_                     = args->get_name(handle, carg_++);
+    ieee_packing_                    = args->get_name(handle, carg_++);
+    precision_                       = args->get_name(handle, carg_++);
+    widthOfFirstOrderValues_         = args->get_name(handle, carg_++);
+    firstOrderValues_                = args->get_name(handle, carg_++);
+    N1_                              = args->get_name(handle, carg_++);
+    N2_                              = args->get_name(handle, carg_++);
+    numberOfGroups_                  = args->get_name(handle, carg_++);
+    codedNumberOfGroups_             = args->get_name(handle, carg_++);
+    numberOfSecondOrderPackedValues_ = args->get_name(handle, carg_++);
+    extraValues_                     = args->get_name(handle, carg_++);
+    groupWidths_                     = args->get_name(handle, carg_++);
+    widthOfWidths_                   = args->get_name(handle, carg_++);
+    groupLengths_                    = args->get_name(handle, carg_++);
+    widthOfLengths_                  = args->get_name(handle, carg_++);
+    NL_                              = args->get_name(handle, carg_++);
+    SPD_                             = args->get_name(handle, carg_++);
+    widthOfSPD_                      = args->get_name(handle, carg_++);
+    orderOfSPD_                      = args->get_name(handle, carg_++);
+    numberOfPoints_                  = args->get_name(handle, carg_++);
+    dataFlag_                        = args->get_name(handle, carg_++);
     edition_                         = 1;
     dirty_                           = 1;
     dvalues_                         = NULL;
@@ -584,8 +584,6 @@ int grib_accessor_data_g1second_order_general_extended_packing_t::pack_double(co
     grib_handle* handle          = grib_handle_of_accessor(this);
     long optimize_scaling_factor = 0;
 
-    double_dirty_ = 1;
-
     numberOfValues = *len;
 
     min = max = val[0];
@@ -606,6 +604,9 @@ int grib_accessor_data_g1second_order_general_extended_packing_t::pack_double(co
     if ((ret = grib_get_long_internal(handle, optimize_scaling_factor_, &optimize_scaling_factor)) != GRIB_SUCCESS)
         return ret;
 
+    // ECC-1986: Make sure we set the dirty flag after calling get_bits_per_value
+    double_dirty_ = 1;
+
     if (optimize_scaling_factor) {
         const int compat_gribex = handle->context->gribex_mode_on && edition_ == 1;
         const int compat_32bit  = 1;
diff --git a/src/accessor/grib_accessor_class_data_g1second_order_general_packing.cc b/src/accessor/grib_accessor_class_data_g1second_order_general_packing.cc
index ac9622b64..89a95529e 100644
--- a/src/accessor/grib_accessor_class_data_g1second_order_general_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g1second_order_general_packing.cc
@@ -18,22 +18,22 @@ void grib_accessor_data_g1second_order_general_packing_t::init(const long v, gri
     grib_accessor_data_simple_packing_t::init(v, args);
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    half_byte_                       = grib_arguments_get_name(hand, args, carg_++);
-    packingType_                     = grib_arguments_get_name(hand, args, carg_++);
-    ieee_packing_                    = grib_arguments_get_name(hand, args, carg_++);
-    precision_                       = grib_arguments_get_name(hand, args, carg_++);
-    widthOfFirstOrderValues_         = grib_arguments_get_name(hand, args, carg_++);
-    N1_                              = grib_arguments_get_name(hand, args, carg_++);
-    N2_                              = grib_arguments_get_name(hand, args, carg_++);
-    numberOfGroups_                  = grib_arguments_get_name(hand, args, carg_++);
-    numberOfSecondOrderPackedValues_ = grib_arguments_get_name(hand, args, carg_++);
-    extraValues_                     = grib_arguments_get_name(hand, args, carg_++);
-    Ni_                              = grib_arguments_get_name(hand, args, carg_++);
-    Nj_                              = grib_arguments_get_name(hand, args, carg_++);
-    pl_                              = grib_arguments_get_name(hand, args, carg_++);
-    jPointsAreConsecutive_           = grib_arguments_get_name(hand, args, carg_++);
-    bitmap_                          = grib_arguments_get_name(hand, args, carg_++);
-    groupWidths_                     = grib_arguments_get_name(hand, args, carg_++);
+    half_byte_                       = args->get_name(hand, carg_++);
+    packingType_                     = args->get_name(hand, carg_++);
+    ieee_packing_                    = args->get_name(hand, carg_++);
+    precision_                       = args->get_name(hand, carg_++);
+    widthOfFirstOrderValues_         = args->get_name(hand, carg_++);
+    N1_                              = args->get_name(hand, carg_++);
+    N2_                              = args->get_name(hand, carg_++);
+    numberOfGroups_                  = args->get_name(hand, carg_++);
+    numberOfSecondOrderPackedValues_ = args->get_name(hand, carg_++);
+    extraValues_                     = args->get_name(hand, carg_++);
+    Ni_                              = args->get_name(hand, carg_++);
+    Nj_                              = args->get_name(hand, carg_++);
+    pl_                              = args->get_name(hand, carg_++);
+    jPointsAreConsecutive_           = args->get_name(hand, carg_++);
+    bitmap_                          = args->get_name(hand, carg_++);
+    groupWidths_                     = args->get_name(hand, carg_++);
     edition_                         = 1;
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
 }
diff --git a/src/accessor/grib_accessor_class_data_g1second_order_row_by_row_packing.cc b/src/accessor/grib_accessor_class_data_g1second_order_row_by_row_packing.cc
index 49c8550c2..b749f58fa 100644
--- a/src/accessor/grib_accessor_class_data_g1second_order_row_by_row_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g1second_order_row_by_row_packing.cc
@@ -18,22 +18,22 @@ void grib_accessor_data_g1second_order_row_by_row_packing_t::init(const long v,
     grib_accessor_data_simple_packing_t::init(v, args);
     grib_handle* gh = grib_handle_of_accessor(this);
 
-    half_byte_                       = grib_arguments_get_name(gh, args, carg_++);
-    packingType_                     = grib_arguments_get_name(gh, args, carg_++);
-    ieee_packing_                    = grib_arguments_get_name(gh, args, carg_++);
-    precision_                       = grib_arguments_get_name(gh, args, carg_++);
-    widthOfFirstOrderValues_         = grib_arguments_get_name(gh, args, carg_++);
-    N1_                              = grib_arguments_get_name(gh, args, carg_++);
-    N2_                              = grib_arguments_get_name(gh, args, carg_++);
-    numberOfGroups_                  = grib_arguments_get_name(gh, args, carg_++);
-    numberOfSecondOrderPackedValues_ = grib_arguments_get_name(gh, args, carg_++);
-    extraValues_                     = grib_arguments_get_name(gh, args, carg_++);
-    Ni_                              = grib_arguments_get_name(gh, args, carg_++);
-    Nj_                              = grib_arguments_get_name(gh, args, carg_++);
-    pl_                              = grib_arguments_get_name(gh, args, carg_++);
-    jPointsAreConsecutive_           = grib_arguments_get_name(gh, args, carg_++);
-    groupWidths_                     = grib_arguments_get_name(gh, args, carg_++);
-    bitmap_                          = grib_arguments_get_name(gh, args, carg_++);
+    half_byte_                       = args->get_name(gh, carg_++);
+    packingType_                     = args->get_name(gh, carg_++);
+    ieee_packing_                    = args->get_name(gh, carg_++);
+    precision_                       = args->get_name(gh, carg_++);
+    widthOfFirstOrderValues_         = args->get_name(gh, carg_++);
+    N1_                              = args->get_name(gh, carg_++);
+    N2_                              = args->get_name(gh, carg_++);
+    numberOfGroups_                  = args->get_name(gh, carg_++);
+    numberOfSecondOrderPackedValues_ = args->get_name(gh, carg_++);
+    extraValues_                     = args->get_name(gh, carg_++);
+    Ni_                              = args->get_name(gh, carg_++);
+    Nj_                              = args->get_name(gh, carg_++);
+    pl_                              = args->get_name(gh, carg_++);
+    jPointsAreConsecutive_           = args->get_name(gh, carg_++);
+    groupWidths_                     = args->get_name(gh, carg_++);
+    bitmap_                          = args->get_name(gh, carg_++);
     edition_                         = 1;
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
 }
diff --git a/src/accessor/grib_accessor_class_data_g1secondary_bitmap.cc b/src/accessor/grib_accessor_class_data_g1secondary_bitmap.cc
index 289c403ca..7bd009775 100644
--- a/src/accessor/grib_accessor_class_data_g1secondary_bitmap.cc
+++ b/src/accessor/grib_accessor_class_data_g1secondary_bitmap.cc
@@ -16,7 +16,7 @@ grib_accessor* grib_accessor_data_g1secondary_bitmap = &_grib_accessor_data_g1se
 void grib_accessor_data_g1secondary_bitmap_t::init(const long v, grib_arguments* args)
 {
     grib_accessor_data_secondary_bitmap_t::init(v, args);
-    number_of_ones_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, 4);
+    number_of_ones_ = args->get_name(grib_handle_of_accessor(this), 4);
 }
 
 int grib_accessor_data_g1secondary_bitmap_t::value_count(long* count)
diff --git a/src/accessor/grib_accessor_class_data_g1simple_packing.cc b/src/accessor/grib_accessor_class_data_g1simple_packing.cc
index 2f0b64134..4ebc9ca12 100644
--- a/src/accessor/grib_accessor_class_data_g1simple_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g1simple_packing.cc
@@ -18,10 +18,10 @@ void grib_accessor_data_g1simple_packing_t::init(const long v, grib_arguments* a
 {
     grib_accessor_data_simple_packing_t::init(v, args);
 
-    half_byte_    = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
-    packingType_  = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
-    ieee_packing_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
-    precision_    = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
+    half_byte_    = args->get_name(grib_handle_of_accessor(this), carg_++);
+    packingType_  = args->get_name(grib_handle_of_accessor(this), carg_++);
+    ieee_packing_ = args->get_name(grib_handle_of_accessor(this), carg_++);
+    precision_    = args->get_name(grib_handle_of_accessor(this), carg_++);
     edition_      = 1;
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
 }
diff --git a/src/accessor/grib_accessor_class_data_g22order_packing.cc b/src/accessor/grib_accessor_class_data_g22order_packing.cc
index bd1c2abd1..c6d50bbae 100644
--- a/src/accessor/grib_accessor_class_data_g22order_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g22order_packing.cc
@@ -18,28 +18,28 @@ void grib_accessor_data_g22order_packing_t::init(const long v, grib_arguments* a
     grib_accessor_values_t::init(v, args);
     grib_handle* gh = grib_handle_of_accessor(this);
 
-    numberOfValues_        = grib_arguments_get_name(gh, args, carg_++);
-    bits_per_value_        = grib_arguments_get_name(gh, args, carg_++);
-    reference_value_       = grib_arguments_get_name(gh, args, carg_++);
-    binary_scale_factor_   = grib_arguments_get_name(gh, args, carg_++);
-    decimal_scale_factor_  = grib_arguments_get_name(gh, args, carg_++);
-    optimize_scale_factor_ = grib_arguments_get_name(gh, args, carg_++);
+    numberOfValues_        = args->get_name(gh, carg_++);
+    bits_per_value_        = args->get_name(gh, carg_++);
+    reference_value_       = args->get_name(gh, carg_++);
+    binary_scale_factor_   = args->get_name(gh, carg_++);
+    decimal_scale_factor_  = args->get_name(gh, carg_++);
+    optimize_scale_factor_ = args->get_name(gh, carg_++);
 
-    typeOfOriginalFieldValues_                = grib_arguments_get_name(gh, args, carg_++);
-    groupSplittingMethodUsed_                 = grib_arguments_get_name(gh, args, carg_++);
-    missingValueManagementUsed_               = grib_arguments_get_name(gh, args, carg_++);
-    primaryMissingValueSubstitute_            = grib_arguments_get_name(gh, args, carg_++);
-    secondaryMissingValueSubstitute_          = grib_arguments_get_name(gh, args, carg_++);
-    numberOfGroupsOfDataValues_               = grib_arguments_get_name(gh, args, carg_++);
-    referenceForGroupWidths_                  = grib_arguments_get_name(gh, args, carg_++);
-    numberOfBitsUsedForTheGroupWidths_        = grib_arguments_get_name(gh, args, carg_++);
-    referenceForGroupLengths_                 = grib_arguments_get_name(gh, args, carg_++);
-    lengthIncrementForTheGroupLengths_        = grib_arguments_get_name(gh, args, carg_++);
-    trueLengthOfLastGroup_                    = grib_arguments_get_name(gh, args, carg_++);
-    numberOfBitsUsedForTheScaledGroupLengths_ = grib_arguments_get_name(gh, args, carg_++);
+    typeOfOriginalFieldValues_                = args->get_name(gh, carg_++);
+    groupSplittingMethodUsed_                 = args->get_name(gh, carg_++);
+    missingValueManagementUsed_               = args->get_name(gh, carg_++);
+    primaryMissingValueSubstitute_            = args->get_name(gh, carg_++);
+    secondaryMissingValueSubstitute_          = args->get_name(gh, carg_++);
+    numberOfGroupsOfDataValues_               = args->get_name(gh, carg_++);
+    referenceForGroupWidths_                  = args->get_name(gh, carg_++);
+    numberOfBitsUsedForTheGroupWidths_        = args->get_name(gh, carg_++);
+    referenceForGroupLengths_                 = args->get_name(gh, carg_++);
+    lengthIncrementForTheGroupLengths_        = args->get_name(gh, carg_++);
+    trueLengthOfLastGroup_                    = args->get_name(gh, carg_++);
+    numberOfBitsUsedForTheScaledGroupLengths_ = args->get_name(gh, carg_++);
 
-    orderOfSpatialDifferencing_     = grib_arguments_get_name(gh, args, carg_++);
-    numberOfOctetsExtraDescriptors_ = grib_arguments_get_name(gh, args, carg_++);
+    orderOfSpatialDifferencing_     = args->get_name(gh, carg_++);
+    numberOfOctetsExtraDescriptors_ = args->get_name(gh, carg_++);
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
 }
 
@@ -808,6 +808,13 @@ int grib_accessor_data_g22order_packing_t::pack_double(const double* val, size_t
 
     if ((err = grib_get_long_internal(gh, bits_per_value_, &bits_per_value)) != GRIB_SUCCESS)
         return err;
+
+    // ECC-1968: For bits_per_value > 23, the complex packing algorithm may use more than 25 bits per value.
+    // However, this exceeds the maximum number of bits for the packing algorithm.
+    if (bits_per_value > 23) {
+        bits_per_value = 23;
+    }
+
     if ((err = grib_get_long_internal(gh, decimal_scale_factor_, &decimal_scale_factor)) != GRIB_SUCCESS)
         return err;
 
@@ -1463,7 +1470,7 @@ template <typename T>
 int grib_accessor_data_g22order_packing_t::unpack(T* val, size_t* len)
 {
     static_assert(std::is_floating_point<T>::value, "Requires floating points numbers");
-    grib_handle* gh         = grib_handle_of_accessor(this);
+    grib_handle* gh = grib_handle_of_accessor(this);
 
     size_t i                  = 0;
     size_t j                  = 0;
diff --git a/src/accessor/grib_accessor_class_data_g2bifourier_packing.cc b/src/accessor/grib_accessor_class_data_g2bifourier_packing.cc
index 0126e83e8..eee26fb16 100644
--- a/src/accessor/grib_accessor_class_data_g2bifourier_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g2bifourier_packing.cc
@@ -20,19 +20,19 @@ void grib_accessor_data_g2bifourier_packing_t::init(const long v, grib_arguments
     grib_accessor_data_simple_packing_t::init(v, args);
     grib_handle* gh = grib_handle_of_accessor(this);
 
-    ieee_floats_                         = grib_arguments_get_name(gh, args, carg_++);
-    laplacianOperatorIsSet_              = grib_arguments_get_name(gh, args, carg_++);
-    laplacianOperator_                   = grib_arguments_get_name(gh, args, carg_++);
-    biFourierTruncationType_             = grib_arguments_get_name(gh, args, carg_++);
-    sub_i_                               = grib_arguments_get_name(gh, args, carg_++);
-    sub_j_                               = grib_arguments_get_name(gh, args, carg_++);
-    bif_i_                               = grib_arguments_get_name(gh, args, carg_++);
-    bif_j_                               = grib_arguments_get_name(gh, args, carg_++);
-    biFourierSubTruncationType_          = grib_arguments_get_name(gh, args, carg_++);
-    biFourierDoNotPackAxes_              = grib_arguments_get_name(gh, args, carg_++);
-    biFourierMakeTemplate_               = grib_arguments_get_name(gh, args, carg_++);
-    totalNumberOfValuesInUnpackedSubset_ = grib_arguments_get_name(gh, args, carg_++);
-    /*numberOfValues             = grib_arguments_get_name(gh,args,carg_ ++);*/
+    ieee_floats_                         = args->get_name(gh, carg_++);
+    laplacianOperatorIsSet_              = args->get_name(gh, carg_++);
+    laplacianOperator_                   = args->get_name(gh, carg_++);
+    biFourierTruncationType_             = args->get_name(gh, carg_++);
+    sub_i_                               = args->get_name(gh, carg_++);
+    sub_j_                               = args->get_name(gh, carg_++);
+    bif_i_                               = args->get_name(gh, carg_++);
+    bif_j_                               = args->get_name(gh, carg_++);
+    biFourierSubTruncationType_          = args->get_name(gh, carg_++);
+    biFourierDoNotPackAxes_              = args->get_name(gh, carg_++);
+    biFourierMakeTemplate_               = args->get_name(gh, carg_++);
+    totalNumberOfValuesInUnpackedSubset_ = args->get_name(gh, carg_++);
+    /*numberOfValues             = args->get_name(gh, carg_++);*/
 
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
     dirty_ = 1;
diff --git a/src/accessor/grib_accessor_class_data_g2complex_packing.cc b/src/accessor/grib_accessor_class_data_g2complex_packing.cc
index 7b50a410d..acf3aa908 100644
--- a/src/accessor/grib_accessor_class_data_g2complex_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g2complex_packing.cc
@@ -16,7 +16,7 @@ grib_accessor* grib_accessor_data_g2complex_packing = &_grib_accessor_data_g2com
 void grib_accessor_data_g2complex_packing_t::init(const long v, grib_arguments* args)
 {
     grib_accessor_data_complex_packing_t::init(v, args);
-    numberOfValues_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
+    numberOfValues_ = args->get_name(grib_handle_of_accessor(this), carg_++);
     edition_        = 2;
 
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
diff --git a/src/accessor/grib_accessor_class_data_g2secondary_bitmap.cc b/src/accessor/grib_accessor_class_data_g2secondary_bitmap.cc
index e12c570c6..519a15557 100644
--- a/src/accessor/grib_accessor_class_data_g2secondary_bitmap.cc
+++ b/src/accessor/grib_accessor_class_data_g2secondary_bitmap.cc
@@ -16,7 +16,7 @@ grib_accessor* grib_accessor_data_g2secondary_bitmap = &_grib_accessor_data_g2se
 void grib_accessor_data_g2secondary_bitmap_t::init(const long v, grib_arguments* args)
 {
     grib_accessor_data_secondary_bitmap_t::init(v, args);
-    number_of_values_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, 4);
+    number_of_values_ = args->get_name(grib_handle_of_accessor(this), 4);
 }
 
 int grib_accessor_data_g2secondary_bitmap_t::value_count(long* len)
diff --git a/src/accessor/grib_accessor_class_data_g2shsimple_packing.cc b/src/accessor/grib_accessor_class_data_g2shsimple_packing.cc
index 9e90ef67e..0ee6040db 100644
--- a/src/accessor/grib_accessor_class_data_g2shsimple_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g2shsimple_packing.cc
@@ -17,8 +17,8 @@ void grib_accessor_data_g2shsimple_packing_t::init(const long v, grib_arguments*
 {
     grib_accessor_data_shsimple_packing_t::init(v, args);
 
-    numberOfValues_     = grib_arguments_get_name(grib_handle_of_accessor(this), args, 2);
-    numberOfDataPoints_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, 3);
+    numberOfValues_     = args->get_name(grib_handle_of_accessor(this), 2);
+    numberOfDataPoints_ = args->get_name(grib_handle_of_accessor(this), 3);
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
 }
 
diff --git a/src/accessor/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc b/src/accessor/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc
index 77370bb3d..a6a083046 100644
--- a/src/accessor/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc
+++ b/src/accessor/grib_accessor_class_data_g2simple_packing_with_preprocessing.cc
@@ -18,8 +18,8 @@ grib_accessor* grib_accessor_data_g2simple_packing_with_preprocessing = &_grib_a
 void grib_accessor_data_g2simple_packing_with_preprocessing_t::init(const long v, grib_arguments* args)
 {
     grib_accessor_data_g2simple_packing_t::init(v, args);
-    pre_processing_           = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
-    pre_processing_parameter_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
+    pre_processing_           = args->get_name(grib_handle_of_accessor(this), carg_++);
+    pre_processing_parameter_ = args->get_name(grib_handle_of_accessor(this), carg_++);
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
 }
 
diff --git a/src/accessor/grib_accessor_class_data_jpeg2000_packing.cc b/src/accessor/grib_accessor_class_data_jpeg2000_packing.cc
index 55bf9ea8a..46bee7a76 100644
--- a/src/accessor/grib_accessor_class_data_jpeg2000_packing.cc
+++ b/src/accessor/grib_accessor_class_data_jpeg2000_packing.cc
@@ -25,13 +25,13 @@ void grib_accessor_data_jpeg2000_packing_t::init(const long v, grib_arguments* a
     grib_handle* hand    = grib_handle_of_accessor(this);
 
     jpeg_lib_                 = 0;
-    type_of_compression_used_ = grib_arguments_get_name(hand, args, carg_++);
-    target_compression_ratio_ = grib_arguments_get_name(hand, args, carg_++);
-    ni_                       = grib_arguments_get_name(hand, args, carg_++);
-    nj_                       = grib_arguments_get_name(hand, args, carg_++);
-    list_defining_points_     = grib_arguments_get_name(hand, args, carg_++);
-    number_of_data_points_    = grib_arguments_get_name(hand, args, carg_++);
-    scanning_mode_            = grib_arguments_get_name(hand, args, carg_++);
+    type_of_compression_used_ = args->get_name(hand, carg_++);
+    target_compression_ratio_ = args->get_name(hand, carg_++);
+    ni_                       = args->get_name(hand, carg_++);
+    nj_                       = args->get_name(hand, carg_++);
+    list_defining_points_     = args->get_name(hand, carg_++);
+    number_of_data_points_    = args->get_name(hand, carg_++);
+    scanning_mode_            = args->get_name(hand, carg_++);
     edition_                  = 2;
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
 
diff --git a/src/accessor/grib_accessor_class_data_png_packing.cc b/src/accessor/grib_accessor_class_data_png_packing.cc
index ad024215b..13d032431 100644
--- a/src/accessor/grib_accessor_class_data_png_packing.cc
+++ b/src/accessor/grib_accessor_class_data_png_packing.cc
@@ -21,16 +21,16 @@ void grib_accessor_data_png_packing_t::init(const long v, grib_arguments* args)
     grib_accessor_values_t::init(v, args);
     grib_handle* h = grib_handle_of_accessor(this);
 
-    number_of_values_      = grib_arguments_get_name(h, args, carg_++);
-    reference_value_       = grib_arguments_get_name(h, args, carg_++);
-    binary_scale_factor_   = grib_arguments_get_name(h, args, carg_++);
-    decimal_scale_factor_  = grib_arguments_get_name(h, args, carg_++);
-    bits_per_value_        = grib_arguments_get_name(h, args, carg_++);
-    ni_                    = grib_arguments_get_name(h, args, carg_++);
-    nj_                    = grib_arguments_get_name(h, args, carg_++);
-    list_defining_points_  = grib_arguments_get_name(h, args, carg_++);
-    number_of_data_points_ = grib_arguments_get_name(h, args, carg_++);
-    scanning_mode_         = grib_arguments_get_name(h, args, carg_++);
+    number_of_values_      = args->get_name(h, carg_++);
+    reference_value_       = args->get_name(h, carg_++);
+    binary_scale_factor_   = args->get_name(h, carg_++);
+    decimal_scale_factor_  = args->get_name(h, carg_++);
+    bits_per_value_        = args->get_name(h, carg_++);
+    ni_                    = args->get_name(h, carg_++);
+    nj_                    = args->get_name(h, carg_++);
+    list_defining_points_  = args->get_name(h, carg_++);
+    number_of_data_points_ = args->get_name(h, carg_++);
+    scanning_mode_         = args->get_name(h, carg_++);
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
 }
 
diff --git a/src/accessor/grib_accessor_class_data_raw_packing.cc b/src/accessor/grib_accessor_class_data_raw_packing.cc
index 916029045..4da85f02e 100644
--- a/src/accessor/grib_accessor_class_data_raw_packing.cc
+++ b/src/accessor/grib_accessor_class_data_raw_packing.cc
@@ -18,8 +18,8 @@ void grib_accessor_data_raw_packing_t::init(const long v, grib_arguments* args)
 {
     grib_accessor_values_t::init(v, args);
 
-    number_of_values_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
-    precision_        = grib_arguments_get_name(grib_handle_of_accessor(this), args, carg_++);
+    number_of_values_ = args->get_name(grib_handle_of_accessor(this), carg_++);
+    precision_        = args->get_name(grib_handle_of_accessor(this), carg_++);
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
 }
 
diff --git a/src/accessor/grib_accessor_class_data_run_length_packing.cc b/src/accessor/grib_accessor_class_data_run_length_packing.cc
index 6f550ce29..5d7afe336 100644
--- a/src/accessor/grib_accessor_class_data_run_length_packing.cc
+++ b/src/accessor/grib_accessor_class_data_run_length_packing.cc
@@ -18,12 +18,12 @@ void grib_accessor_data_run_length_packing_t::init(const long v, grib_arguments*
 {
     grib_accessor_values_t::init(v, args);
     grib_handle* gh         = grib_handle_of_accessor(this);
-    number_of_values_       = grib_arguments_get_name(gh, args, carg_++);
-    bits_per_value_         = grib_arguments_get_name(gh, args, carg_++);
-    max_level_value_        = grib_arguments_get_name(gh, args, carg_++);
-    number_of_level_values_ = grib_arguments_get_name(gh, args, carg_++);
-    decimal_scale_factor_   = grib_arguments_get_name(gh, args, carg_++);
-    level_values_           = grib_arguments_get_name(gh, args, carg_++);
+    number_of_values_       = args->get_name(gh, carg_++);
+    bits_per_value_         = args->get_name(gh, carg_++);
+    max_level_value_        = args->get_name(gh, carg_++);
+    number_of_level_values_ = args->get_name(gh, carg_++);
+    decimal_scale_factor_   = args->get_name(gh, carg_++);
+    level_values_           = args->get_name(gh, carg_++);
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
 }
 
diff --git a/src/accessor/grib_accessor_class_data_secondary_bitmap.cc b/src/accessor/grib_accessor_class_data_secondary_bitmap.cc
index 705ca6c80..16f99c19d 100644
--- a/src/accessor/grib_accessor_class_data_secondary_bitmap.cc
+++ b/src/accessor/grib_accessor_class_data_secondary_bitmap.cc
@@ -16,10 +16,10 @@ grib_accessor* grib_accessor_data_secondary_bitmap = &_grib_accessor_data_second
 void grib_accessor_data_secondary_bitmap_t::init(const long v, grib_arguments* args)
 {
     grib_accessor_gen_t::init(v, args);
-    primary_bitmap_   = grib_arguments_get_name(grib_handle_of_accessor(this), args, 0);
-    secondary_bitmap_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, 1);
-    missing_value_    = grib_arguments_get_name(grib_handle_of_accessor(this), args, 2);
-    expand_by_        = grib_arguments_get_name(grib_handle_of_accessor(this), args, 3);
+    primary_bitmap_   = args->get_name(grib_handle_of_accessor(this), 0);
+    secondary_bitmap_ = args->get_name(grib_handle_of_accessor(this), 1);
+    missing_value_    = args->get_name(grib_handle_of_accessor(this), 2);
+    expand_by_        = args->get_name(grib_handle_of_accessor(this), 3);
 
     length_ = 0;
 }
diff --git a/src/accessor/grib_accessor_class_data_sh_packed.cc b/src/accessor/grib_accessor_class_data_sh_packed.cc
index e753b7d07..4d5656a4f 100644
--- a/src/accessor/grib_accessor_class_data_sh_packed.cc
+++ b/src/accessor/grib_accessor_class_data_sh_packed.cc
@@ -22,16 +22,16 @@ void grib_accessor_data_sh_packed_t::init(const long v, grib_arguments* args)
     grib_accessor_data_simple_packing_t::init(v, args);
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    GRIBEX_sh_bug_present_  = grib_arguments_get_name(hand, args, carg_++);
-    ieee_floats_            = grib_arguments_get_name(hand, args, carg_++);
-    laplacianOperatorIsSet_ = grib_arguments_get_name(hand, args, carg_++);
-    laplacianOperator_      = grib_arguments_get_name(hand, args, carg_++);
-    sub_j_                  = grib_arguments_get_name(hand, args, carg_++);
-    sub_k_                  = grib_arguments_get_name(hand, args, carg_++);
-    sub_m_                  = grib_arguments_get_name(hand, args, carg_++);
-    pen_j_                  = grib_arguments_get_name(hand, args, carg_++);
-    pen_k_                  = grib_arguments_get_name(hand, args, carg_++);
-    pen_m_                  = grib_arguments_get_name(hand, args, carg_++);
+    GRIBEX_sh_bug_present_  = args->get_name(hand, carg_++);
+    ieee_floats_            = args->get_name(hand, carg_++);
+    laplacianOperatorIsSet_ = args->get_name(hand, carg_++);
+    laplacianOperator_      = args->get_name(hand, carg_++);
+    sub_j_                  = args->get_name(hand, carg_++);
+    sub_k_                  = args->get_name(hand, carg_++);
+    sub_m_                  = args->get_name(hand, carg_++);
+    pen_j_                  = args->get_name(hand, carg_++);
+    pen_k_                  = args->get_name(hand, carg_++);
+    pen_m_                  = args->get_name(hand, carg_++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_data_sh_unpacked.cc b/src/accessor/grib_accessor_class_data_sh_unpacked.cc
index 6ff72c1b3..dddf88083 100644
--- a/src/accessor/grib_accessor_class_data_sh_unpacked.cc
+++ b/src/accessor/grib_accessor_class_data_sh_unpacked.cc
@@ -22,16 +22,16 @@ void grib_accessor_data_sh_unpacked_t::init(const long v, grib_arguments* args)
     grib_accessor_data_simple_packing_t::init(v, args);
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    GRIBEX_sh_bug_present_  = grib_arguments_get_name(hand, args, carg_++);
-    ieee_floats_            = grib_arguments_get_name(hand, args, carg_++);
-    laplacianOperatorIsSet_ = grib_arguments_get_name(hand, args, carg_++);
-    laplacianOperator_      = grib_arguments_get_name(hand, args, carg_++);
-    sub_j_                  = grib_arguments_get_name(hand, args, carg_++);
-    sub_k_                  = grib_arguments_get_name(hand, args, carg_++);
-    sub_m_                  = grib_arguments_get_name(hand, args, carg_++);
-    pen_j_                  = grib_arguments_get_name(hand, args, carg_++);
-    pen_k_                  = grib_arguments_get_name(hand, args, carg_++);
-    pen_m_                  = grib_arguments_get_name(hand, args, carg_++);
+    GRIBEX_sh_bug_present_  = args->get_name(hand, carg_++);
+    ieee_floats_            = args->get_name(hand, carg_++);
+    laplacianOperatorIsSet_ = args->get_name(hand, carg_++);
+    laplacianOperator_      = args->get_name(hand, carg_++);
+    sub_j_                  = args->get_name(hand, carg_++);
+    sub_k_                  = args->get_name(hand, carg_++);
+    sub_m_                  = args->get_name(hand, carg_++);
+    pen_j_                  = args->get_name(hand, carg_++);
+    pen_k_                  = args->get_name(hand, carg_++);
+    pen_m_                  = args->get_name(hand, carg_++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_data_shsimple_packing.cc b/src/accessor/grib_accessor_class_data_shsimple_packing.cc
index ae909b6c2..210a39ad1 100644
--- a/src/accessor/grib_accessor_class_data_shsimple_packing.cc
+++ b/src/accessor/grib_accessor_class_data_shsimple_packing.cc
@@ -17,8 +17,8 @@ void grib_accessor_data_shsimple_packing_t::init(const long v, grib_arguments* a
 {
     grib_accessor_gen_t::init(v, args);
 
-    coded_values_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, 0);
-    real_part_    = grib_arguments_get_name(grib_handle_of_accessor(this), args, 1);
+    coded_values_ = args->get_name(grib_handle_of_accessor(this), 0);
+    real_part_    = args->get_name(grib_handle_of_accessor(this), 1);
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
 
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_data_simple_packing.cc b/src/accessor/grib_accessor_class_data_simple_packing.cc
index 355067b25..87c0cbcca 100644
--- a/src/accessor/grib_accessor_class_data_simple_packing.cc
+++ b/src/accessor/grib_accessor_class_data_simple_packing.cc
@@ -21,15 +21,15 @@ void grib_accessor_data_simple_packing_t::init(const long v, grib_arguments* arg
 {
     grib_accessor_values_t::init(v, args);
     grib_handle* gh          = grib_handle_of_accessor(this);
-    units_factor_            = grib_arguments_get_name(gh, args, carg_++);
-    units_bias_              = grib_arguments_get_name(gh, args, carg_++);
-    changing_precision_      = grib_arguments_get_name(gh, args, carg_++);
-    number_of_values_        = grib_arguments_get_name(gh, args, carg_++);
-    bits_per_value_          = grib_arguments_get_name(gh, args, carg_++);
-    reference_value_         = grib_arguments_get_name(gh, args, carg_++);
-    binary_scale_factor_     = grib_arguments_get_name(gh, args, carg_++);
-    decimal_scale_factor_    = grib_arguments_get_name(gh, args, carg_++);
-    optimize_scaling_factor_ = grib_arguments_get_name(gh, args, carg_++);
+    units_factor_            = args->get_name(gh, carg_++);
+    units_bias_              = args->get_name(gh, carg_++);
+    changing_precision_      = args->get_name(gh, carg_++);
+    number_of_values_        = args->get_name(gh, carg_++);
+    bits_per_value_          = args->get_name(gh, carg_++);
+    reference_value_         = args->get_name(gh, carg_++);
+    binary_scale_factor_     = args->get_name(gh, carg_++);
+    decimal_scale_factor_    = args->get_name(gh, carg_++);
+    optimize_scaling_factor_ = args->get_name(gh, carg_++);
     flags_ |= GRIB_ACCESSOR_FLAG_DATA;
     dirty_ = 1;
 }
diff --git a/src/accessor/grib_accessor_class_decimal_precision.cc b/src/accessor/grib_accessor_class_decimal_precision.cc
index cff70e669..6652279e7 100644
--- a/src/accessor/grib_accessor_class_decimal_precision.cc
+++ b/src/accessor/grib_accessor_class_decimal_precision.cc
@@ -18,10 +18,10 @@ void grib_accessor_decimal_precision_t::init(const long l, grib_arguments* args)
     grib_accessor_long_t::init(l, args);
     int n = 0;
 
-    bits_per_value_       = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    decimal_scale_factor_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    changing_precision_   = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    values_               = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
+    bits_per_value_       = args->get_name(grib_handle_of_accessor(this), n++);
+    decimal_scale_factor_ = args->get_name(grib_handle_of_accessor(this), n++);
+    changing_precision_   = args->get_name(grib_handle_of_accessor(this), n++);
+    values_               = args->get_name(grib_handle_of_accessor(this), n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_dictionary.cc b/src/accessor/grib_accessor_class_dictionary.cc
index 04086c416..1b56a5555 100644
--- a/src/accessor/grib_accessor_class_dictionary.cc
+++ b/src/accessor/grib_accessor_class_dictionary.cc
@@ -18,11 +18,11 @@ void grib_accessor_dictionary_t::init(const long len, grib_arguments* params)
     grib_accessor_gen_t::init(len, params);
     int n = 0;
 
-    dictionary_ = grib_arguments_get_string(grib_handle_of_accessor(this), params, n++);
-    key_        = grib_arguments_get_name(grib_handle_of_accessor(this), params, n++);
-    column_     = grib_arguments_get_long(grib_handle_of_accessor(this), params, n++);
-    masterDir_  = grib_arguments_get_name(grib_handle_of_accessor(this), params, n++);
-    localDir_   = grib_arguments_get_name(grib_handle_of_accessor(this), params, n++);
+    dictionary_ = params->get_string(grib_handle_of_accessor(this), n++);
+    key_        = params->get_name(grib_handle_of_accessor(this), n++);
+    column_     = params->get_long(grib_handle_of_accessor(this), n++);
+    masterDir_  = params->get_name(grib_handle_of_accessor(this), n++);
+    localDir_   = params->get_name(grib_handle_of_accessor(this), n++);
 
     length_ = 0;
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
diff --git a/src/accessor/grib_accessor_class_dirty.cc b/src/accessor/grib_accessor_class_dirty.cc
index f743957f3..5d5fdc843 100644
--- a/src/accessor/grib_accessor_class_dirty.cc
+++ b/src/accessor/grib_accessor_class_dirty.cc
@@ -16,7 +16,7 @@ grib_accessor* grib_accessor_dirty = &_grib_accessor_dirty;
 void grib_accessor_dirty_t::init(const long l, grib_arguments* c)
 {
     grib_accessor_long_t::init(l, c);
-    accessor_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, 0);
+    accessor_ = c->get_name(grib_handle_of_accessor(this), 0);
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     flags_ |= GRIB_ACCESSOR_FLAG_HIDDEN;
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_divdouble.cc b/src/accessor/grib_accessor_class_divdouble.cc
index f590ca3a9..a280f041e 100644
--- a/src/accessor/grib_accessor_class_divdouble.cc
+++ b/src/accessor/grib_accessor_class_divdouble.cc
@@ -18,8 +18,8 @@ void grib_accessor_divdouble_t::init(const long l, grib_arguments* c)
     grib_accessor_double_t::init(l, c);
     int n = 0;
 
-    val_     = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    divisor_ = grib_arguments_get_double(grib_handle_of_accessor(this), c, n++);
+    val_     = c->get_name(grib_handle_of_accessor(this), n++);
+    divisor_ = c->get_double(grib_handle_of_accessor(this), n++);
 }
 
 int grib_accessor_divdouble_t::unpack_double(double* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_element.cc b/src/accessor/grib_accessor_class_element.cc
index ac361dac0..7e53b6a00 100644
--- a/src/accessor/grib_accessor_class_element.cc
+++ b/src/accessor/grib_accessor_class_element.cc
@@ -19,8 +19,8 @@ void grib_accessor_element_t::init(const long l, grib_arguments* c)
     grib_handle* hand = grib_handle_of_accessor(this);
 
     int n    = 0;
-    array_   = grib_arguments_get_name(hand, c, n++);
-    element_ = grib_arguments_get_long(hand, c, n++);
+    array_   = c->get_name(hand, n++);
+    element_ = c->get_long(hand, n++);
 }
 
 static int check_element_index(const char* func, const char* array_name, long index, size_t size)
@@ -90,6 +90,12 @@ int grib_accessor_element_t::pack_long(const long* val, size_t* len)
         return ret;
     }
 
+    int atype = GRIB_TYPE_UNDEFINED;
+    if (grib_get_native_type(hand, array_, &atype) == GRIB_SUCCESS && atype == GRIB_TYPE_DOUBLE) {
+        const double dVal = *val;
+        return pack_double(&dVal, len);
+    }
+
     if ((ret = grib_get_size(hand, array_, &size)) != GRIB_SUCCESS)
         return ret;
 
@@ -123,6 +129,53 @@ the_end:
     return ret;
 }
 
+int grib_accessor_element_t::pack_double(const double* v, size_t* len)
+{
+    int ret               = 0;
+    size_t size           = 0;
+    double* ar            = NULL;
+    const grib_context* c = context_;
+    grib_handle* hand     = grib_handle_of_accessor(this);
+    long index            = element_;
+
+    if (*len < 1) {
+        ret = GRIB_ARRAY_TOO_SMALL;
+        return ret;
+    }
+
+    if ((ret = grib_get_size(hand, array_, &size)) != GRIB_SUCCESS)
+        return ret;
+
+    ar = (double*)grib_context_malloc_clear(c, size * sizeof(double));
+    if (!ar) {
+        grib_context_log(c, GRIB_LOG_ERROR, "Error allocating %zu bytes", size * sizeof(double));
+        return GRIB_OUT_OF_MEMORY;
+    }
+
+    if ((ret = grib_get_double_array_internal(hand, array_, ar, &size)) != GRIB_SUCCESS)
+        return ret;
+
+    // An index of -x means the xth item from the end of the list, so ar[-1] means the last item in ar
+    if (index < 0) {
+        index = size + index;
+    }
+
+    if ((ret = check_element_index(__func__, array_, index, size)) != GRIB_SUCCESS) {
+        goto the_end;
+    }
+
+    Assert(index >= 0);
+    Assert(index < size);
+    ar[index] = *v;
+
+    if ((ret = grib_set_double_array_internal(hand, array_, ar, size)) != GRIB_SUCCESS)
+        goto the_end;
+
+the_end:
+    grib_context_free(c, ar);
+    return ret;
+}
+
 int grib_accessor_element_t::unpack_double(double* val, size_t* len)
 {
     int ret                 = 0;
diff --git a/src/accessor/grib_accessor_class_element.h b/src/accessor/grib_accessor_class_element.h
index 0a93b282d..a19ae8b54 100644
--- a/src/accessor/grib_accessor_class_element.h
+++ b/src/accessor/grib_accessor_class_element.h
@@ -21,6 +21,7 @@ public:
     int pack_long(const long* val, size_t* len) override;
     int unpack_double(double* val, size_t* len) override;
     int unpack_long(long* val, size_t* len) override;
+    int pack_double(const double* val, size_t* len) override;
     void init(const long, grib_arguments*) override;
 
 private:
diff --git a/src/accessor/grib_accessor_class_evaluate.cc b/src/accessor/grib_accessor_class_evaluate.cc
index 9cca2b034..1e583cd11 100644
--- a/src/accessor/grib_accessor_class_evaluate.cc
+++ b/src/accessor/grib_accessor_class_evaluate.cc
@@ -23,9 +23,9 @@ void grib_accessor_evaluate_t::init(const long l, grib_arguments* c)
 int grib_accessor_evaluate_t::unpack_long(long* val, size_t* len)
 {
     grib_handle* h = grib_handle_of_accessor(this);
-    grib_expression* e = grib_arguments_get_expression(h, arg_, 0);
+    grib_expression* e = arg_->get_expression(h, 0);
 
-    int ret = grib_expression_evaluate_long(h, e, val);
+    int ret = e->evaluate_long(h, val);
     *len    = 1;
 
     return ret;
diff --git a/src/accessor/grib_accessor_class_expanded_descriptors.cc b/src/accessor/grib_accessor_class_expanded_descriptors.cc
index 1e3733256..7fe9b3e3a 100644
--- a/src/accessor/grib_accessor_class_expanded_descriptors.cc
+++ b/src/accessor/grib_accessor_class_expanded_descriptors.cc
@@ -34,17 +34,17 @@ void grib_accessor_expanded_descriptors_t::init(const long len, grib_arguments*
     grib_accessor_long_t::init(len, args);
     int n               = 0;
     grib_handle* hand   = grib_handle_of_accessor(this);
-    tablesAccessorName_ = grib_arguments_get_name(hand, args, n++);
-    expandedName_       = grib_arguments_get_name(hand, args, n++);
-    rank_               = grib_arguments_get_long(hand, args, n++);
+    tablesAccessorName_ = args->get_name(hand, n++);
+    expandedName_       = args->get_name(hand, n++);
+    rank_               = args->get_long(hand, n++);
     if (rank_ != 0) {
         expandedAccessor_ = dynamic_cast<grib_accessor_expanded_descriptors_t*>(grib_find_accessor(hand, expandedName_));
     }
     else {
         expandedAccessor_ = 0;
     }
-    unexpandedDescriptors_ = grib_arguments_get_name(hand, args, n++);
-    sequence_              = grib_arguments_get_name(hand, args, n++);
+    unexpandedDescriptors_ = args->get_name(hand, n++);
+    sequence_              = args->get_name(hand, n++);
     do_expand_             = 1;
     expanded_              = 0;
     length_                = 0;
@@ -94,9 +94,7 @@ void grib_accessor_expanded_descriptors_t::__expand(bufr_descriptors_array* unex
     bufr_descriptor* vv = NULL;
     /* ECC-1422: 'ur' is the array of bufr_descriptor pointers for replications.
      * Its max size is X (from FXY) which is 6 bits so no need for malloc */
-    bufr_descriptor* ur[65] = {
-        0,
-    };
+    bufr_descriptor* ur[65] = {0,};
     bufr_descriptor* urc                     = NULL;
     size_t idx                               = 0;
     bufr_descriptor* u0                      = NULL;
@@ -183,7 +181,7 @@ void grib_accessor_expanded_descriptors_t::__expand(bufr_descriptors_array* unex
                 /* Number of descriptors to replicate cannot be more than what's left */
                 if (us->X + 1 > unexpanded->n) {
                     grib_context_log(c, GRIB_LOG_ERROR,
-                                     "Delayed replication: %06ld: expected %d but only found %lu elements",
+                                     "Delayed replication: %06ld: expected %d but only found %lu element(s)",
                                      u->code, us->X, unexpanded->n - 1);
                     *err = GRIB_DECODING_ERROR;
                     return;
@@ -211,15 +209,16 @@ void grib_accessor_expanded_descriptors_t::__expand(bufr_descriptors_array* unex
 #endif
                 expanded = grib_bufr_descriptors_array_append(expanded, inner_expanded);
                 uidx     = grib_bufr_descriptors_array_get(expanded, idx);
-                if (size > 100) {
-                    grib_context_log(c, GRIB_LOG_ERROR,
-                                     "Delayed replication %06ld: Too many elements (%lu). "
-                                     "Hint: This may be due to associated field descriptors",
-                                     uidx->code, size);
-                    *err = GRIB_DECODING_ERROR;
-                    return;
-                }
-                grib_bufr_descriptor_set_code(uidx, (size - 1) * 1000 + 100000);
+                Assert( uidx->type == BUFR_DESCRIPTOR_TYPE_REPLICATION );
+                Assert( uidx->F == 1 );
+                Assert( uidx->Y == 0 );
+                // ECC-1958 and ECC-1054:
+                // Here X is used to store the size which can exceed 63. The normal X is 6 bits wide so max=63
+                // We need to set X but not the descriptor code
+                uidx->X = (int)(size - 1);
+                if (size < 64)
+                    uidx->code = (size - 1) * 1000 + 100000;
+                //grib_bufr_descriptor_set_code(uidx, (size - 1) * 1000 + 100000);
                 size++;
             }
             else {
@@ -233,6 +232,10 @@ void grib_accessor_expanded_descriptors_t::__expand(bufr_descriptors_array* unex
                 grib_bufr_descriptor_delete(u);
                 size = us->X * us->Y;
                 memset(ur, 0, us->X); /* ECC-1422 */
+                if (us->X > unexpanded->n) {
+                    grib_context_log(c, GRIB_LOG_ERROR, "Replication descriptor %06ld: expected %d but only found %zu element(s)",
+                                     us->code, us->X, unexpanded->n);
+                }
                 for (j = 0; j < us->X; j++) {
                     DESCRIPTORS_POP_FRONT_OR_RETURN(unexpanded, ur[j]);
 #if MYDEBUG
diff --git a/src/accessor/grib_accessor_class_from_scale_factor_scaled_value.cc b/src/accessor/grib_accessor_class_from_scale_factor_scaled_value.cc
index dfe77afcf..ae58d5463 100644
--- a/src/accessor/grib_accessor_class_from_scale_factor_scaled_value.cc
+++ b/src/accessor/grib_accessor_class_from_scale_factor_scaled_value.cc
@@ -20,8 +20,8 @@ void grib_accessor_from_scale_factor_scaled_value_t::init(const long l, grib_arg
     int n             = 0;
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    scaleFactor_ = grib_arguments_get_name(hand, c, n++);
-    scaledValue_ = grib_arguments_get_name(hand, c, n++);  // Can be scalar or array
+    scaleFactor_ = c->get_name(hand, n++);
+    scaledValue_ = c->get_name(hand, n++);  // Can be scalar or array
 
     // ECC-979: Allow user to encode
     // flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
diff --git a/src/accessor/grib_accessor_class_g1_message_length.cc b/src/accessor/grib_accessor_class_g1_message_length.cc
index d09f1dd0a..160db8cab 100644
--- a/src/accessor/grib_accessor_class_g1_message_length.cc
+++ b/src/accessor/grib_accessor_class_g1_message_length.cc
@@ -16,7 +16,7 @@ grib_accessor* grib_accessor_g1_message_length = &_grib_accessor_g1_message_leng
 void grib_accessor_g1_message_length_t::init(const long len, grib_arguments* args)
 {
     grib_accessor_section_length_t::init(len, args);
-    sec4_length_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, 0);
+    sec4_length_ = args->get_name(grib_handle_of_accessor(this), 0);
 }
 
 int grib_get_g1_message_size(grib_handle* h, grib_accessor* tl, grib_accessor* s4,
diff --git a/src/accessor/grib_accessor_class_g1_section4_length.cc b/src/accessor/grib_accessor_class_g1_section4_length.cc
index b4ff3bff6..fde6f8c5d 100644
--- a/src/accessor/grib_accessor_class_g1_section4_length.cc
+++ b/src/accessor/grib_accessor_class_g1_section4_length.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -17,7 +16,7 @@ grib_accessor* grib_accessor_g1_section4_length = &_grib_accessor_g1_section4_le
 void grib_accessor_g1_section4_length_t::init(const long len, grib_arguments* args)
 {
     grib_accessor_section_length_t::init(len, args);
-    total_length_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, 0);
+    total_length_ = args->get_name(grib_handle_of_accessor(this), 0);
 }
 
 int grib_accessor_g1_section4_length_t::pack_long(const long* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_g1bitmap.cc b/src/accessor/grib_accessor_class_g1bitmap.cc
index 6c9e6461f..e11d26728 100644
--- a/src/accessor/grib_accessor_class_g1bitmap.cc
+++ b/src/accessor/grib_accessor_class_g1bitmap.cc
@@ -16,7 +16,7 @@ grib_accessor* grib_accessor_g1bitmap = &_grib_accessor_g1bitmap;
 void grib_accessor_g1bitmap_t::init(const long len, grib_arguments* arg)
 {
     grib_accessor_bitmap_t::init(len, arg);
-    unusedBits_ = grib_arguments_get_name(grib_handle_of_accessor(this), arg, 4);
+    unusedBits_ = arg->get_name(grib_handle_of_accessor(this), 4);
 }
 
 int grib_accessor_g1bitmap_t::pack_double(const double* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_g1date.cc b/src/accessor/grib_accessor_class_g1date.cc
index 167265361..15d05722a 100644
--- a/src/accessor/grib_accessor_class_g1date.cc
+++ b/src/accessor/grib_accessor_class_g1date.cc
@@ -19,10 +19,10 @@ void grib_accessor_g1date_t::init(const long l, grib_arguments* c)
     grib_handle* hand = grib_handle_of_accessor(this);
     int n             = 0;
 
-    century_ = grib_arguments_get_name(hand, c, n++);
-    year_    = grib_arguments_get_name(hand, c, n++);
-    month_   = grib_arguments_get_name(hand, c, n++);
-    day_     = grib_arguments_get_name(hand, c, n++);
+    century_ = c->get_name(hand, n++);
+    year_    = c->get_name(hand, n++);
+    month_   = c->get_name(hand, n++);
+    day_     = c->get_name(hand, n++);
 }
 
 int grib_accessor_g1date_t::unpack_long(long* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_g1end_of_interval_monthly.cc b/src/accessor/grib_accessor_class_g1end_of_interval_monthly.cc
index 43f7dbbb4..acb5f020b 100644
--- a/src/accessor/grib_accessor_class_g1end_of_interval_monthly.cc
+++ b/src/accessor/grib_accessor_class_g1end_of_interval_monthly.cc
@@ -18,7 +18,7 @@ void grib_accessor_g1end_of_interval_monthly_t::init(const long l, grib_argument
     grib_accessor_abstract_vector_t::init(l, c);
     int n = 0;
 
-    verifyingMonth_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    verifyingMonth_ = c->get_name(grib_handle_of_accessor(this), n++);
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     flags_ |= GRIB_ACCESSOR_FLAG_HIDDEN;
diff --git a/src/accessor/grib_accessor_class_g1forecastmonth.cc b/src/accessor/grib_accessor_class_g1forecastmonth.cc
index 6f9e00a64..43f71f0c1 100644
--- a/src/accessor/grib_accessor_class_g1forecastmonth.cc
+++ b/src/accessor/grib_accessor_class_g1forecastmonth.cc
@@ -18,14 +18,14 @@ void grib_accessor_g1forecastmonth_t::init(const long l, grib_arguments* c)
     grib_accessor_long_t::init(l, c);
     grib_handle* h  = grib_handle_of_accessor(this);
     int n           = 0;
-    const int count = grib_arguments_get_count(c);
+    const int count = c->get_count();
     if (count == 6) { /* GRIB1 case -- this needs to be refactored */
-        verification_yearmonth_ = grib_arguments_get_name(h, c, n++);
-        base_date_              = grib_arguments_get_name(h, c, n++);
-        day_                    = grib_arguments_get_name(h, c, n++);
-        hour_                   = grib_arguments_get_name(h, c, n++);
-        fcmonth_                = grib_arguments_get_name(h, c, n++);
-        check_                  = grib_arguments_get_name(h, c, n++);
+        verification_yearmonth_ = c->get_name(h, n++);
+        base_date_              = c->get_name(h, n++);
+        day_                    = c->get_name(h, n++);
+        hour_                   = c->get_name(h, n++);
+        fcmonth_                = c->get_name(h, n++);
+        check_                  = c->get_name(h, n++);
     }
 }
 
diff --git a/src/accessor/grib_accessor_class_g1monthlydate.cc b/src/accessor/grib_accessor_class_g1monthlydate.cc
index 851f27988..602442bbb 100644
--- a/src/accessor/grib_accessor_class_g1monthlydate.cc
+++ b/src/accessor/grib_accessor_class_g1monthlydate.cc
@@ -18,7 +18,7 @@ void grib_accessor_g1monthlydate_t::init(const long l, grib_arguments* c)
     grib_accessor_long_t::init(l, c);
     int n = 0;
 
-    date_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    date_ = c->get_name(grib_handle_of_accessor(this), n++);
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
 
diff --git a/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_complex.cc b/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_complex.cc
index e77e85bd1..c7697ecdf 100644
--- a/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_complex.cc
+++ b/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_complex.cc
@@ -17,14 +17,14 @@ void grib_accessor_g1number_of_coded_values_sh_complex_t::init(const long l, gri
 {
     grib_accessor_long_t::init(l, c);
     int n             = 0;
-    bitsPerValue_     = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    offsetBeforeData_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    offsetAfterData_  = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    unusedBits_       = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    numberOfValues_   = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    JS_               = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    KS_               = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    MS_               = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    bitsPerValue_     = c->get_name(grib_handle_of_accessor(this), n++);
+    offsetBeforeData_ = c->get_name(grib_handle_of_accessor(this), n++);
+    offsetAfterData_  = c->get_name(grib_handle_of_accessor(this), n++);
+    unusedBits_       = c->get_name(grib_handle_of_accessor(this), n++);
+    numberOfValues_   = c->get_name(grib_handle_of_accessor(this), n++);
+    JS_               = c->get_name(grib_handle_of_accessor(this), n++);
+    KS_               = c->get_name(grib_handle_of_accessor(this), n++);
+    MS_               = c->get_name(grib_handle_of_accessor(this), n++);
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_simple.cc b/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_simple.cc
index 8821f6020..2667ed88b 100644
--- a/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_simple.cc
+++ b/src/accessor/grib_accessor_class_g1number_of_coded_values_sh_simple.cc
@@ -17,11 +17,11 @@ void grib_accessor_g1number_of_coded_values_sh_simple_t::init(const long l, grib
 {
     grib_accessor_long_t::init(l, c);
     int n             = 0;
-    bitsPerValue_     = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    offsetBeforeData_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    offsetAfterData_  = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    unusedBits_       = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    numberOfValues_   = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    bitsPerValue_     = c->get_name(grib_handle_of_accessor(this), n++);
+    offsetBeforeData_ = c->get_name(grib_handle_of_accessor(this), n++);
+    offsetAfterData_  = c->get_name(grib_handle_of_accessor(this), n++);
+    unusedBits_       = c->get_name(grib_handle_of_accessor(this), n++);
+    numberOfValues_   = c->get_name(grib_handle_of_accessor(this), n++);
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_g1step_range.cc b/src/accessor/grib_accessor_class_g1step_range.cc
index ce82f455f..ab1824fd5 100644
--- a/src/accessor/grib_accessor_class_g1step_range.cc
+++ b/src/accessor/grib_accessor_class_g1step_range.cc
@@ -18,13 +18,13 @@ void grib_accessor_g1step_range_t::init(const long l, grib_arguments* c)
     grib_accessor_abstract_long_vector_t::init(l, c);
     grib_handle* h      = grib_handle_of_accessor(this);
     int n               = 0;
-    p1_                 = grib_arguments_get_name(h, c, n++);
-    p2_                 = grib_arguments_get_name(h, c, n++);
-    timeRangeIndicator_ = grib_arguments_get_name(h, c, n++);
-    unit_               = grib_arguments_get_name(h, c, n++);
-    step_unit_          = grib_arguments_get_name(h, c, n++);
-    stepType_           = grib_arguments_get_name(h, c, n++);
-    patch_fp_precip_    = grib_arguments_get_name(h, c, n++);
+    p1_                 = c->get_name(h, n++);
+    p2_                 = c->get_name(h, n++);
+    timeRangeIndicator_ = c->get_name(h, n++);
+    unit_               = c->get_name(h, n++);
+    step_unit_          = c->get_name(h, n++);
+    stepType_           = c->get_name(h, n++);
+    patch_fp_precip_    = c->get_name(h, n++);
     error_on_units_     = 1;
 
     number_of_elements_ = 2;
diff --git a/src/accessor/grib_accessor_class_g1verificationdate.cc b/src/accessor/grib_accessor_class_g1verificationdate.cc
index 9cfa720d6..de0217414 100644
--- a/src/accessor/grib_accessor_class_g1verificationdate.cc
+++ b/src/accessor/grib_accessor_class_g1verificationdate.cc
@@ -18,9 +18,9 @@ void grib_accessor_g1verificationdate_t::init(const long l, grib_arguments* c)
     grib_accessor_long_t::init(l, c);
     int n = 0;
 
-    date_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    time_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    step_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    date_ = c->get_name(grib_handle_of_accessor(this), n++);
+    time_ = c->get_name(grib_handle_of_accessor(this), n++);
+    step_ = c->get_name(grib_handle_of_accessor(this), n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
diff --git a/src/accessor/grib_accessor_class_g2_aerosol.cc b/src/accessor/grib_accessor_class_g2_aerosol.cc
index 000fca581..4f0ad1c20 100644
--- a/src/accessor/grib_accessor_class_g2_aerosol.cc
+++ b/src/accessor/grib_accessor_class_g2_aerosol.cc
@@ -19,9 +19,9 @@ void grib_accessor_g2_aerosol_t::init(const long l, grib_arguments* c)
     grib_handle* hand = grib_handle_of_accessor(this);
     int n             = 0;
 
-    productDefinitionTemplateNumber_ = grib_arguments_get_name(hand, c, n++);
-    stepType_                        = grib_arguments_get_name(hand, c, n++);
-    optical_                         = grib_arguments_get_long(hand, c, n++);
+    productDefinitionTemplateNumber_ = c->get_name(hand, n++);
+    stepType_                        = c->get_name(hand, n++);
+    optical_                         = c->get_long(hand, n++);
 }
 
 int grib_accessor_g2_aerosol_t::unpack_long(long* val, size_t* len)
@@ -79,7 +79,7 @@ int grib_accessor_g2_aerosol_t::pack_long(const long* val, size_t* len)
     }
     else {
         if (isInstant) {
-            productDefinitionTemplateNumberNew = 50; // 44 is deprecated, 50 is the corrected version
+            productDefinitionTemplateNumberNew = 50;  // ECC-1963: 44 is deprecated
         }
         else {
             productDefinitionTemplateNumberNew = 46;
diff --git a/src/accessor/grib_accessor_class_g2_chemical.cc b/src/accessor/grib_accessor_class_g2_chemical.cc
index c86240aa9..87cdbdb09 100644
--- a/src/accessor/grib_accessor_class_g2_chemical.cc
+++ b/src/accessor/grib_accessor_class_g2_chemical.cc
@@ -28,9 +28,9 @@ void grib_accessor_g2_chemical_t::init(const long l, grib_arguments* c)
     grib_handle* hand = grib_handle_of_accessor(this);
     int n             = 0;
 
-    productDefinitionTemplateNumber_ = grib_arguments_get_name(hand, c, n++);
-    stepType_                        = grib_arguments_get_name(hand, c, n++);
-    chemical_type_                   = grib_arguments_get_long(hand, c, n++);
+    productDefinitionTemplateNumber_ = c->get_name(hand, n++);
+    stepType_                        = c->get_name(hand, n++);
+    chemical_type_                   = c->get_long(hand, n++);
 }
 
 int grib_accessor_g2_chemical_t::unpack_long(long* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_g2_eps.cc b/src/accessor/grib_accessor_class_g2_eps.cc
index 31c4bf6b9..2311dc7a1 100644
--- a/src/accessor/grib_accessor_class_g2_eps.cc
+++ b/src/accessor/grib_accessor_class_g2_eps.cc
@@ -18,11 +18,11 @@ void grib_accessor_g2_eps_t::init(const long l, grib_arguments* c)
     grib_accessor_unsigned_t::init(l, c);
     int n = 0;
 
-    productDefinitionTemplateNumber_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    type_                            = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    stream_                          = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    stepType_                        = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    derivedForecast_                 = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    productDefinitionTemplateNumber_ = c->get_name(grib_handle_of_accessor(this), n++);
+    type_                            = c->get_name(grib_handle_of_accessor(this), n++);
+    stream_                          = c->get_name(grib_handle_of_accessor(this), n++);
+    stepType_                        = c->get_name(grib_handle_of_accessor(this), n++);
+    derivedForecast_                 = c->get_name(grib_handle_of_accessor(this), n++);
 }
 
 int grib_accessor_g2_eps_t::unpack_long(long* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_g2_mars_labeling.cc b/src/accessor/grib_accessor_class_g2_mars_labeling.cc
index 2ec962251..0991f4d35 100644
--- a/src/accessor/grib_accessor_class_g2_mars_labeling.cc
+++ b/src/accessor/grib_accessor_class_g2_mars_labeling.cc
@@ -19,16 +19,16 @@ void grib_accessor_g2_mars_labeling_t::init(const long l, grib_arguments* c)
     int n             = 0;
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    index_                           = grib_arguments_get_long(hand, c, n++);
-    the_class_                       = grib_arguments_get_name(hand, c, n++);
-    type_                            = grib_arguments_get_name(hand, c, n++);
-    stream_                          = grib_arguments_get_name(hand, c, n++);
-    expver_                          = grib_arguments_get_name(hand, c, n++);
-    typeOfProcessedData_             = grib_arguments_get_name(hand, c, n++);
-    productDefinitionTemplateNumber_ = grib_arguments_get_name(hand, c, n++);
-    stepType_                        = grib_arguments_get_name(hand, c, n++);
-    derivedForecast_                 = grib_arguments_get_name(hand, c, n++);
-    typeOfGeneratingProcess_         = grib_arguments_get_name(hand, c, n++);
+    index_                           = c->get_long(hand, n++);
+    the_class_                       = c->get_name(hand, n++);
+    type_                            = c->get_name(hand, n++);
+    stream_                          = c->get_name(hand, n++);
+    expver_                          = c->get_name(hand, n++);
+    typeOfProcessedData_             = c->get_name(hand, n++);
+    productDefinitionTemplateNumber_ = c->get_name(hand, n++);
+    stepType_                        = c->get_name(hand, n++);
+    derivedForecast_                 = c->get_name(hand, n++);
+    typeOfGeneratingProcess_         = c->get_name(hand, n++);
 }
 
 int grib_accessor_g2_mars_labeling_t::unpack_long(long* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_g2bitmap.cc b/src/accessor/grib_accessor_class_g2bitmap.cc
index 6a5486981..08f47fe6d 100644
--- a/src/accessor/grib_accessor_class_g2bitmap.cc
+++ b/src/accessor/grib_accessor_class_g2bitmap.cc
@@ -17,7 +17,7 @@ void grib_accessor_g2bitmap_t::init(const long len, grib_arguments* arg)
 {
     grib_accessor_bitmap_t::init(len, arg);
 
-    numberOfValues_ = grib_arguments_get_name(grib_handle_of_accessor(this), arg, 4);
+    numberOfValues_ = arg->get_name(grib_handle_of_accessor(this), 4);
 }
 
 // For speed use a local static function
diff --git a/src/accessor/grib_accessor_class_g2bitmap_present.cc b/src/accessor/grib_accessor_class_g2bitmap_present.cc
index 47c91d330..a7257bfe5 100644
--- a/src/accessor/grib_accessor_class_g2bitmap_present.cc
+++ b/src/accessor/grib_accessor_class_g2bitmap_present.cc
@@ -17,7 +17,7 @@ void grib_accessor_g2bitmap_present_t::init(const long l, grib_arguments* c)
 {
     grib_accessor_long_t::init(l, c);
     int n            = 0;
-    bitmapIndicator_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    bitmapIndicator_ = c->get_name(grib_handle_of_accessor(this), n++);
 
     length_ = 0;
 }
diff --git a/src/accessor/grib_accessor_class_g2bitmap_present.h b/src/accessor/grib_accessor_class_g2bitmap_present.h
index 516d5191a..3a7a07df7 100644
--- a/src/accessor/grib_accessor_class_g2bitmap_present.h
+++ b/src/accessor/grib_accessor_class_g2bitmap_present.h
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
diff --git a/src/accessor/grib_accessor_class_g2date.cc b/src/accessor/grib_accessor_class_g2date.cc
index 23b2e99cd..8a5ce4f71 100644
--- a/src/accessor/grib_accessor_class_g2date.cc
+++ b/src/accessor/grib_accessor_class_g2date.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -19,9 +18,9 @@ void grib_accessor_g2date_t::init(const long l, grib_arguments* c)
     grib_accessor_long_t::init(l, c);
     int n = 0;
 
-    year_  = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    month_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    day_   = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    year_  = c->get_name(grib_handle_of_accessor(this), n++);
+    month_ = c->get_name(grib_handle_of_accessor(this), n++);
+    day_   = c->get_name(grib_handle_of_accessor(this), n++);
 }
 
 int grib_accessor_g2date_t::unpack_long(long* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_g2date.h b/src/accessor/grib_accessor_class_g2date.h
index 7ac73519d..7e979904c 100644
--- a/src/accessor/grib_accessor_class_g2date.h
+++ b/src/accessor/grib_accessor_class_g2date.h
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
diff --git a/src/accessor/grib_accessor_class_g2end_step.cc b/src/accessor/grib_accessor_class_g2end_step.cc
index c175ebe88..5f9cf19c2 100644
--- a/src/accessor/grib_accessor_class_g2end_step.cc
+++ b/src/accessor/grib_accessor_class_g2end_step.cc
@@ -22,27 +22,27 @@ void grib_accessor_g2end_step_t::init(const long l, grib_arguments* c)
     int n          = 0;
     grib_handle* h = grib_handle_of_accessor(this);
 
-    start_step_value_ = grib_arguments_get_name(h, c, n++);
-    step_units_       = grib_arguments_get_name(h, c, n++);
+    start_step_value_ = c->get_name(h, n++);
+    step_units_       = c->get_name(h, n++);
 
-    year_   = grib_arguments_get_name(h, c, n++);
-    month_  = grib_arguments_get_name(h, c, n++);
-    day_    = grib_arguments_get_name(h, c, n++);
-    hour_   = grib_arguments_get_name(h, c, n++);
-    minute_ = grib_arguments_get_name(h, c, n++);
-    second_ = grib_arguments_get_name(h, c, n++);
+    year_   = c->get_name(h, n++);
+    month_  = c->get_name(h, n++);
+    day_    = c->get_name(h, n++);
+    hour_   = c->get_name(h, n++);
+    minute_ = c->get_name(h, n++);
+    second_ = c->get_name(h, n++);
 
-    year_of_end_of_interval_   = grib_arguments_get_name(h, c, n++);
-    month_of_end_of_interval_  = grib_arguments_get_name(h, c, n++);
-    day_of_end_of_interval_    = grib_arguments_get_name(h, c, n++);
-    hour_of_end_of_interval_   = grib_arguments_get_name(h, c, n++);
-    minute_of_end_of_interval_ = grib_arguments_get_name(h, c, n++);
-    second_of_end_of_interval_ = grib_arguments_get_name(h, c, n++);
+    year_of_end_of_interval_   = c->get_name(h, n++);
+    month_of_end_of_interval_  = c->get_name(h, n++);
+    day_of_end_of_interval_    = c->get_name(h, n++);
+    hour_of_end_of_interval_   = c->get_name(h, n++);
+    minute_of_end_of_interval_ = c->get_name(h, n++);
+    second_of_end_of_interval_ = c->get_name(h, n++);
 
-    time_range_unit_     = grib_arguments_get_name(h, c, n++);
-    time_range_value_    = grib_arguments_get_name(h, c, n++);
-    typeOfTimeIncrement_ = grib_arguments_get_name(h, c, n++);
-    numberOfTimeRanges_  = grib_arguments_get_name(h, c, n++);
+    time_range_unit_     = c->get_name(h, n++);
+    time_range_value_    = c->get_name(h, n++);
+    typeOfTimeIncrement_ = c->get_name(h, n++);
+    numberOfTimeRanges_  = c->get_name(h, n++);
 }
 
 void grib_accessor_g2end_step_t::dump(grib_dumper* dumper)
@@ -51,13 +51,12 @@ void grib_accessor_g2end_step_t::dump(grib_dumper* dumper)
 }
 
 // See GRIB-488
-bool is_special_expver(const grib_handle* h)
+static bool is_special_expver(const grib_handle* h)
 {
-    int ret                = 0;
     char strMarsExpVer[50] = {0,};
     char strMarsClass[50] = {0,};
     size_t slen = 50;
-    ret         = grib_get_string(h, "mars.class", strMarsClass, &slen);
+    int ret = grib_get_string(h, "mars.class", strMarsClass, &slen);
     if (ret == GRIB_SUCCESS && STR_EQUAL(strMarsClass, "em")) {
         // em = ERA-CLIM model integration for the 20th-century (ERA-20CM)
         slen = 50;
diff --git a/src/accessor/grib_accessor_class_g2grid.cc b/src/accessor/grib_accessor_class_g2grid.cc
index 6dddc5a3f..725ace107 100644
--- a/src/accessor/grib_accessor_class_g2grid.cc
+++ b/src/accessor/grib_accessor_class_g2grid.cc
@@ -19,14 +19,14 @@ void grib_accessor_g2grid_t::init(const long l, grib_arguments* c)
     grib_handle* hand = grib_handle_of_accessor(this);
     int n             = 0;
 
-    latitude_first_  = grib_arguments_get_name(hand, c, n++);
-    longitude_first_ = grib_arguments_get_name(hand, c, n++);
-    latitude_last_   = grib_arguments_get_name(hand, c, n++);
-    longitude_last_  = grib_arguments_get_name(hand, c, n++);
-    i_increment_     = grib_arguments_get_name(hand, c, n++);
-    j_increment_     = grib_arguments_get_name(hand, c, n++);
-    basic_angle_     = grib_arguments_get_name(hand, c, n++);
-    sub_division_    = grib_arguments_get_name(hand, c, n++);
+    latitude_first_  = c->get_name(hand, n++);
+    longitude_first_ = c->get_name(hand, n++);
+    latitude_last_   = c->get_name(hand, n++);
+    longitude_last_  = c->get_name(hand, n++);
+    i_increment_     = c->get_name(hand, n++);
+    j_increment_     = c->get_name(hand, n++);
+    basic_angle_     = c->get_name(hand, n++);
+    sub_division_    = c->get_name(hand, n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC | GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
diff --git a/src/accessor/grib_accessor_class_g2latlon.cc b/src/accessor/grib_accessor_class_g2latlon.cc
index 14ba5f5c5..6a4e0e4e2 100644
--- a/src/accessor/grib_accessor_class_g2latlon.cc
+++ b/src/accessor/grib_accessor_class_g2latlon.cc
@@ -19,9 +19,9 @@ void grib_accessor_g2latlon_t::init(const long l, grib_arguments* c)
     grib_accessor_double_t::init(l, c);
     int n = 0;
 
-    grid_  = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    index_ = grib_arguments_get_long(grib_handle_of_accessor(this), c, n++);
-    given_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    grid_  = c->get_name(grib_handle_of_accessor(this), n++);
+    index_ = c->get_long(grib_handle_of_accessor(this), n++);
+    given_ = c->get_name(grib_handle_of_accessor(this), n++);
 }
 
 int grib_accessor_g2latlon_t::unpack_double(double* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_g2level.cc b/src/accessor/grib_accessor_class_g2level.cc
index 05dd07b26..84767bf12 100644
--- a/src/accessor/grib_accessor_class_g2level.cc
+++ b/src/accessor/grib_accessor_class_g2level.cc
@@ -19,10 +19,10 @@ void grib_accessor_g2level_t::init(const long l, grib_arguments* c)
     grib_handle* hand = grib_handle_of_accessor(this);
     int n             = 0;
 
-    type_first_     = grib_arguments_get_name(hand, c, n++);
-    scale_first_    = grib_arguments_get_name(hand, c, n++);
-    value_first_    = grib_arguments_get_name(hand, c, n++);
-    pressure_units_ = grib_arguments_get_name(hand, c, n++);
+    type_first_     = c->get_name(hand, n++);
+    scale_first_    = c->get_name(hand, n++);
+    value_first_    = c->get_name(hand, n++);
+    pressure_units_ = c->get_name(hand, n++);
 
     // See ECC-1644
     flags_ |= GRIB_ACCESSOR_FLAG_COPY_IF_CHANGING_EDITION;
diff --git a/src/accessor/grib_accessor_class_g2lon.cc b/src/accessor/grib_accessor_class_g2lon.cc
index 63b6d8e6a..23a17eeef 100644
--- a/src/accessor/grib_accessor_class_g2lon.cc
+++ b/src/accessor/grib_accessor_class_g2lon.cc
@@ -19,7 +19,7 @@ void grib_accessor_g2lon_t::init(const long l, grib_arguments* c)
     grib_accessor_double_t::init(l, c);
     int n = 0;
 
-    longitude_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    longitude_ = c->get_name(grib_handle_of_accessor(this), n++);
 }
 
 int grib_accessor_g2lon_t::unpack_double(double* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_g2step_range.cc b/src/accessor/grib_accessor_class_g2step_range.cc
index adf08b7d1..c51a3efbd 100644
--- a/src/accessor/grib_accessor_class_g2step_range.cc
+++ b/src/accessor/grib_accessor_class_g2step_range.cc
@@ -22,8 +22,8 @@ void grib_accessor_g2step_range_t::init(const long l, grib_arguments* c)
 
     int n = 0;
 
-    start_step_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    end_step_   = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    start_step_ = c->get_name(grib_handle_of_accessor(this), n++);
+    end_step_   = c->get_name(grib_handle_of_accessor(this), n++);
 
     length_ = 0;
 }
diff --git a/src/accessor/grib_accessor_class_gaussian_grid_name.cc b/src/accessor/grib_accessor_class_gaussian_grid_name.cc
index f8a34e06f..c8eed586f 100644
--- a/src/accessor/grib_accessor_class_gaussian_grid_name.cc
+++ b/src/accessor/grib_accessor_class_gaussian_grid_name.cc
@@ -18,9 +18,9 @@ void grib_accessor_gaussian_grid_name_t::init(const long len, grib_arguments* ar
     grib_accessor_gen_t::init(len, arg);
     int n = 0;
 
-    N_            = grib_arguments_get_name(parent_->h, arg, n++);
-    Ni_           = grib_arguments_get_name(parent_->h, arg, n++);
-    isOctahedral_ = grib_arguments_get_name(parent_->h, arg, n++);
+    N_            = arg->get_name(parent_->h, n++);
+    Ni_           = arg->get_name(parent_->h, n++);
+    isOctahedral_ = arg->get_name(parent_->h, n++);
     length_       = 0;
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     flags_ |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
diff --git a/src/accessor/grib_accessor_class_gds_is_present.cc b/src/accessor/grib_accessor_class_gds_is_present.cc
index 36a2c154c..99efbb3b6 100644
--- a/src/accessor/grib_accessor_class_gds_is_present.cc
+++ b/src/accessor/grib_accessor_class_gds_is_present.cc
@@ -18,10 +18,10 @@ void grib_accessor_gds_is_present_t::init(const long l, grib_arguments* c)
     grib_accessor_long_t::init(l, c);
     int n            = 0;
     grib_handle* h   = grib_handle_of_accessor(this);
-    gds_present_     = grib_arguments_get_name(h, c, n++);
-    grid_definition_ = grib_arguments_get_name(h, c, n++);
-    bitmap_present_  = grib_arguments_get_name(h, c, n++);
-    values_          = grib_arguments_get_name(h, c, n++);
+    gds_present_     = c->get_name(h, n++);
+    grid_definition_ = c->get_name(h, n++);
+    bitmap_present_  = c->get_name(h, n++);
+    values_          = c->get_name(h, n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     flags_ |= GRIB_ACCESSOR_FLAG_HIDDEN;
diff --git a/src/accessor/grib_accessor_class_gds_not_present_bitmap.cc b/src/accessor/grib_accessor_class_gds_not_present_bitmap.cc
index f42438b97..974f2f23b 100644
--- a/src/accessor/grib_accessor_class_gds_not_present_bitmap.cc
+++ b/src/accessor/grib_accessor_class_gds_not_present_bitmap.cc
@@ -19,11 +19,11 @@ void grib_accessor_gds_not_present_bitmap_t::init(const long v, grib_arguments*
     int n             = 0;
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    missing_value_           = grib_arguments_get_name(hand, args, n++);
-    number_of_values_        = grib_arguments_get_name(hand, args, n++);
-    number_of_points_        = grib_arguments_get_name(hand, args, n++);
-    latitude_of_first_point_ = grib_arguments_get_name(hand, args, n++);
-    ni_                      = grib_arguments_get_name(hand, args, n++);
+    missing_value_           = args->get_name(hand, n++);
+    number_of_values_        = args->get_name(hand, n++);
+    number_of_points_        = args->get_name(hand, n++);
+    latitude_of_first_point_ = args->get_name(hand, n++);
+    ni_                      = args->get_name(hand, n++);
     length_                  = 0;
 }
 
diff --git a/src/accessor/grib_accessor_class_gen.cc b/src/accessor/grib_accessor_class_gen.cc
index 167e48764..87df8e981 100644
--- a/src/accessor/grib_accessor_class_gen.cc
+++ b/src/accessor/grib_accessor_class_gen.cc
@@ -37,24 +37,24 @@ void grib_accessor_gen_t::init(const long len, grib_arguments* param)
             int ret = 0;
             double d;
             char tmp[1024];
-            grib_expression* expression = grib_arguments_get_expression(grib_handle_of_accessor(this), act->default_value, 0);
-            int type                    = grib_expression_native_type(grib_handle_of_accessor(this), expression);
+            grib_expression* expression = act->default_value->get_expression(grib_handle_of_accessor(this), 0);
+            int type                    = expression->native_type(grib_handle_of_accessor(this));
             switch (type) {
                     // TODO(maee): add single-precision case
 
                 case GRIB_TYPE_DOUBLE:
-                    grib_expression_evaluate_double(grib_handle_of_accessor(this), expression, &d);
+                    expression->evaluate_double(grib_handle_of_accessor(this), &d);
                     pack_double(&d, &s_len);
                     break;
 
                 case GRIB_TYPE_LONG:
-                    grib_expression_evaluate_long(grib_handle_of_accessor(this), expression, &l);
+                    expression->evaluate_long(grib_handle_of_accessor(this), &l);
                     pack_long(&l, &s_len);
                     break;
 
                 default:
                     s_len = sizeof(tmp);
-                    p     = grib_expression_evaluate_string(grib_handle_of_accessor(this), expression, tmp, &s_len, &ret);
+                    p     = expression->evaluate_string(grib_handle_of_accessor(this), tmp, &s_len, &ret);
                     if (ret != GRIB_SUCCESS) {
                         grib_context_log(context_, GRIB_LOG_ERROR, "Unable to evaluate %s as string", name_);
                         Assert(0);
@@ -259,13 +259,13 @@ int grib_accessor_gen_t::pack_expression(grib_expression* e)
     grib_handle* hand = grib_handle_of_accessor(this);
 
     // Use the native type of the expression not the accessor
-    switch (grib_expression_native_type(hand, e)) {
+    switch (e->native_type(hand)) {
         case GRIB_TYPE_LONG: {
             len = 1;
-            ret = grib_expression_evaluate_long(hand, e, &lval);
+            ret = e->evaluate_long(hand, &lval);
             if (ret != GRIB_SUCCESS) {
                 grib_context_log(context_, GRIB_LOG_ERROR, "Unable to set %s as long (from %s)",
-                                 name_, e->cclass->name);
+                                 name_, e->class_name());
                 return ret;
             }
             /*if (hand->context->debug)
@@ -275,10 +275,10 @@ int grib_accessor_gen_t::pack_expression(grib_expression* e)
 
         case GRIB_TYPE_DOUBLE: {
             len = 1;
-            ret = grib_expression_evaluate_double(hand, e, &dval);
+            ret = e->evaluate_double(hand, &dval);
             if (ret != GRIB_SUCCESS) {
                 grib_context_log(context_, GRIB_LOG_ERROR, "Unable to set %s as double (from %s)",
-                                 name_, e->cclass->name);
+                                 name_, e->class_name());
                 return ret;
             }
             /*if (hand->context->debug)
@@ -289,10 +289,10 @@ int grib_accessor_gen_t::pack_expression(grib_expression* e)
         case GRIB_TYPE_STRING: {
             char tmp[1024];
             len  = sizeof(tmp);
-            cval = grib_expression_evaluate_string(hand, e, tmp, &len, &ret);
+            cval = e->evaluate_string(hand, tmp, &len, &ret);
             if (ret != GRIB_SUCCESS) {
                 grib_context_log(context_, GRIB_LOG_ERROR, "Unable to set %s as string (from %s)",
-                                 name_, e->cclass->name);
+                                 name_, e->class_name());
                 return ret;
             }
             len = strlen(cval);
diff --git a/src/accessor/grib_accessor_class_getenv.cc b/src/accessor/grib_accessor_class_getenv.cc
index 7fea4feb2..2bc3eee3a 100644
--- a/src/accessor/grib_accessor_class_getenv.cc
+++ b/src/accessor/grib_accessor_class_getenv.cc
@@ -18,8 +18,8 @@ void grib_accessor_getenv_t::init(const long l, grib_arguments* args)
     grib_accessor_ascii_t::init(l, args);
     static char undefined[] = "undefined";
 
-    envvar_          = grib_arguments_get_string(grib_handle_of_accessor(this), args, 0);
-    default_value_ = grib_arguments_get_string(grib_handle_of_accessor(this), args, 1);
+    envvar_          = args->get_string(grib_handle_of_accessor(this), 0);
+    default_value_ = args->get_string(grib_handle_of_accessor(this), 1);
     if (!default_value_)
         default_value_ = undefined;
     value_ = 0;
diff --git a/src/accessor/grib_accessor_class_global_gaussian.cc b/src/accessor/grib_accessor_class_global_gaussian.cc
index 55511c7e8..48a93771c 100644
--- a/src/accessor/grib_accessor_class_global_gaussian.cc
+++ b/src/accessor/grib_accessor_class_global_gaussian.cc
@@ -19,17 +19,17 @@ void grib_accessor_global_gaussian_t::init(const long l, grib_arguments* c)
     int n          = 0;
     grib_handle* h = grib_handle_of_accessor(this);
 
-    N_           = grib_arguments_get_name(h, c, n++);
-    Ni_          = grib_arguments_get_name(h, c, n++);
-    di_          = grib_arguments_get_name(h, c, n++);
-    latfirst_    = grib_arguments_get_name(h, c, n++);
-    lonfirst_    = grib_arguments_get_name(h, c, n++);
-    latlast_     = grib_arguments_get_name(h, c, n++);
-    lonlast_     = grib_arguments_get_name(h, c, n++);
-    plpresent_   = grib_arguments_get_name(h, c, n++);
-    pl_          = grib_arguments_get_name(h, c, n++);
-    basic_angle_ = grib_arguments_get_name(h, c, n++);
-    subdivision_ = grib_arguments_get_name(h, c, n++);
+    N_           = c->get_name(h, n++);
+    Ni_          = c->get_name(h, n++);
+    di_          = c->get_name(h, n++);
+    latfirst_    = c->get_name(h, n++);
+    lonfirst_    = c->get_name(h, n++);
+    latlast_     = c->get_name(h, n++);
+    lonlast_     = c->get_name(h, n++);
+    plpresent_   = c->get_name(h, n++);
+    pl_          = c->get_name(h, n++);
+    basic_angle_ = c->get_name(h, n++);
+    subdivision_ = c->get_name(h, n++);
 }
 
 int grib_accessor_global_gaussian_t::unpack_long(long* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_group.cc b/src/accessor/grib_accessor_class_group.cc
index a39cf0519..b011faef0 100644
--- a/src/accessor/grib_accessor_class_group.cc
+++ b/src/accessor/grib_accessor_class_group.cc
@@ -20,7 +20,7 @@ void grib_accessor_group_t::init(const long len, grib_arguments* arg)
 
     size_t i = 0;
     unsigned char* v;
-    const char* s = grib_arguments_get_string(grib_handle_of_accessor(this), arg, 0);
+    const char* s = arg ? arg->get_string(grib_handle_of_accessor(this), 0) : nullptr;
 
     if (s && strlen(s) > 1) {
         grib_context_log(context_, GRIB_LOG_WARNING,
@@ -94,9 +94,7 @@ int grib_accessor_group_t::unpack_string(char* val, size_t* len)
 
 int grib_accessor_group_t::unpack_long(long* v, size_t* len)
 {
-    char val[1024] = {
-        0,
-    };
+    char val[1024] = {0,};
     size_t l   = sizeof(val);
     size_t i   = 0;
     char* last = NULL;
@@ -117,7 +115,7 @@ int grib_accessor_group_t::unpack_long(long* v, size_t* len)
 
     *v = strtol(val, &last, 10);
 
-    grib_context_log(context_, GRIB_LOG_DEBUG, " Casting string %s to long", name_);
+    grib_context_log(context_, GRIB_LOG_DEBUG, "Casting string %s to long", name_);
     return GRIB_SUCCESS;
 }
 
@@ -130,7 +128,7 @@ int grib_accessor_group_t::unpack_double(double* v, size_t* len)
     *v = strtod(val, &last);
 
     if (*last == 0) {
-        grib_context_log(context_, GRIB_LOG_DEBUG, " Casting string %s to long", name_);
+        grib_context_log(context_, GRIB_LOG_DEBUG, "Casting string %s to long", name_);
         return GRIB_SUCCESS;
     }
 
diff --git a/src/accessor/grib_accessor_class_gts_header.cc b/src/accessor/grib_accessor_class_gts_header.cc
index 591e6e783..a240bc63b 100644
--- a/src/accessor/grib_accessor_class_gts_header.cc
+++ b/src/accessor/grib_accessor_class_gts_header.cc
@@ -16,10 +16,8 @@ grib_accessor* grib_accessor_gts_header = &_grib_accessor_gts_header;
 void grib_accessor_gts_header_t::init(const long l, grib_arguments* c)
 {
     grib_accessor_ascii_t::init(l, c);
-    gts_offset_ = -1;
-    gts_length_ = -1;
-    gts_offset_ = grib_arguments_get_long(grib_handle_of_accessor(this), c, 0);
-    gts_length_ = grib_arguments_get_long(grib_handle_of_accessor(this), c, 1);
+    gts_offset_ = c ? c->get_long(grib_handle_of_accessor(this), 0) : 0;
+    gts_length_ = c ? c->get_long(grib_handle_of_accessor(this), 1) : 0;
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
 
diff --git a/src/accessor/grib_accessor_class_ibmfloat.cc b/src/accessor/grib_accessor_class_ibmfloat.cc
index e0d087f3c..3d74576c5 100644
--- a/src/accessor/grib_accessor_class_ibmfloat.cc
+++ b/src/accessor/grib_accessor_class_ibmfloat.cc
@@ -102,7 +102,7 @@ int grib_accessor_ibmfloat_t::pack_double(const double* val, size_t* len)
     for (i = 0; i < rlen; i++) {
         grib_encode_unsigned_longb(buf, grib_ibm_to_long(val[i]), &off, 32);
     }
-    ret = grib_set_long_internal(grib_handle_of_accessor(this), grib_arguments_get_name(parent_->h, arg_, 0), rlen);
+    ret = grib_set_long_internal(grib_handle_of_accessor(this), arg_->get_name(parent_->h, 0), rlen);
 
     if (ret == GRIB_SUCCESS)
         grib_buffer_replace(this, buf, buflen, 1, 1);
@@ -128,7 +128,7 @@ int grib_accessor_ibmfloat_t::value_count(long* len)
         *len = 1;
         return 0;
     }
-    return grib_get_long_internal(grib_handle_of_accessor(this), grib_arguments_get_name(parent_->h, arg_, 0), len);
+    return grib_get_long_internal(grib_handle_of_accessor(this), arg_->get_name(parent_->h, 0), len);
 }
 
 long grib_accessor_ibmfloat_t::byte_offset()
diff --git a/src/accessor/grib_accessor_class_ieeefloat.cc b/src/accessor/grib_accessor_class_ieeefloat.cc
index dc242b72a..31e7cd164 100644
--- a/src/accessor/grib_accessor_class_ieeefloat.cc
+++ b/src/accessor/grib_accessor_class_ieeefloat.cc
@@ -32,7 +32,7 @@ int grib_accessor_ieeefloat_t::value_count(long* len)
         *len = 1;
         return 0;
     }
-    return grib_get_long_internal(grib_handle_of_accessor(this), grib_arguments_get_name(parent_->h, arg_, 0), len);
+    return grib_get_long_internal(grib_handle_of_accessor(this), arg_->get_name(parent_->h, 0), len);
 }
 
 int grib_accessor_ieeefloat_t::pack_double(const double* val, size_t* len)
@@ -68,7 +68,7 @@ int grib_accessor_ieeefloat_t::pack_double(const double* val, size_t* len)
     for (i = 0; i < rlen; i++) {
         grib_encode_unsigned_longb(buf, grib_ieee_to_long(val[i]), &off, 32);
     }
-    ret = grib_set_long_internal(grib_handle_of_accessor(this), grib_arguments_get_name(parent_->h, arg_, 0), rlen);
+    ret = grib_set_long_internal(grib_handle_of_accessor(this), arg_->get_name(parent_->h, 0), rlen);
 
     if (ret == GRIB_SUCCESS)
         grib_buffer_replace(this, buf, buflen, 1, 1);
diff --git a/src/accessor/grib_accessor_class_ifs_param.cc b/src/accessor/grib_accessor_class_ifs_param.cc
index a1ba7aef3..ce7b952e1 100644
--- a/src/accessor/grib_accessor_class_ifs_param.cc
+++ b/src/accessor/grib_accessor_class_ifs_param.cc
@@ -18,8 +18,8 @@ void grib_accessor_ifs_param_t::init(const long l, grib_arguments* c)
     grib_accessor_gen_t::init(l, c);
     int n = 0;
 
-    paramId_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    type_    = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    paramId_ = c->get_name(grib_handle_of_accessor(this), n++);
+    type_    = c->get_name(grib_handle_of_accessor(this), n++);
 }
 
 int grib_accessor_ifs_param_t::unpack_long(long* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_iterator.h b/src/accessor/grib_accessor_class_iterator.h
index aa3a4017f..784902a0d 100644
--- a/src/accessor/grib_accessor_class_iterator.h
+++ b/src/accessor/grib_accessor_class_iterator.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "grib_accessor_class_gen.h"
-#include "geo_iterator/grib_iterator.h"
+#include "geo/iterator/grib_iterator.h"
 
 class grib_accessor_iterator_t : public grib_accessor_gen_t
 {
diff --git a/src/accessor/grib_accessor_class_julian_date.cc b/src/accessor/grib_accessor_class_julian_date.cc
index 4f7e430d2..bc060f094 100644
--- a/src/accessor/grib_accessor_class_julian_date.cc
+++ b/src/accessor/grib_accessor_class_julian_date.cc
@@ -19,10 +19,10 @@ void grib_accessor_julian_date_t::init(const long l, grib_arguments* c)
     int n          = 0;
     grib_handle* h = grib_handle_of_accessor(this);
 
-    year_  = grib_arguments_get_name(h, c, n++);
-    month_ = grib_arguments_get_name(h, c, n++);
+    year_  = c->get_name(h, n++);
+    month_ = c->get_name(h, n++);
 
-    day_ = grib_arguments_get_name(h, c, n++);
+    day_ = c->get_name(h, n++);
     if (day_ == NULL) {
         hour_   = 0;
         minute_ = 0;
@@ -35,9 +35,9 @@ void grib_accessor_julian_date_t::init(const long l, grib_arguments* c)
     else {
         ymd_    = 0;
         hms_    = 0;
-        hour_   = grib_arguments_get_name(h, c, n++);
-        minute_ = grib_arguments_get_name(h, c, n++);
-        second_ = grib_arguments_get_name(h, c, n++);
+        hour_   = c->get_name(h, n++);
+        minute_ = c->get_name(h, n++);
+        second_ = c->get_name(h, n++);
     }
     sep_[0] = ' ';
     sep_[1] = 0;
@@ -312,10 +312,10 @@ int grib_accessor_julian_date_t::pack_expression(grib_expression* e)
     int ret           = 0;
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    switch (grib_expression_native_type(hand, e)) {
+    switch (e->native_type(hand)) {
         case GRIB_TYPE_LONG: {
             len = 1;
-            ret = grib_expression_evaluate_long(hand, e, &lval);
+            ret = e->evaluate_long(hand, &lval);
             if (ret != GRIB_SUCCESS) {
                 grib_context_log(context_, GRIB_LOG_ERROR, "Unable to set %s as long", name_);
                 return ret;
@@ -327,7 +327,7 @@ int grib_accessor_julian_date_t::pack_expression(grib_expression* e)
 
         case GRIB_TYPE_DOUBLE: {
             len = 1;
-            ret = grib_expression_evaluate_double(hand, e, &dval);
+            ret = e->evaluate_double(hand, &dval);
             /*if (hand->context->debug)
                     printf("ECCODES DEBUG grib_accessor_gen::pack_expression %s %g\n", name_ , dval);*/
             return pack_double(&dval, &len);
@@ -336,7 +336,7 @@ int grib_accessor_julian_date_t::pack_expression(grib_expression* e)
         case GRIB_TYPE_STRING: {
             char tmp[1024];
             len  = sizeof(tmp);
-            cval = grib_expression_evaluate_string(hand, e, tmp, &len, &ret);
+            cval = e->evaluate_string(hand, tmp, &len, &ret);
             if (ret != GRIB_SUCCESS) {
                 grib_context_log(context_, GRIB_LOG_ERROR, "Unable to set %s as string", name_);
                 return ret;
diff --git a/src/accessor/grib_accessor_class_julian_date.h b/src/accessor/grib_accessor_class_julian_date.h
index 0859ca9ba..d08ffda12 100644
--- a/src/accessor/grib_accessor_class_julian_date.h
+++ b/src/accessor/grib_accessor_class_julian_date.h
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
diff --git a/src/accessor/grib_accessor_class_julian_day.cc b/src/accessor/grib_accessor_class_julian_day.cc
index 7b22252a0..1ed2cbb73 100644
--- a/src/accessor/grib_accessor_class_julian_day.cc
+++ b/src/accessor/grib_accessor_class_julian_day.cc
@@ -19,10 +19,10 @@ void grib_accessor_julian_day_t::init(const long l, grib_arguments* c)
     int n = 0;
     grib_handle* h  = grib_handle_of_accessor(this);
 
-    date_   = grib_arguments_get_name(h, c, n++);
-    hour_   = grib_arguments_get_name(h, c, n++);
-    minute_ = grib_arguments_get_name(h, c, n++);
-    second_ = grib_arguments_get_name(h, c, n++);
+    date_   = c->get_name(h, n++);
+    hour_   = c->get_name(h, n++);
+    minute_ = c->get_name(h, n++);
+    second_ = c->get_name(h, n++);
 
     length_ = 0;
 }
diff --git a/src/accessor/grib_accessor_class_julian_day.h b/src/accessor/grib_accessor_class_julian_day.h
index 8d88b3184..4d1e4b67c 100644
--- a/src/accessor/grib_accessor_class_julian_day.h
+++ b/src/accessor/grib_accessor_class_julian_day.h
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
diff --git a/src/accessor/grib_accessor_class_ksec1expver.h b/src/accessor/grib_accessor_class_ksec1expver.h
index 4105a94fd..840255f7a 100644
--- a/src/accessor/grib_accessor_class_ksec1expver.h
+++ b/src/accessor/grib_accessor_class_ksec1expver.h
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
diff --git a/src/accessor/grib_accessor_class_latitudes.cc b/src/accessor/grib_accessor_class_latitudes.cc
index 49976c844..be627bb3c 100644
--- a/src/accessor/grib_accessor_class_latitudes.cc
+++ b/src/accessor/grib_accessor_class_latitudes.cc
@@ -48,8 +48,8 @@ void grib_accessor_latitudes_t::init(const long l, grib_arguments* c)
     grib_accessor_double_t::init(l, c);
     int n = 0;
 
-    values_   = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    distinct_ = grib_arguments_get_long(grib_handle_of_accessor(this), c, n++);
+    values_   = c->get_name(grib_handle_of_accessor(this), n++);
+    distinct_ = c->get_long(grib_handle_of_accessor(this), n++);
     save_     = 0;
 
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
diff --git a/src/accessor/grib_accessor_class_latlon_increment.cc b/src/accessor/grib_accessor_class_latlon_increment.cc
index ead5d04da..3beed4bae 100644
--- a/src/accessor/grib_accessor_class_latlon_increment.cc
+++ b/src/accessor/grib_accessor_class_latlon_increment.cc
@@ -19,15 +19,15 @@ void grib_accessor_latlon_increment_t::init(const long l, grib_arguments* c)
     int n             = 0;
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    directionIncrementGiven_ = grib_arguments_get_name(hand, c, n++);
-    directionIncrement_      = grib_arguments_get_name(hand, c, n++);
-    scansPositively_         = grib_arguments_get_name(hand, c, n++);
-    first_                   = grib_arguments_get_name(hand, c, n++);
-    last_                    = grib_arguments_get_name(hand, c, n++);
-    numberOfPoints_          = grib_arguments_get_name(hand, c, n++);
-    angleMultiplier_         = grib_arguments_get_name(hand, c, n++);
-    angleDivisor_            = grib_arguments_get_name(hand, c, n++);
-    isLongitude_             = grib_arguments_get_long(hand, c, n++);
+    directionIncrementGiven_ = c->get_name(hand, n++);
+    directionIncrement_      = c->get_name(hand, n++);
+    scansPositively_         = c->get_name(hand, n++);
+    first_                   = c->get_name(hand, n++);
+    last_                    = c->get_name(hand, n++);
+    numberOfPoints_          = c->get_name(hand, n++);
+    angleMultiplier_         = c->get_name(hand, n++);
+    angleDivisor_            = c->get_name(hand, n++);
+    isLongitude_             = c->get_long(hand, n++);
 }
 
 int grib_accessor_latlon_increment_t::unpack_double(double* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_latlonvalues.cc b/src/accessor/grib_accessor_class_latlonvalues.cc
index 5dd250272..8e0b15331 100644
--- a/src/accessor/grib_accessor_class_latlonvalues.cc
+++ b/src/accessor/grib_accessor_class_latlonvalues.cc
@@ -19,7 +19,7 @@ void grib_accessor_latlonvalues_t::init(const long l, grib_arguments* c)
     grib_accessor_double_t::init(l, c);
     int n = 0;
 
-    values_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    values_ = c->get_name(grib_handle_of_accessor(this), n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
diff --git a/src/accessor/grib_accessor_class_library_version.cc b/src/accessor/grib_accessor_class_library_version.cc
index 0a31d1df3..93bcc2a35 100644
--- a/src/accessor/grib_accessor_class_library_version.cc
+++ b/src/accessor/grib_accessor_class_library_version.cc
@@ -15,9 +15,7 @@ grib_accessor* grib_accessor_library_version = &_grib_accessor_library_version;
 
 int grib_accessor_library_version_t::unpack_string(char* val, size_t* len)
 {
-    char result[30] = {
-        0,
-    };
+    char result[30] = {0,};
     size_t size = 0;
 
     int major    = ECCODES_MAJOR_VERSION;
diff --git a/src/accessor/grib_accessor_class_local_definition.cc b/src/accessor/grib_accessor_class_local_definition.cc
index 6f3d8a3a7..0dc4e3641 100644
--- a/src/accessor/grib_accessor_class_local_definition.cc
+++ b/src/accessor/grib_accessor_class_local_definition.cc
@@ -19,15 +19,15 @@ void grib_accessor_local_definition_t::init(const long l, grib_arguments* c)
     grib_handle* hand = grib_handle_of_accessor(this);
     int n             = 0;
 
-    grib2LocalSectionNumber_                 = grib_arguments_get_name(hand, c, n++);
-    productDefinitionTemplateNumber_         = grib_arguments_get_name(hand, c, n++);
-    productDefinitionTemplateNumberInternal_ = grib_arguments_get_name(hand, c, n++);
-    type_                                    = grib_arguments_get_name(hand, c, n++);
-    stream_                                  = grib_arguments_get_name(hand, c, n++);
-    the_class_                               = grib_arguments_get_name(hand, c, n++);
-    eps_                                     = grib_arguments_get_name(hand, c, n++);
-    stepType_                                = grib_arguments_get_name(hand, c, n++);
-    derivedForecast_                         = grib_arguments_get_name(hand, c, n++);
+    grib2LocalSectionNumber_                 = c->get_name(hand, n++);
+    productDefinitionTemplateNumber_         = c->get_name(hand, n++);
+    productDefinitionTemplateNumberInternal_ = c->get_name(hand, n++);
+    type_                                    = c->get_name(hand, n++);
+    stream_                                  = c->get_name(hand, n++);
+    the_class_                               = c->get_name(hand, n++);
+    eps_                                     = c->get_name(hand, n++);
+    stepType_                                = c->get_name(hand, n++);
+    derivedForecast_                         = c->get_name(hand, n++);
 }
 
 int grib_accessor_local_definition_t::unpack_long(long* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_long_vector.cc b/src/accessor/grib_accessor_class_long_vector.cc
index d8c004e90..1d746e185 100644
--- a/src/accessor/grib_accessor_class_long_vector.cc
+++ b/src/accessor/grib_accessor_class_long_vector.cc
@@ -21,11 +21,11 @@ void grib_accessor_long_vector_t::init(const long l, grib_arguments* c)
     grib_accessor_abstract_long_vector_t* v = NULL;
     int n                                   = 0;
 
-    vector_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    vector_ = c->get_name(grib_handle_of_accessor(this), n++);
     va      = (grib_accessor*)grib_find_accessor(grib_handle_of_accessor(this), vector_);
     v       = (grib_accessor_abstract_long_vector_t*)va;
 
-    index_ = grib_arguments_get_long(grib_handle_of_accessor(this), c, n++);
+    index_ = c->get_long(grib_handle_of_accessor(this), n++);
 
     /* check index_ on init and never change it */
     Assert(index_ < v->number_of_elements_ && index_ >= 0);
diff --git a/src/accessor/grib_accessor_class_longitudes.cc b/src/accessor/grib_accessor_class_longitudes.cc
index b262079c1..a73d65879 100644
--- a/src/accessor/grib_accessor_class_longitudes.cc
+++ b/src/accessor/grib_accessor_class_longitudes.cc
@@ -19,8 +19,8 @@ void grib_accessor_longitudes_t::init(const long l, grib_arguments* c)
     grib_accessor_double_t::init(l, c);
     int n = 0;
 
-    values_   = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    distinct_ = grib_arguments_get_long(grib_handle_of_accessor(this), c, n++);
+    values_   = c->get_name(grib_handle_of_accessor(this), n++);
+    distinct_ = c->get_long(grib_handle_of_accessor(this), n++);
     save_     = 0;
     lons_     = 0;
 
diff --git a/src/accessor/grib_accessor_class_lookup.cc b/src/accessor/grib_accessor_class_lookup.cc
index 0ec0c62e1..dcc9d3061 100644
--- a/src/accessor/grib_accessor_class_lookup.cc
+++ b/src/accessor/grib_accessor_class_lookup.cc
@@ -18,9 +18,9 @@ void grib_accessor_lookup_t::init(const long len, grib_arguments* arg)
     grib_accessor_long_t::init(len, arg);
     length_  = 0;
     llength_ = len;
-    loffset_ = grib_arguments_get_long(grib_handle_of_accessor(this), arg, 0);
+    loffset_ = arg->get_long(grib_handle_of_accessor(this), 0);
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
-    real_name_ = grib_arguments_get_expression(grib_handle_of_accessor(this), arg, 1);
+    real_name_ = arg->get_expression(grib_handle_of_accessor(this), 1);
 }
 
 void grib_accessor_lookup_t::post_init()
diff --git a/src/accessor/grib_accessor_class_mars_param.cc b/src/accessor/grib_accessor_class_mars_param.cc
index b9b0d2c2c..4c2e3f422 100644
--- a/src/accessor/grib_accessor_class_mars_param.cc
+++ b/src/accessor/grib_accessor_class_mars_param.cc
@@ -17,9 +17,9 @@ void grib_accessor_mars_param_t::init(const long l, grib_arguments* c)
 {
     grib_accessor_ascii_t::init(l, c);
     int n    = 0;
-    paramId_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    table_   = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    param_   = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    paramId_ = c->get_name(grib_handle_of_accessor(this), n++);
+    table_   = c->get_name(grib_handle_of_accessor(this), n++);
+    param_   = c->get_name(grib_handle_of_accessor(this), n++);
 }
 
 // For an implementation of pack_string, see
diff --git a/src/accessor/grib_accessor_class_mars_step.cc b/src/accessor/grib_accessor_class_mars_step.cc
index d7fa6902d..10b695339 100644
--- a/src/accessor/grib_accessor_class_mars_step.cc
+++ b/src/accessor/grib_accessor_class_mars_step.cc
@@ -17,8 +17,8 @@ void grib_accessor_mars_step_t::init(const long l, grib_arguments* c)
 {
     grib_accessor_ascii_t::init(l, c);
     int n      = 0;
-    stepRange_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    stepType_  = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    stepRange_ = c->get_name(grib_handle_of_accessor(this), n++);
+    stepType_  = c->get_name(grib_handle_of_accessor(this), n++);
 }
 
 int grib_accessor_mars_step_t::pack_string(const char* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_md5.cc b/src/accessor/grib_accessor_class_md5.cc
index 8099f5f6f..52ab4c201 100644
--- a/src/accessor/grib_accessor_class_md5.cc
+++ b/src/accessor/grib_accessor_class_md5.cc
@@ -22,10 +22,10 @@ void grib_accessor_md5_t::init(const long len, grib_arguments* arg)
     grib_string_list* current = 0;
     grib_context* context     = context_;
 
-    offset_key_    = grib_arguments_get_name(grib_handle_of_accessor(this), arg, n++);
-    length_key_    = grib_arguments_get_expression(grib_handle_of_accessor(this), arg, n++);
+    offset_key_    = arg->get_name(grib_handle_of_accessor(this), n++);
+    length_key_    = arg->get_expression(grib_handle_of_accessor(this), n++);
     blocklist_ = NULL;
-    while ((b = (char*)grib_arguments_get_name(grib_handle_of_accessor(this), arg, n++)) != NULL) {
+    while ((b = (char*)arg->get_name(grib_handle_of_accessor(this), n++)) != NULL) {
         if (!blocklist_) {
             blocklist_        = (grib_string_list*)grib_context_malloc_clear(context, sizeof(grib_string_list));
             blocklist_->value = grib_context_strdup(context, b);
@@ -97,11 +97,12 @@ int grib_accessor_md5_t::unpack_string(char* v, size_t* len)
 
     if ((ret = grib_get_long_internal(grib_handle_of_accessor(this), offset_key_, &offset)) != GRIB_SUCCESS)
         return ret;
-    if ((ret = grib_expression_evaluate_long(grib_handle_of_accessor(this), length_key_, &length)) != GRIB_SUCCESS)
+    if ((ret = length_key_->evaluate_long(grib_handle_of_accessor(this), &length)) != GRIB_SUCCESS)
         return ret;
     mess = (unsigned char*)grib_context_malloc(context_, length);
     memcpy(mess, grib_handle_of_accessor(this)->buffer->data + offset, length);
     mess_len = length;
+    const unsigned char* pEnd = mess + length - 1;
 
     blocklist = context_->blocklist;
     /* passed blocklist overrides context blocklist.
@@ -117,8 +118,10 @@ int grib_accessor_md5_t::unpack_string(char* v, size_t* len)
         }
 
         p = mess + b->offset_ - offset;
-        for (i = 0; i < b->length_; i++)
+        for (i = 0; i < b->length_; i++) {
+            if (p > pEnd) break;
             *(p++) = 0;
+        }
 
         blocklist = blocklist->next;
     }
diff --git a/src/accessor/grib_accessor_class_message_is_valid.cc b/src/accessor/grib_accessor_class_message_is_valid.cc
new file mode 100644
index 000000000..a467c88f0
--- /dev/null
+++ b/src/accessor/grib_accessor_class_message_is_valid.cc
@@ -0,0 +1,127 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_accessor_class_message_is_valid.h"
+
+grib_accessor_message_is_valid_t _grib_accessor_message_is_valid{};
+grib_accessor* grib_accessor_message_is_valid = &_grib_accessor_message_is_valid;
+
+void grib_accessor_message_is_valid_t::init(const long l, grib_arguments* arg)
+{
+    grib_accessor_long_t::init(l, arg);
+
+    grib_handle* h = grib_handle_of_accessor(this);
+    product_ = arg->get_name(h, 0);
+
+    flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    length_ = 0;
+}
+
+static int check_field_values(grib_handle* h)
+{
+    //printf("DEBUG  %s \n", __func__);
+    int ret = GRIB_SUCCESS;
+    double* values = NULL;
+    size_t size = 0;
+    grib_context* c = h->context;
+
+    if ((ret = grib_get_size(h, "values", &size)) != GRIB_SUCCESS)
+        return ret;
+    values = (double*)grib_context_malloc_clear(c, size * sizeof(double));
+    if (!values)
+        return GRIB_OUT_OF_MEMORY;
+
+    if ((ret = grib_get_double_array(h, "values", values, &size)) != GRIB_SUCCESS) {
+        return ret;
+    }
+    grib_context_free(c, values);
+    return GRIB_SUCCESS;
+}
+
+static int check_grid_pl_array(grib_handle* h)
+{
+    // printf("DEBUG  %s \n", __func__);
+    int ret = GRIB_SUCCESS;
+    long Ni = 0,plpresent  = 0;
+    long* pl = NULL; // pl array
+    size_t plsize = 0;
+    grib_context* c = h->context;
+
+    // is there a PL array?
+    ret = grib_get_long(h, "PLPresent", &plpresent);
+    if (ret != GRIB_SUCCESS || plpresent == 0)
+        return GRIB_SUCCESS; // No PL array. So nothing to do
+
+    if ((ret = grib_get_size(h, "pl", &plsize)) != GRIB_SUCCESS)
+        return ret;
+    if (plsize == 0) { // pl array must have at least one element
+        return GRIB_WRONG_GRID;
+    }
+
+    // If we have a PL array and PLPresent=true, then Ni must be missing
+    ret = grib_get_long(h, "Ni", &Ni);
+    if (ret == GRIB_SUCCESS && Ni != GRIB_MISSING_LONG) {
+        grib_context_log(c, GRIB_LOG_ERROR, "Invalid Ni: If there is a PL array, Ni must be set to MISSING");
+        return GRIB_WRONG_GRID;
+    }
+
+    pl = (long*)grib_context_malloc_clear(c, sizeof(long) * plsize);
+    if (!pl) {
+        return GRIB_OUT_OF_MEMORY;
+    }
+    if ((ret = grib_get_long_array(h, "pl", pl, &plsize)) != GRIB_SUCCESS)
+        return ret;
+
+    for (size_t j = 0; j < plsize; j++) {
+        if (pl[j] == 0) {
+            grib_context_log(c, GRIB_LOG_ERROR, "Invalid PL array: entry at index=%d is zero", j);
+            return GRIB_WRONG_GRID;
+        }
+    }
+    grib_context_free(c, pl);
+
+    return GRIB_SUCCESS;
+}
+
+typedef int (*proj_func)(grib_handle*);
+static proj_func check_functions[] = {
+    check_field_values,
+    check_grid_pl_array
+};
+
+int grib_accessor_message_is_valid_t::unpack_long(long* val, size_t* len)
+{
+    int ret = 0;
+    grib_handle* h = grib_handle_of_accessor(this);
+
+    *len = 1;
+    *val = 1; // Assume message is valid
+
+    char product[32] = {0,};
+    size_t size = sizeof(product) / sizeof(*product);
+    ret = grib_get_string(h, product_, product, &size);
+    if (ret) return ret;
+
+    if (!STR_EQUAL(product, "GRIB")) {
+        grib_context_log(h->context, GRIB_LOG_ERROR, "Validity checks only implemented for GRIB messages");
+        *val = 0;
+        return GRIB_NOT_IMPLEMENTED;
+    }
+
+    const size_t num_check_functions = sizeof(check_functions) / sizeof(check_functions[0]);
+    for (size_t i = 0; i < num_check_functions; ++i) {
+        proj_func cfunc = check_functions[i];
+        if ((ret = cfunc(h)) != GRIB_SUCCESS) {
+            *val = 0; // check failed
+        }
+    }
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/accessor/grib_accessor_class_message_is_valid.h b/src/accessor/grib_accessor_class_message_is_valid.h
new file mode 100644
index 000000000..5d380362c
--- /dev/null
+++ b/src/accessor/grib_accessor_class_message_is_valid.h
@@ -0,0 +1,26 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_accessor_class_long.h"
+
+class grib_accessor_message_is_valid_t : public grib_accessor_long_t
+{
+public:
+    grib_accessor_message_is_valid_t() :
+        grib_accessor_long_t() { class_name_ = "message_is_valid"; }
+    grib_accessor* create_empty_accessor() override { return new grib_accessor_message_is_valid_t{}; }
+    int unpack_long(long* val, size_t* len) override;
+    void init(const long, grib_arguments*) override;
+
+private:
+    const char* product_ = nullptr;
+};
diff --git a/src/accessor/grib_accessor_class_multdouble.cc b/src/accessor/grib_accessor_class_multdouble.cc
index f610cbfc5..af29a8444 100644
--- a/src/accessor/grib_accessor_class_multdouble.cc
+++ b/src/accessor/grib_accessor_class_multdouble.cc
@@ -18,8 +18,8 @@ void grib_accessor_multdouble_t::init(const long l, grib_arguments* c)
     grib_accessor_double_t::init(l, c);
     int n = 0;
 
-    val_        = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    multiplier_ = grib_arguments_get_double(grib_handle_of_accessor(this), c, n++);
+    val_        = c->get_name(grib_handle_of_accessor(this), n++);
+    multiplier_ = c->get_double(grib_handle_of_accessor(this), n++);
 }
 
 int grib_accessor_multdouble_t::unpack_double(double* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_nearest.h b/src/accessor/grib_accessor_class_nearest.h
index 15ed88e73..47ce6bf77 100644
--- a/src/accessor/grib_accessor_class_nearest.h
+++ b/src/accessor/grib_accessor_class_nearest.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "grib_accessor_class_gen.h"
-#include "geo_nearest/grib_nearest.h"
+#include "geo/nearest/grib_nearest.h"
 
 class grib_accessor_nearest_t : public grib_accessor_gen_t
 {
diff --git a/src/accessor/grib_accessor_class_number_of_coded_values.cc b/src/accessor/grib_accessor_class_number_of_coded_values.cc
index 4ca9d4c2b..6e05b3c3e 100644
--- a/src/accessor/grib_accessor_class_number_of_coded_values.cc
+++ b/src/accessor/grib_accessor_class_number_of_coded_values.cc
@@ -19,11 +19,11 @@ void grib_accessor_number_of_coded_values_t::init(const long l, grib_arguments*
     grib_handle* h  = grib_handle_of_accessor(this);
 
     int n             = 0;
-    bitsPerValue_     = grib_arguments_get_name(h, c, n++);
-    offsetBeforeData_ = grib_arguments_get_name(h, c, n++);
-    offsetAfterData_  = grib_arguments_get_name(h, c, n++);
-    unusedBits_       = grib_arguments_get_name(h, c, n++);
-    numberOfValues_   = grib_arguments_get_name(h, c, n++);
+    bitsPerValue_     = c->get_name(h, n++);
+    offsetBeforeData_ = c->get_name(h, n++);
+    offsetAfterData_  = c->get_name(h, n++);
+    unusedBits_       = c->get_name(h, n++);
+    numberOfValues_   = c->get_name(h, n++);
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_number_of_points.cc b/src/accessor/grib_accessor_class_number_of_points.cc
index 3fae3d9f0..bd812b08a 100644
--- a/src/accessor/grib_accessor_class_number_of_points.cc
+++ b/src/accessor/grib_accessor_class_number_of_points.cc
@@ -19,10 +19,10 @@ void grib_accessor_number_of_points_t::init(const long l, grib_arguments* c)
     int n             = 0;
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    ni_        = grib_arguments_get_name(hand, c, n++);
-    nj_        = grib_arguments_get_name(hand, c, n++);
-    plpresent_ = grib_arguments_get_name(hand, c, n++);
-    pl_        = grib_arguments_get_name(hand, c, n++);
+    ni_        = c->get_name(hand, n++);
+    nj_        = c->get_name(hand, n++);
+    plpresent_ = c->get_name(hand, n++);
+    pl_        = c->get_name(hand, n++);
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_number_of_points_gaussian.cc b/src/accessor/grib_accessor_class_number_of_points_gaussian.cc
index 73a5e17a6..4cdd5676d 100644
--- a/src/accessor/grib_accessor_class_number_of_points_gaussian.cc
+++ b/src/accessor/grib_accessor_class_number_of_points_gaussian.cc
@@ -21,16 +21,16 @@ void grib_accessor_number_of_points_gaussian_t::init(const long l, grib_argument
     int n          = 0;
     grib_handle* h = grib_handle_of_accessor(this);
 
-    ni_             = grib_arguments_get_name(h, c, n++);
-    nj_             = grib_arguments_get_name(h, c, n++);
-    plpresent_      = grib_arguments_get_name(h, c, n++);
-    pl_             = grib_arguments_get_name(h, c, n++);
-    order_          = grib_arguments_get_name(h, c, n++);
-    lat_first_      = grib_arguments_get_name(h, c, n++);
-    lon_first_      = grib_arguments_get_name(h, c, n++);
-    lat_last_       = grib_arguments_get_name(h, c, n++);
-    lon_last_       = grib_arguments_get_name(h, c, n++);
-    support_legacy_ = grib_arguments_get_name(h, c, n++);
+    ni_             = c->get_name(h, n++);
+    nj_             = c->get_name(h, n++);
+    plpresent_      = c->get_name(h, n++);
+    pl_             = c->get_name(h, n++);
+    order_          = c->get_name(h, n++);
+    lat_first_      = c->get_name(h, n++);
+    lon_first_      = c->get_name(h, n++);
+    lat_last_       = c->get_name(h, n++);
+    lon_last_       = c->get_name(h, n++);
+    support_legacy_ = c->get_name(h, n++);
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_number_of_values.cc b/src/accessor/grib_accessor_class_number_of_values.cc
index 6456d3ffe..ea553bf75 100644
--- a/src/accessor/grib_accessor_class_number_of_values.cc
+++ b/src/accessor/grib_accessor_class_number_of_values.cc
@@ -19,12 +19,12 @@ void grib_accessor_number_of_values_t::init(const long l, grib_arguments* c)
     int n             = 0;
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    values_              = grib_arguments_get_name(hand, c, n++);
-    bitsPerValue_        = grib_arguments_get_name(hand, c, n++);
-    numberOfPoints_      = grib_arguments_get_name(hand, c, n++);
-    bitmapPresent_       = grib_arguments_get_name(hand, c, n++);
-    bitmap_              = grib_arguments_get_name(hand, c, n++);
-    numberOfCodedValues_ = grib_arguments_get_name(hand, c, n++);
+    values_              = c->get_name(hand, n++);
+    bitsPerValue_        = c->get_name(hand, n++);
+    numberOfPoints_      = c->get_name(hand, n++);
+    bitmapPresent_       = c->get_name(hand, n++);
+    bitmap_              = c->get_name(hand, n++);
+    numberOfCodedValues_ = c->get_name(hand, n++);
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_number_of_values_data_raw_packing.cc b/src/accessor/grib_accessor_class_number_of_values_data_raw_packing.cc
index e76eb4197..63a2ad963 100644
--- a/src/accessor/grib_accessor_class_number_of_values_data_raw_packing.cc
+++ b/src/accessor/grib_accessor_class_number_of_values_data_raw_packing.cc
@@ -18,8 +18,8 @@ void grib_accessor_number_of_values_data_raw_packing_t::init(const long v, grib_
     grib_accessor_gen_t::init(v, args);
     int n = 0;
 
-    values_    = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    precision_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
+    values_    = args->get_name(grib_handle_of_accessor(this), n++);
+    precision_ = args->get_name(grib_handle_of_accessor(this), n++);
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     length_ = 0;
 }
diff --git a/src/accessor/grib_accessor_class_octahedral_gaussian.cc b/src/accessor/grib_accessor_class_octahedral_gaussian.cc
index bffe8b1b0..e3f9e2527 100644
--- a/src/accessor/grib_accessor_class_octahedral_gaussian.cc
+++ b/src/accessor/grib_accessor_class_octahedral_gaussian.cc
@@ -19,10 +19,10 @@ void grib_accessor_octahedral_gaussian_t::init(const long l, grib_arguments* c)
     int n             = 0;
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    N_         = grib_arguments_get_name(hand, c, n++);
-    Ni_        = grib_arguments_get_name(hand, c, n++);
-    plpresent_ = grib_arguments_get_name(hand, c, n++);
-    pl_        = grib_arguments_get_name(hand, c, n++);
+    N_         = c->get_name(hand, n++);
+    Ni_        = c->get_name(hand, n++);
+    plpresent_ = c->get_name(hand, n++);
+    pl_        = c->get_name(hand, n++);
 }
 
 /* Returns 1 (=true) if input pl array is Octahedral, 0 otherwise.
diff --git a/src/accessor/grib_accessor_class_octet_number.cc b/src/accessor/grib_accessor_class_octet_number.cc
index e54117420..b5159065d 100644
--- a/src/accessor/grib_accessor_class_octet_number.cc
+++ b/src/accessor/grib_accessor_class_octet_number.cc
@@ -18,8 +18,8 @@ void grib_accessor_octet_number_t::init(const long l, grib_arguments* c)
     grib_accessor_long_t::init(l, c);
 
     int n  = 0;
-    left_  = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    right_ = grib_arguments_get_long(grib_handle_of_accessor(this), c, n++);
+    left_  = c->get_name(grib_handle_of_accessor(this), n++);
+    right_ = c->get_long(grib_handle_of_accessor(this), n++);
 
     length_ = 0;
 }
diff --git a/src/accessor/grib_accessor_class_offset_values.cc b/src/accessor/grib_accessor_class_offset_values.cc
index a2f94d8c5..390fb8ba1 100644
--- a/src/accessor/grib_accessor_class_offset_values.cc
+++ b/src/accessor/grib_accessor_class_offset_values.cc
@@ -17,8 +17,8 @@ void grib_accessor_offset_values_t::init(const long l, grib_arguments* args)
 {
     grib_accessor_double_t::init(l, args);
     int n         = 0;
-    values_       = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    missingValue_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
+    values_       = args->get_name(grib_handle_of_accessor(this), n++);
+    missingValue_ = args->get_name(grib_handle_of_accessor(this), n++);
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     length_ = 0;
 }
diff --git a/src/accessor/grib_accessor_class_optimal_step_units.cc b/src/accessor/grib_accessor_class_optimal_step_units.cc
index feeb90a2a..a38d5ff82 100644
--- a/src/accessor/grib_accessor_class_optimal_step_units.cc
+++ b/src/accessor/grib_accessor_class_optimal_step_units.cc
@@ -21,10 +21,10 @@ void grib_accessor_optimal_step_units_t::init(const long l, grib_arguments* c)
     grib_handle* hand = grib_handle_of_accessor(this);
     int n             = 0;
 
-    forecast_time_value_ = grib_arguments_get_name(hand, c, n++);
-    forecast_time_unit_  = grib_arguments_get_name(hand, c, n++);
-    time_range_value_    = grib_arguments_get_name(hand, c, n++);
-    time_range_unit_     = grib_arguments_get_name(hand, c, n++);
+    forecast_time_value_ = c->get_name(hand, n++);
+    forecast_time_unit_  = c->get_name(hand, n++);
+    time_range_value_    = c->get_name(hand, n++);
+    time_range_unit_     = c->get_name(hand, n++);
     length_              = 0;
     overwriteStepUnits_  = eccodes::Unit{ eccodes::Unit::Value::MISSING }.value<long>();
 }
@@ -47,18 +47,18 @@ int grib_accessor_optimal_step_units_t::pack_expression(grib_expression* e)
     size_t len              = 1;
     grib_handle* hand       = grib_handle_of_accessor(this);
 
-    if (strcmp(e->cclass->name, "long") == 0) {
-        grib_expression_evaluate_long(hand, e, &lval); /* TODO: check return value */
+    if (strcmp(e->class_name(), "long") == 0) {
+        e->evaluate_long(hand, &lval); /* TODO: check return value */
         ret = pack_long(&lval, &len);
     }
     else {
         char tmp[1024];
         len  = sizeof(tmp);
-        cval = grib_expression_evaluate_string(hand, e, tmp, &len, &ret);
+        cval = e->evaluate_string(hand, tmp, &len, &ret);
         if (ret != GRIB_SUCCESS) {
             grib_context_log(context_, GRIB_LOG_ERROR,
                              "%s.%s: Unable to evaluate string %s to be set in %s",
-                             class_name_, __func__, grib_expression_get_name(e), name_);
+                             class_name_, __func__, e->get_name(), name_);
             return ret;
         }
         len = strlen(cval) + 1;
diff --git a/src/accessor/grib_accessor_class_pack_bufr_values.cc b/src/accessor/grib_accessor_class_pack_bufr_values.cc
index a80d9735f..95c64dc63 100644
--- a/src/accessor/grib_accessor_class_pack_bufr_values.cc
+++ b/src/accessor/grib_accessor_class_pack_bufr_values.cc
@@ -17,7 +17,7 @@ void grib_accessor_pack_bufr_values_t::init(const long len, grib_arguments* para
 {
     grib_accessor_gen_t::init(len, params);
     char* key;
-    key            = (char*)grib_arguments_get_name(grib_handle_of_accessor(this), params, 0);
+    key            = (char*)params->get_name(grib_handle_of_accessor(this), 0);
     data_accessor_ = grib_find_accessor(grib_handle_of_accessor(this), key);
 
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_packing_type.cc b/src/accessor/grib_accessor_class_packing_type.cc
index 1abc8d5ef..92c13a239 100644
--- a/src/accessor/grib_accessor_class_packing_type.cc
+++ b/src/accessor/grib_accessor_class_packing_type.cc
@@ -17,8 +17,8 @@ void grib_accessor_packing_type_t::init(const long l, grib_arguments* args)
 {
     grib_accessor_gen_t::init(l, args);
     int n         = 0;
-    values_       = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    packing_type_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
+    values_       = args->get_name(grib_handle_of_accessor(this), n++);
+    packing_type_ = args->get_name(grib_handle_of_accessor(this), n++);
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     length_ = 0;
 }
diff --git a/src/accessor/grib_accessor_class_pad.cc b/src/accessor/grib_accessor_class_pad.cc
index dbc151288..ca896644d 100644
--- a/src/accessor/grib_accessor_class_pad.cc
+++ b/src/accessor/grib_accessor_class_pad.cc
@@ -17,7 +17,7 @@ void grib_accessor_pad_t::init(const long len, grib_arguments* arg)
 {
     grib_accessor_padding_t::init(len, arg);
 
-    expression_ = grib_arguments_get_expression(grib_handle_of_accessor(this), arg, 0);
+    expression_ = arg->get_expression(grib_handle_of_accessor(this), 0);
     length_     = preferred_size(1);
 }
 
@@ -25,7 +25,7 @@ size_t grib_accessor_pad_t::preferred_size(int from_handle)
 {
     long length = 0;
 
-    grib_expression_evaluate_long(grib_handle_of_accessor(this), expression_, &length);
+    expression_->evaluate_long(grib_handle_of_accessor(this), &length);
 
     return length > 0 ? length : 0;
 }
diff --git a/src/accessor/grib_accessor_class_padto.cc b/src/accessor/grib_accessor_class_padto.cc
index 2f496e640..f276b37ce 100644
--- a/src/accessor/grib_accessor_class_padto.cc
+++ b/src/accessor/grib_accessor_class_padto.cc
@@ -18,7 +18,7 @@ size_t grib_accessor_padto_t::preferred_size(int from_handle)
     long length = 0;
     long theEnd;
 
-    grib_expression_evaluate_long(grib_handle_of_accessor(this), expression_, &theEnd);
+    expression_->evaluate_long(grib_handle_of_accessor(this), &theEnd);
 
     length = theEnd - offset_;
 
@@ -31,7 +31,7 @@ void grib_accessor_padto_t::init(const long len, grib_arguments* arg)
 {
     grib_accessor_padding_t::init(len, arg);
 
-    expression_ = grib_arguments_get_expression(grib_handle_of_accessor(this), arg, 0);
+    expression_ = arg->get_expression(grib_handle_of_accessor(this), 0);
     length_     = preferred_size(1);
 }
 
diff --git a/src/accessor/grib_accessor_class_padtoeven.cc b/src/accessor/grib_accessor_class_padtoeven.cc
index af1865173..872f6c5e4 100644
--- a/src/accessor/grib_accessor_class_padtoeven.cc
+++ b/src/accessor/grib_accessor_class_padtoeven.cc
@@ -39,8 +39,8 @@ void grib_accessor_padtoeven_t::init(const long len, grib_arguments* args)
 {
     grib_accessor_padding_t::init(len, args);
 
-    section_offset_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, 0);
-    section_length_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, 1);
+    section_offset_ = args->get_name(grib_handle_of_accessor(this), 0);
+    section_length_ = args->get_name(grib_handle_of_accessor(this), 1);
 
     length_ = preferred_size(1);
 }
diff --git a/src/accessor/grib_accessor_class_padtomultiple.cc b/src/accessor/grib_accessor_class_padtomultiple.cc
index 0888c526c..effcdc45c 100644
--- a/src/accessor/grib_accessor_class_padtomultiple.cc
+++ b/src/accessor/grib_accessor_class_padtomultiple.cc
@@ -19,8 +19,8 @@ size_t grib_accessor_padtomultiple_t::preferred_size(int from_handle)
     long begin    = 0;
     long multiple = 0;
 
-    grib_expression_evaluate_long(grib_handle_of_accessor(this), begin_, &begin);
-    grib_expression_evaluate_long(grib_handle_of_accessor(this), multiple_, &multiple);
+    begin_->evaluate_long(grib_handle_of_accessor(this), &begin);
+    multiple_->evaluate_long(grib_handle_of_accessor(this), &multiple);
 
     padding = offset_ - begin;
     padding = ((padding + multiple - 1) / multiple) * multiple - padding;
@@ -32,7 +32,7 @@ void grib_accessor_padtomultiple_t::init(const long len, grib_arguments* arg)
 {
     grib_accessor_padding_t::init(len, arg);
 
-    begin_    = grib_arguments_get_expression(grib_handle_of_accessor(this), arg, 0);
-    multiple_ = grib_arguments_get_expression(grib_handle_of_accessor(this), arg, 1);
+    begin_    = arg->get_expression(grib_handle_of_accessor(this), 0);
+    multiple_ = arg->get_expression(grib_handle_of_accessor(this), 1);
     length_   = preferred_size(1);
 }
diff --git a/src/accessor/grib_accessor_class_proj_string.cc b/src/accessor/grib_accessor_class_proj_string.cc
index b42da8c45..5973f7ac1 100644
--- a/src/accessor/grib_accessor_class_proj_string.cc
+++ b/src/accessor/grib_accessor_class_proj_string.cc
@@ -18,8 +18,8 @@ void grib_accessor_proj_string_t::init(const long len, grib_arguments* arg)
     grib_accessor_gen_t::init(len, arg);
     grib_handle* h = grib_handle_of_accessor(this);
 
-    grid_type_ = grib_arguments_get_name(h, arg, 0);
-    endpoint_  = grib_arguments_get_long(h, arg, 1);
+    grid_type_ = arg->get_name(h, 0);
+    endpoint_  = arg->get_long(h, 1);
     length_    = 0;
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     flags_ |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
diff --git a/src/accessor/grib_accessor_class_raw.cc b/src/accessor/grib_accessor_class_raw.cc
index 2196bd668..b27a83b43 100644
--- a/src/accessor/grib_accessor_class_raw.cc
+++ b/src/accessor/grib_accessor_class_raw.cc
@@ -23,11 +23,11 @@ void grib_accessor_raw_t::init(const long len, grib_arguments* arg)
     grib_handle* hand = grib_handle_of_accessor(this);
 
     length_        = 0;
-    totalLength_   = grib_arguments_get_name(hand, arg, n++);
-    sectionLength_ = grib_arguments_get_name(hand, arg, n++);
+    totalLength_   = arg->get_name(hand, n++);
+    sectionLength_ = arg->get_name(hand, n++);
 
-    e   = grib_arguments_get_expression(hand, arg, n++);
-    err = grib_expression_evaluate_long(hand, e, &(relativeOffset_));
+    e   = arg->get_expression(hand, n++);
+    err = e->evaluate_long(hand, &(relativeOffset_));
     if (err)
         grib_context_log(hand->context, GRIB_LOG_ERROR, "Unable to evaluate relativeOffset");
 
diff --git a/src/accessor/grib_accessor_class_rdbtime_guess_date.cc b/src/accessor/grib_accessor_class_rdbtime_guess_date.cc
index 55c545eec..90ea3dc78 100644
--- a/src/accessor/grib_accessor_class_rdbtime_guess_date.cc
+++ b/src/accessor/grib_accessor_class_rdbtime_guess_date.cc
@@ -19,11 +19,11 @@ void grib_accessor_rdbtime_guess_date_t::init(const long l, grib_arguments* c)
     grib_accessor_long_t::init(l, c);
     int n = 0;
 
-    typicalYear_  = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    typicalMonth_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    typicalDay_   = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    rdbDay_       = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    yearOrMonth_  = grib_arguments_get_long(grib_handle_of_accessor(this), c, n++);
+    typicalYear_  = c->get_name(grib_handle_of_accessor(this), n++);
+    typicalMonth_ = c->get_name(grib_handle_of_accessor(this), n++);
+    typicalDay_   = c->get_name(grib_handle_of_accessor(this), n++);
+    rdbDay_       = c->get_name(grib_handle_of_accessor(this), n++);
+    yearOrMonth_  = c->get_long(grib_handle_of_accessor(this), n++);
 
     /* flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY; */
 }
diff --git a/src/accessor/grib_accessor_class_reference_value_error.cc b/src/accessor/grib_accessor_class_reference_value_error.cc
index 923b9e95b..8b444f9c8 100644
--- a/src/accessor/grib_accessor_class_reference_value_error.cc
+++ b/src/accessor/grib_accessor_class_reference_value_error.cc
@@ -19,8 +19,8 @@ void grib_accessor_reference_value_error_t::init(const long l, grib_arguments* c
     grib_accessor_double_t::init(l, c);
     int n = 0;
 
-    referenceValue_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    floatType_      = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    referenceValue_ = c->get_name(grib_handle_of_accessor(this), n++);
+    floatType_      = c->get_name(grib_handle_of_accessor(this), n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_round.cc b/src/accessor/grib_accessor_class_round.cc
index 80b0f601d..f141a94a7 100644
--- a/src/accessor/grib_accessor_class_round.cc
+++ b/src/accessor/grib_accessor_class_round.cc
@@ -39,12 +39,12 @@ int grib_accessor_round_t::unpack_double(double* val, size_t* len)
     double toround            = 0;
 
     const char* oval = NULL;
-    oval             = grib_arguments_get_name(grib_handle_of_accessor(this), arg_, 0);
+    oval             = arg_->get_name(grib_handle_of_accessor(this), 0);
 
     if ((ret = grib_get_double_internal(grib_handle_of_accessor(this), oval, &toround)) != 0)
         return ret;
 
-    rounding_precision = grib_arguments_get_long(grib_handle_of_accessor(this), arg_, 1);
+    rounding_precision = arg_->get_long(grib_handle_of_accessor(this), 1);
 
     rounded = floor(rounding_precision * toround + 0.5) / rounding_precision;
 
diff --git a/src/accessor/grib_accessor_class_scale.cc b/src/accessor/grib_accessor_class_scale.cc
index 284a9ed51..2779c1c5b 100644
--- a/src/accessor/grib_accessor_class_scale.cc
+++ b/src/accessor/grib_accessor_class_scale.cc
@@ -19,10 +19,10 @@ void grib_accessor_scale_t::init(const long l, grib_arguments* c)
     grib_accessor_double_t::init(l, c);
     int n = 0;
 
-    value_      = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    multiplier_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    divisor_    = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    truncating_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    value_      = c->get_name(grib_handle_of_accessor(this), n++);
+    multiplier_ = c->get_name(grib_handle_of_accessor(this), n++);
+    divisor_    = c->get_name(grib_handle_of_accessor(this), n++);
+    truncating_ = c->get_name(grib_handle_of_accessor(this), n++);
 }
 
 int grib_accessor_scale_t::unpack_double(double* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_scale_values.cc b/src/accessor/grib_accessor_class_scale_values.cc
index 651603254..f6d0c3f49 100644
--- a/src/accessor/grib_accessor_class_scale_values.cc
+++ b/src/accessor/grib_accessor_class_scale_values.cc
@@ -18,8 +18,8 @@ void grib_accessor_scale_values_t::init(const long l, grib_arguments* args)
 {
     grib_accessor_double_t::init(l, args);
     int n         = 0;
-    values_       = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    missingValue_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
+    values_       = args->get_name(grib_handle_of_accessor(this), n++);
+    missingValue_ = args->get_name(grib_handle_of_accessor(this), n++);
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     length_ = 0;
 }
diff --git a/src/accessor/grib_accessor_class_second_order_bits_per_value.cc b/src/accessor/grib_accessor_class_second_order_bits_per_value.cc
index 1cdad1545..d7fa954c7 100644
--- a/src/accessor/grib_accessor_class_second_order_bits_per_value.cc
+++ b/src/accessor/grib_accessor_class_second_order_bits_per_value.cc
@@ -52,9 +52,9 @@ void grib_accessor_second_order_bits_per_value_t::init(const long l, grib_argume
 {
     grib_accessor_long_t::init(l, c);
     int n               = 0;
-    values_             = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    binaryScaleFactor_  = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    decimalScaleFactor_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    values_             = c->get_name(grib_handle_of_accessor(this), n++);
+    binaryScaleFactor_  = c->get_name(grib_handle_of_accessor(this), n++);
+    decimalScaleFactor_ = c->get_name(grib_handle_of_accessor(this), n++);
     bitsPerValue_       = 0;
 
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_section_pointer.cc b/src/accessor/grib_accessor_class_section_pointer.cc
index c584bf7c3..973e39e76 100644
--- a/src/accessor/grib_accessor_class_section_pointer.cc
+++ b/src/accessor/grib_accessor_class_section_pointer.cc
@@ -18,9 +18,9 @@ void grib_accessor_section_pointer_t::init(const long len, grib_arguments* arg)
     grib_accessor_gen_t::init(len, arg);
 
     int n          = 0;
-    sectionOffset_ = grib_arguments_get_name(grib_handle_of_accessor(this), arg, n++);
-    sectionLength_ = grib_arguments_get_name(grib_handle_of_accessor(this), arg, n++);
-    sectionNumber_ = grib_arguments_get_long(grib_handle_of_accessor(this), arg, n++);
+    sectionOffset_ = arg->get_name(grib_handle_of_accessor(this), n++);
+    sectionLength_ = arg->get_name(grib_handle_of_accessor(this), n++);
+    sectionNumber_ = arg->get_long(grib_handle_of_accessor(this), n++);
 
     Assert(sectionNumber_ < MAX_NUM_SECTIONS);
 
diff --git a/src/accessor/grib_accessor_class_select_step_template.cc b/src/accessor/grib_accessor_class_select_step_template.cc
index e37f62fa3..b661f548e 100644
--- a/src/accessor/grib_accessor_class_select_step_template.cc
+++ b/src/accessor/grib_accessor_class_select_step_template.cc
@@ -19,8 +19,8 @@ void grib_accessor_select_step_template_t::init(const long l, grib_arguments* c)
     grib_handle* hand = grib_handle_of_accessor(this);
     int n             = 0;
 
-    productDefinitionTemplateNumber_ = grib_arguments_get_name(hand, c, n++);
-    instant_                         = grib_arguments_get_long(hand, c, n++);
+    productDefinitionTemplateNumber_ = c->get_name(hand, n++);
+    instant_                         = c->get_long(hand, n++);
 }
 
 int grib_accessor_select_step_template_t::unpack_long(long* val, size_t* len)
@@ -70,7 +70,7 @@ int grib_accessor_select_step_template_t::pack_long(const long* val, size_t* len
                 productDefinitionTemplateNumberNew = 41;
                 break;
             case 46:                                      // DET aerosol
-                productDefinitionTemplateNumberNew = 48;  // 44 is deprecated
+                productDefinitionTemplateNumberNew = 50;  // ECC-1963: 44 is deprecated
                 break;
             case 47:  // ENS aerosol
                 productDefinitionTemplateNumberNew = 45;
diff --git a/src/accessor/grib_accessor_class_sexagesimal2decimal.cc b/src/accessor/grib_accessor_class_sexagesimal2decimal.cc
index a95cd4fe9..0ea176d47 100644
--- a/src/accessor/grib_accessor_class_sexagesimal2decimal.cc
+++ b/src/accessor/grib_accessor_class_sexagesimal2decimal.cc
@@ -32,9 +32,7 @@ long grib_accessor_sexagesimal2decimal_t::get_native_type()
 int grib_accessor_sexagesimal2decimal_t::unpack_string(char* val, size_t* len)
 {
     int err        = 0;
-    char buff[512] = {
-        0,
-    };
+    char buff[512] = {0,};
     size_t length = 0;
     size_t size   = sizeof(buff);
     char* p       = 0;
diff --git a/src/accessor/grib_accessor_class_signed.cc b/src/accessor/grib_accessor_class_signed.cc
index d3b34203e..ab7bb51ed 100644
--- a/src/accessor/grib_accessor_class_signed.cc
+++ b/src/accessor/grib_accessor_class_signed.cc
@@ -150,7 +150,7 @@ int grib_accessor_signed_t::pack_long(const long* val, size_t* len)
         grib_encode_signed_long(buf, val[i], off, length_);
         off += length_;
     }
-    ret = grib_set_long_internal(grib_handle_of_accessor(this), grib_arguments_get_name(parent_->h, arg_, 0), *len);
+    ret = grib_set_long_internal(grib_handle_of_accessor(this), arg_->get_name(parent_->h, 0), *len);
 
     if (ret == GRIB_SUCCESS)
         grib_buffer_replace(this, buf, buflen, 1, 1);
@@ -173,7 +173,7 @@ int grib_accessor_signed_t::value_count(long* len)
         *len = 1;
         return 0;
     }
-    return grib_get_long_internal(grib_handle_of_accessor(this), grib_arguments_get_name(parent_->h, arg_, 0), len);
+    return grib_get_long_internal(grib_handle_of_accessor(this), arg_->get_name(parent_->h, 0), len);
 }
 
 long grib_accessor_signed_t::byte_offset()
diff --git a/src/accessor/grib_accessor_class_signed_bits.cc b/src/accessor/grib_accessor_class_signed_bits.cc
index af75c55cf..5d969757f 100644
--- a/src/accessor/grib_accessor_class_signed_bits.cc
+++ b/src/accessor/grib_accessor_class_signed_bits.cc
@@ -45,8 +45,8 @@ void grib_accessor_signed_bits_t::init(const long len, grib_arguments* args)
 {
     grib_accessor_long_t::init(len, args);
     int n             = 0;
-    numberOfBits_     = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    numberOfElements_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
+    numberOfBits_     = args->get_name(grib_handle_of_accessor(this), n++);
+    numberOfElements_ = args->get_name(grib_handle_of_accessor(this), n++);
     length_           = compute_byte_count();
 }
 
diff --git a/src/accessor/grib_accessor_class_simple_packing_error.cc b/src/accessor/grib_accessor_class_simple_packing_error.cc
index 063d4bd84..efd903177 100644
--- a/src/accessor/grib_accessor_class_simple_packing_error.cc
+++ b/src/accessor/grib_accessor_class_simple_packing_error.cc
@@ -20,11 +20,11 @@ void grib_accessor_simple_packing_error_t::init(const long l, grib_arguments* c)
     int n          = 0;
     grib_handle* h = grib_handle_of_accessor(this);
 
-    bitsPerValue_       = grib_arguments_get_name(h, c, n++);
-    binaryScaleFactor_  = grib_arguments_get_name(h, c, n++);
-    decimalScaleFactor_ = grib_arguments_get_name(h, c, n++);
-    referenceValue_     = grib_arguments_get_name(h, c, n++);
-    floatType_          = grib_arguments_get_name(h, c, n++);
+    bitsPerValue_       = c->get_name(h, n++);
+    binaryScaleFactor_  = c->get_name(h, n++);
+    decimalScaleFactor_ = c->get_name(h, n++);
+    referenceValue_     = c->get_name(h, n++);
+    floatType_          = c->get_name(h, n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_size.cc b/src/accessor/grib_accessor_class_size.cc
index 41a2e1078..d20023967 100644
--- a/src/accessor/grib_accessor_class_size.cc
+++ b/src/accessor/grib_accessor_class_size.cc
@@ -17,7 +17,7 @@ grib_accessor* grib_accessor_size = &_grib_accessor_size;
 void grib_accessor_size_t::init(const long l, grib_arguments* c)
 {
     grib_accessor_long_t::init(l, c);
-    accessor_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, 0);
+    accessor_ = c->get_name(grib_handle_of_accessor(this), 0);
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_smart_table.cc b/src/accessor/grib_accessor_class_smart_table.cc
index 1499c3f3d..e41e8a0a0 100644
--- a/src/accessor/grib_accessor_class_smart_table.cc
+++ b/src/accessor/grib_accessor_class_smart_table.cc
@@ -49,13 +49,13 @@ void grib_accessor_smart_table_t::init(const long len, grib_arguments* params)
     int n             = 0;
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    values_      = grib_arguments_get_name(hand, params, n++);
-    tablename_   = grib_arguments_get_string(hand, params, n++);
-    masterDir_   = grib_arguments_get_name(hand, params, n++);
-    localDir_    = grib_arguments_get_name(hand, params, n++);
-    widthOfCode_ = grib_arguments_get_long(hand, params, n++);
-    extraDir_    = grib_arguments_get_name(hand, params, n++);
-    extraTable_  = grib_arguments_get_string(hand, params, n++);
+    values_      = params->get_name(hand, n++);
+    tablename_   = params->get_string(hand, n++);
+    masterDir_   = params->get_name(hand, n++);
+    localDir_    = params->get_name(hand, n++);
+    widthOfCode_ = params->get_long(hand, n++);
+    extraDir_    = params->get_name(hand, n++);
+    extraTable_  = params->get_string(hand, n++);
 
     grib_accessor_unsigned_t::length_ = 0;
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
diff --git a/src/accessor/grib_accessor_class_smart_table_column.cc b/src/accessor/grib_accessor_class_smart_table_column.cc
index 2384d7234..ee7967634 100644
--- a/src/accessor/grib_accessor_class_smart_table_column.cc
+++ b/src/accessor/grib_accessor_class_smart_table_column.cc
@@ -19,8 +19,8 @@ void grib_accessor_smart_table_column_t::init(const long len, grib_arguments* pa
     grib_accessor_gen_t::init(len, params);
     int n = 0;
 
-    smartTable_ = grib_arguments_get_name(grib_handle_of_accessor(this), params, n++);
-    index_      = grib_arguments_get_long(grib_handle_of_accessor(this), params, n++);
+    smartTable_ = params->get_name(grib_handle_of_accessor(this), n++);
+    index_      = params->get_long(grib_handle_of_accessor(this), n++);
 
     length_ = 0;
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
@@ -48,9 +48,7 @@ int grib_accessor_smart_table_column_t::unpack_string_array(char** buffer, size_
     size_t size = 1;
     long* code;
     int err        = GRIB_SUCCESS;
-    char tmp[1024] = {
-        0,
-    };
+    char tmp[1024] = {0,};
     int i = 0;
 
     tableAccessor = (grib_accessor_smart_table_t*)grib_find_accessor(grib_handle_of_accessor(this), smartTable_);
diff --git a/src/accessor/grib_accessor_class_spd.cc b/src/accessor/grib_accessor_class_spd.cc
index 8d0df9bad..f19fc7439 100644
--- a/src/accessor/grib_accessor_class_spd.cc
+++ b/src/accessor/grib_accessor_class_spd.cc
@@ -45,8 +45,8 @@ void grib_accessor_spd_t::init(const long len, grib_arguments* args)
 {
     grib_accessor_long_t::init(len, args);
     int n             = 0;
-    numberOfBits_     = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    numberOfElements_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
+    numberOfBits_     = args->get_name(grib_handle_of_accessor(this), n++);
+    numberOfElements_ = args->get_name(grib_handle_of_accessor(this), n++);
     length_           = compute_byte_count();
 }
 
diff --git a/src/accessor/grib_accessor_class_spectral_truncation.cc b/src/accessor/grib_accessor_class_spectral_truncation.cc
index a7c2c0a5d..e64b854ec 100644
--- a/src/accessor/grib_accessor_class_spectral_truncation.cc
+++ b/src/accessor/grib_accessor_class_spectral_truncation.cc
@@ -18,10 +18,10 @@ void grib_accessor_spectral_truncation_t::init(const long l, grib_arguments* c)
     grib_accessor_long_t::init(l, c);
     int n = 0;
 
-    J_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    K_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    M_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    T_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    J_ = c->get_name(grib_handle_of_accessor(this), n++);
+    K_ = c->get_name(grib_handle_of_accessor(this), n++);
+    M_ = c->get_name(grib_handle_of_accessor(this), n++);
+    T_ = c->get_name(grib_handle_of_accessor(this), n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
diff --git a/src/accessor/grib_accessor_class_sprintf.cc b/src/accessor/grib_accessor_class_sprintf.cc
index 075596edb..7b18ac3c2 100644
--- a/src/accessor/grib_accessor_class_sprintf.cc
+++ b/src/accessor/grib_accessor_class_sprintf.cc
@@ -36,7 +36,7 @@ int grib_accessor_sprintf_t::unpack_string(char* val, size_t* len)
     const char* tempname = NULL;
     size_t uname_len     = 0;
 
-    uname = grib_arguments_get_string(grib_handle_of_accessor(this), args_, carg++);
+    uname = args_->get_string(grib_handle_of_accessor(this), carg++);
     snprintf(result, sizeof(result), "%s", "");
     uname_len = strlen(uname);
 
@@ -54,7 +54,7 @@ int grib_accessor_sprintf_t::unpack_string(char* val, size_t* len)
             }
             switch (uname[i]) {
                 case 'd':
-                    tempname = grib_arguments_get_name(grib_handle_of_accessor(this), args_, carg++);
+                    tempname = args_->get_name(grib_handle_of_accessor(this), carg++);
 
                     if ((ret = grib_get_long_internal(grib_handle_of_accessor(this), tempname, &ires)) != GRIB_SUCCESS)
                         return ret;
@@ -80,7 +80,7 @@ int grib_accessor_sprintf_t::unpack_string(char* val, size_t* len)
                     break;
 
                 case 'g':
-                    tempname = grib_arguments_get_name(grib_handle_of_accessor(this), args_, carg++);
+                    tempname = args_->get_name(grib_handle_of_accessor(this), carg++);
                     if ((ret = grib_get_double_internal(grib_handle_of_accessor(this), tempname, &dres)) != GRIB_SUCCESS)
                         return ret;
                     snprintf(tempBuffer, sizeof(tempBuffer), "%s%g", result, dres);
@@ -89,7 +89,7 @@ int grib_accessor_sprintf_t::unpack_string(char* val, size_t* len)
                     break;
 
                 case 's':
-                    tempname = grib_arguments_get_name(grib_handle_of_accessor(this), args_, carg++);
+                    tempname = args_->get_name(grib_handle_of_accessor(this), carg++);
                     if ((ret = grib_get_string_internal(grib_handle_of_accessor(this), tempname, sres, &replen)) != GRIB_SUCCESS)
                         return ret;
                     snprintf(tempBuffer, sizeof(tempBuffer), "%s%s", result, sres);
diff --git a/src/accessor/grib_accessor_class_statistics.cc b/src/accessor/grib_accessor_class_statistics.cc
index b2fc3078d..8434f24ac 100644
--- a/src/accessor/grib_accessor_class_statistics.cc
+++ b/src/accessor/grib_accessor_class_statistics.cc
@@ -18,8 +18,8 @@ void grib_accessor_statistics_t::init(const long l, grib_arguments* c)
     grib_accessor_abstract_vector_t::init(l, c);
     int n = 0;
 
-    missing_value_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    values_        = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    missing_value_ = c->get_name(grib_handle_of_accessor(this), n++);
+    values_        = c->get_name(grib_handle_of_accessor(this), n++);
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     flags_ |= GRIB_ACCESSOR_FLAG_HIDDEN;
diff --git a/src/accessor/grib_accessor_class_statistics_spectral.cc b/src/accessor/grib_accessor_class_statistics_spectral.cc
index 5a092e25b..ff2218201 100644
--- a/src/accessor/grib_accessor_class_statistics_spectral.cc
+++ b/src/accessor/grib_accessor_class_statistics_spectral.cc
@@ -19,11 +19,11 @@ void grib_accessor_statistics_spectral_t::init(const long l, grib_arguments* c)
     int n = 0;
     grib_handle* h  = grib_handle_of_accessor(this);
 
-    values_ = grib_arguments_get_name(h, c, n++);
-    J_      = grib_arguments_get_name(h, c, n++);
-    K_      = grib_arguments_get_name(h, c, n++);
-    M_      = grib_arguments_get_name(h, c, n++);
-    JS_     = grib_arguments_get_name(h, c, n++);
+    values_ = c->get_name(h, n++);
+    J_      = c->get_name(h, n++);
+    K_      = c->get_name(h, n++);
+    M_      = c->get_name(h, n++);
+    JS_     = c->get_name(h, n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
diff --git a/src/accessor/grib_accessor_class_step_human_readable.cc b/src/accessor/grib_accessor_class_step_human_readable.cc
index 20f6ed199..1c77de2a7 100644
--- a/src/accessor/grib_accessor_class_step_human_readable.cc
+++ b/src/accessor/grib_accessor_class_step_human_readable.cc
@@ -19,8 +19,8 @@ void grib_accessor_step_human_readable_t::init(const long len, grib_arguments* p
     int n          = 0;
     grib_handle* h = grib_handle_of_accessor(this);
 
-    stepUnits_ = grib_arguments_get_name(h, params, n++);
-    step_      = grib_arguments_get_name(h, params, n++);
+    stepUnits_ = params->get_name(h, n++);
+    step_      = params->get_name(h, n++);
     length_    = 0;
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
diff --git a/src/accessor/grib_accessor_class_step_in_units.cc b/src/accessor/grib_accessor_class_step_in_units.cc
index d63a13c76..8d87aa91f 100644
--- a/src/accessor/grib_accessor_class_step_in_units.cc
+++ b/src/accessor/grib_accessor_class_step_in_units.cc
@@ -21,11 +21,11 @@ void grib_accessor_step_in_units_t::init(const long l, grib_arguments* c)
     grib_handle* hand = grib_handle_of_accessor(this);
     int n             = 0;
 
-    forecast_time_value_ = grib_arguments_get_name(hand, c, n++);
-    forecast_time_unit_  = grib_arguments_get_name(hand, c, n++);
-    step_units_          = grib_arguments_get_name(hand, c, n++);
-    time_range_unit_     = grib_arguments_get_name(hand, c, n++);
-    time_range_value_    = grib_arguments_get_name(hand, c, n++);
+    forecast_time_value_ = c->get_name(hand, n++);
+    forecast_time_unit_  = c->get_name(hand, n++);
+    step_units_          = c->get_name(hand, n++);
+    time_range_unit_     = c->get_name(hand, n++);
+    time_range_value_    = c->get_name(hand, n++);
 }
 
 void grib_accessor_step_in_units_t::dump(grib_dumper* dumper)
diff --git a/src/accessor/grib_accessor_class_sum.cc b/src/accessor/grib_accessor_class_sum.cc
index d23706077..78902eae4 100644
--- a/src/accessor/grib_accessor_class_sum.cc
+++ b/src/accessor/grib_accessor_class_sum.cc
@@ -17,7 +17,7 @@ void grib_accessor_sum_t::init(const long l, grib_arguments* c)
 {
     grib_accessor_double_t::init(l, c);
     int n   = 0;
-    values_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
+    values_ = c->get_name(grib_handle_of_accessor(this), n++);
     length_ = 0;
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
diff --git a/src/accessor/grib_accessor_class_suppressed.cc b/src/accessor/grib_accessor_class_suppressed.cc
index f0de3960f..02a87fc7a 100644
--- a/src/accessor/grib_accessor_class_suppressed.cc
+++ b/src/accessor/grib_accessor_class_suppressed.cc
@@ -31,9 +31,9 @@ void grib_accessor_suppressed_t::log_message()
                      "key '%s' is unavailable in this version.", name_);
     grib_context_log(context_, GRIB_LOG_ERROR,
                      "Please use the following key(s):");
-    while (grib_arguments_get_name(hand, args_, i)) {
+    while (args_->get_name(hand, i)) {
         grib_context_log(context_, GRIB_LOG_ERROR, "\t- %s",
-                         grib_arguments_get_name(hand, args_, i));
+                         args_->get_name(hand, i));
         i++;
     }
 }
diff --git a/src/accessor/grib_accessor_class_time.cc b/src/accessor/grib_accessor_class_time.cc
index ce647581b..564b15d78 100644
--- a/src/accessor/grib_accessor_class_time.cc
+++ b/src/accessor/grib_accessor_class_time.cc
@@ -19,9 +19,9 @@ void grib_accessor_time_t::init(const long l, grib_arguments* c)
     grib_handle* hand = grib_handle_of_accessor(this);
     int n             = 0;
 
-    hour_   = grib_arguments_get_name(hand, c, n++);
-    minute_ = grib_arguments_get_name(hand, c, n++);
-    second_ = grib_arguments_get_name(hand, c, n++);
+    hour_   = c->get_name(hand, n++);
+    minute_ = c->get_name(hand, n++);
+    second_ = c->get_name(hand, n++);
 }
 
 int grib_accessor_time_t::unpack_long(long* val, size_t* len)
diff --git a/src/accessor/grib_accessor_class_to_double.cc b/src/accessor/grib_accessor_class_to_double.cc
index 462af1b59..af37d911a 100644
--- a/src/accessor/grib_accessor_class_to_double.cc
+++ b/src/accessor/grib_accessor_class_to_double.cc
@@ -18,10 +18,10 @@ void grib_accessor_to_double_t::init(const long len, grib_arguments* arg)
     grib_accessor_gen_t::init(len, arg);
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    key_        = grib_arguments_get_name(hand, arg, 0);
-    start_      = grib_arguments_get_long(hand, arg, 1);
-    str_length_ = grib_arguments_get_long(hand, arg, 2);
-    scale_      = grib_arguments_get_long(hand, arg, 3);
+    key_        = arg->get_name(hand, 0);
+    start_      = arg->get_long(hand, 1);
+    str_length_ = arg->get_long(hand, 2);
+    scale_      = arg->get_long(hand, 3);
     if (!scale_)
         scale_ = 1;
 
diff --git a/src/accessor/grib_accessor_class_to_integer.cc b/src/accessor/grib_accessor_class_to_integer.cc
index 33b7489ed..babb001aa 100644
--- a/src/accessor/grib_accessor_class_to_integer.cc
+++ b/src/accessor/grib_accessor_class_to_integer.cc
@@ -18,9 +18,9 @@ void grib_accessor_to_integer_t::init(const long len, grib_arguments* arg)
     grib_accessor_gen_t::init(len, arg);
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    key_        = grib_arguments_get_name(hand, arg, 0);
-    start_      = grib_arguments_get_long(hand, arg, 1);
-    str_length_ = grib_arguments_get_long(hand, arg, 2);
+    key_        = arg->get_name(hand, 0);
+    start_      = arg->get_long(hand, 1);
+    str_length_ = arg->get_long(hand, 2);
 
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     grib_accessor::length_ = 0;
diff --git a/src/accessor/grib_accessor_class_to_string.cc b/src/accessor/grib_accessor_class_to_string.cc
index 2ac2d2a76..454c5d384 100644
--- a/src/accessor/grib_accessor_class_to_string.cc
+++ b/src/accessor/grib_accessor_class_to_string.cc
@@ -18,9 +18,9 @@ void grib_accessor_to_string_t::init(const long len, grib_arguments* arg)
     grib_accessor_gen_t::init(len, arg);
     grib_handle* hand = grib_handle_of_accessor(this);
 
-    key_        = grib_arguments_get_name(hand, arg, 0);
-    start_      = grib_arguments_get_long(hand, arg, 1);
-    str_length_ = grib_arguments_get_long(hand, arg, 2);
+    key_        = arg->get_name(hand, 0);
+    start_      = arg->get_long(hand, 1);
+    str_length_ = arg->get_long(hand, 2);
 
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     grib_accessor_gen_t::length_ = 0;
diff --git a/src/accessor/grib_accessor_class_trim.cc b/src/accessor/grib_accessor_class_trim.cc
index e8364eef0..26eb72181 100644
--- a/src/accessor/grib_accessor_class_trim.cc
+++ b/src/accessor/grib_accessor_class_trim.cc
@@ -19,9 +19,9 @@ void grib_accessor_trim_t::init(const long l, grib_arguments* arg)
     int n          = 0;
     grib_handle* h = grib_handle_of_accessor(this);
 
-    input_      = grib_arguments_get_name(h, arg, n++);
-    trim_left_  = grib_arguments_get_long(h, arg, n++);
-    trim_right_ = grib_arguments_get_long(h, arg, n++);
+    input_      = arg->get_name(h, n++);
+    trim_left_  = arg->get_long(h, n++);
+    trim_right_ = arg->get_long(h, n++);
     DEBUG_ASSERT(trim_left_ == 0 || trim_left_ == 1);
     DEBUG_ASSERT(trim_right_ == 0 || trim_right_ == 1);
 }
diff --git a/src/accessor/grib_accessor_class_unexpanded_descriptors.cc b/src/accessor/grib_accessor_class_unexpanded_descriptors.cc
index 7c4ddd602..a822cb595 100644
--- a/src/accessor/grib_accessor_class_unexpanded_descriptors.cc
+++ b/src/accessor/grib_accessor_class_unexpanded_descriptors.cc
@@ -20,8 +20,8 @@ void grib_accessor_unexpanded_descriptors_t::init(const long len, grib_arguments
 
     int n                         = 0;
     grib_handle* hand             = grib_handle_of_accessor(this);
-    unexpandedDescriptorsEncoded_ = grib_find_accessor(hand, grib_arguments_get_name(hand, args, n++));
-    createNewData_                = grib_arguments_get_name(hand, args, n++);
+    unexpandedDescriptorsEncoded_ = grib_find_accessor(hand, args->get_name(hand, n++));
+    createNewData_                = args->get_name(hand, n++);
     length_                       = 0;
 }
 
diff --git a/src/accessor/grib_accessor_class_unpack_bufr_values.cc b/src/accessor/grib_accessor_class_unpack_bufr_values.cc
index be36e9a2d..2fc0de51f 100644
--- a/src/accessor/grib_accessor_class_unpack_bufr_values.cc
+++ b/src/accessor/grib_accessor_class_unpack_bufr_values.cc
@@ -17,7 +17,7 @@ void grib_accessor_unpack_bufr_values_t::init(const long len, grib_arguments* pa
 {
     grib_accessor_gen_t::init(len, params);
     char* key;
-    key            = (char*)grib_arguments_get_name(grib_handle_of_accessor(this), params, 0);
+    key            = (char*)params->get_name(grib_handle_of_accessor(this), 0);
     data_accessor_ = dynamic_cast<grib_accessor_bufr_data_array_t*>(grib_find_accessor(grib_handle_of_accessor(this), key));
 
     length_ = 0;
diff --git a/src/accessor/grib_accessor_class_unsigned.cc b/src/accessor/grib_accessor_class_unsigned.cc
index a00c0b603..4198158c3 100644
--- a/src/accessor/grib_accessor_class_unsigned.cc
+++ b/src/accessor/grib_accessor_class_unsigned.cc
@@ -146,7 +146,7 @@ int grib_accessor_unsigned_t::pack_long_unsigned_helper(const long* val, size_t*
     for (i = 0; i < *len; i++)
         grib_encode_unsigned_long(buf, val[i], &off, nbytes_ * 8);
 
-    ret = grib_set_long_internal(grib_handle_of_accessor(this), grib_arguments_get_name(parent_->h, arg_, 0), *len);
+    ret = grib_set_long_internal(grib_handle_of_accessor(this), arg_->get_name(parent_->h, 0), *len);
 
     if (ret == GRIB_SUCCESS)
         grib_buffer_replace(this, buf, buflen, 1, 1);
@@ -217,7 +217,7 @@ int grib_accessor_unsigned_t::value_count(long* len)
         *len = 1;
         return 0;
     }
-    return grib_get_long_internal(grib_handle_of_accessor(this), grib_arguments_get_name(parent_->h, arg_, 0), len);
+    return grib_get_long_internal(grib_handle_of_accessor(this), arg_->get_name(parent_->h, 0), len);
 }
 
 long grib_accessor_unsigned_t::byte_offset()
diff --git a/src/accessor/grib_accessor_class_unsigned_bits.cc b/src/accessor/grib_accessor_class_unsigned_bits.cc
index eeb34614d..d4281b2e2 100644
--- a/src/accessor/grib_accessor_class_unsigned_bits.cc
+++ b/src/accessor/grib_accessor_class_unsigned_bits.cc
@@ -40,8 +40,8 @@ void grib_accessor_unsigned_bits_t::init(const long len, grib_arguments* args)
 {
     grib_accessor_long_t::init(len, args);
     int n             = 0;
-    numberOfBits_     = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
-    numberOfElements_ = grib_arguments_get_name(grib_handle_of_accessor(this), args, n++);
+    numberOfBits_     = args->get_name(grib_handle_of_accessor(this), n++);
+    numberOfElements_ = args->get_name(grib_handle_of_accessor(this), n++);
     length_           = compute_byte_count();
 }
 
diff --git a/src/accessor/grib_accessor_class_validity_date.cc b/src/accessor/grib_accessor_class_validity_date.cc
index c9b89d42b..9ab19f843 100644
--- a/src/accessor/grib_accessor_class_validity_date.cc
+++ b/src/accessor/grib_accessor_class_validity_date.cc
@@ -19,13 +19,13 @@ void grib_accessor_validity_date_t::init(const long l, grib_arguments* c)
     grib_handle* hand = grib_handle_of_accessor(this);
     int n             = 0;
 
-    date_      = grib_arguments_get_name(hand, c, n++);
-    time_      = grib_arguments_get_name(hand, c, n++);
-    step_      = grib_arguments_get_name(hand, c, n++);
-    stepUnits_ = grib_arguments_get_name(hand, c, n++);
-    year_      = grib_arguments_get_name(hand, c, n++);
-    month_     = grib_arguments_get_name(hand, c, n++);
-    day_       = grib_arguments_get_name(hand, c, n++);
+    date_      = c->get_name(hand, n++);
+    time_      = c->get_name(hand, n++);
+    step_      = c->get_name(hand, n++);
+    stepUnits_ = c->get_name(hand, n++);
+    year_      = c->get_name(hand, n++);
+    month_     = c->get_name(hand, n++);
+    day_       = c->get_name(hand, n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
diff --git a/src/accessor/grib_accessor_class_validity_time.cc b/src/accessor/grib_accessor_class_validity_time.cc
index d4b6f4865..518297280 100644
--- a/src/accessor/grib_accessor_class_validity_time.cc
+++ b/src/accessor/grib_accessor_class_validity_time.cc
@@ -19,12 +19,12 @@ void grib_accessor_validity_time_t::init(const long l, grib_arguments* c)
     grib_handle* hand = grib_handle_of_accessor(this);
     int n             = 0;
 
-    date_      = grib_arguments_get_name(hand, c, n++);
-    time_      = grib_arguments_get_name(hand, c, n++);
-    step_      = grib_arguments_get_name(hand, c, n++);
-    stepUnits_ = grib_arguments_get_name(hand, c, n++);
-    hours_     = grib_arguments_get_name(hand, c, n++);
-    minutes_   = grib_arguments_get_name(hand, c, n++);
+    date_      = c->get_name(hand, n++);
+    time_      = c->get_name(hand, n++);
+    step_      = c->get_name(hand, n++);
+    stepUnits_ = c->get_name(hand, n++);
+    hours_     = c->get_name(hand, n++);
+    minutes_   = c->get_name(hand, n++);
 
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
 }
diff --git a/src/accessor/grib_accessor_class_values.cc b/src/accessor/grib_accessor_class_values.cc
index b44c11ba4..8116e7d92 100644
--- a/src/accessor/grib_accessor_class_values.cc
+++ b/src/accessor/grib_accessor_class_values.cc
@@ -49,9 +49,9 @@ void grib_accessor_values_t::init(const long v, grib_arguments* params)
     grib_accessor_gen_t::init(v, params);
     carg_ = 0;
 
-    seclen_        = grib_arguments_get_name(grib_handle_of_accessor(this), params, carg_++);
-    offsetdata_    = grib_arguments_get_name(grib_handle_of_accessor(this), params, carg_++);
-    offsetsection_ = grib_arguments_get_name(grib_handle_of_accessor(this), params, carg_++);
+    seclen_        = params->get_name(grib_handle_of_accessor(this), carg_++);
+    offsetdata_    = params->get_name(grib_handle_of_accessor(this), carg_++);
+    offsetsection_ = params->get_name(grib_handle_of_accessor(this), carg_++);
     values_dirty_  = 1;
 
     length_ = init_length();
diff --git a/src/accessor/grib_accessor_class_variable.cc b/src/accessor/grib_accessor_class_variable.cc
index 1fbc899d6..aeb70aaac 100644
--- a/src/accessor/grib_accessor_class_variable.cc
+++ b/src/accessor/grib_accessor_class_variable.cc
@@ -27,7 +27,8 @@ void grib_accessor_variable_t::init(const long length, grib_arguments* args)
     grib_accessor_gen_t::init(length, args);
 
     grib_handle* hand           = grib_handle_of_accessor(this);
-    grib_expression* expression = grib_arguments_get_expression(hand, args, 0);
+    grib_expression* expression = nullptr;
+    if (args) expression = args->get_expression(hand, 0);
     const char* p               = 0;
     size_t len                  = 1;
     long l                      = 0;
@@ -41,23 +42,23 @@ void grib_accessor_variable_t::init(const long length, grib_arguments* args)
 
     length_ = 0;
     if (type_ == GRIB_TYPE_UNDEFINED && expression) {
-        type_ = grib_expression_native_type(hand, expression);
+        type_ = expression->native_type(hand);
 
         switch (type_) {
             case GRIB_TYPE_DOUBLE:
-                grib_expression_evaluate_double(hand, expression, &d);
+                expression->evaluate_double(hand, &d);
                 pack_double(&d, &len);
                 break;
 
             case GRIB_TYPE_LONG:
-                grib_expression_evaluate_long(hand, expression, &l);
+                expression->evaluate_long(hand, &l);
                 pack_long(&l, &len);
                 break;
 
             default: {
                 char tmp[1024];
                 len = sizeof(tmp);
-                p   = grib_expression_evaluate_string(hand, expression, tmp, &len, &ret);
+                p   = expression->evaluate_string(hand, tmp, &len, &ret);
                 if (ret != GRIB_SUCCESS) {
                     grib_context_log(context_, GRIB_LOG_ERROR, "Unable to evaluate %s as string: %s",
                                      name_, grib_get_error_message(ret));
diff --git a/src/accessor/grib_accessor_class_vector.cc b/src/accessor/grib_accessor_class_vector.cc
index 1c0526641..6ee016599 100644
--- a/src/accessor/grib_accessor_class_vector.cc
+++ b/src/accessor/grib_accessor_class_vector.cc
@@ -19,8 +19,8 @@ void grib_accessor_vector_t::init(const long l, grib_arguments* c)
     grib_accessor_abstract_vector_t::init(l, c);
     int n = 0;
 
-    vector_ = grib_arguments_get_name(grib_handle_of_accessor(this), c, n++);
-    index_  = grib_arguments_get_long(grib_handle_of_accessor(this), c, n++);
+    vector_ = c->get_name(grib_handle_of_accessor(this), n++);
+    index_  = c->get_long(grib_handle_of_accessor(this), n++);
     flags_ |= GRIB_ACCESSOR_FLAG_READ_ONLY;
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
     length_ = 0;
diff --git a/src/action_class_alias.cc b/src/action_class_alias.cc
index 91f6cf28f..5e7cdeddc 100644
--- a/src/action_class_alias.cc
+++ b/src/action_class_alias.cc
@@ -178,7 +178,7 @@ static int create_accessor(grib_section* p, grib_action* act, grib_loader* h)
                                  act->name_space, act->name, y->name_);
                 /* printf("[%s %s]\n",y->all_names_[i], y->all_name_spaces_[i]); */
 
-                /* 
+                /*
                  * ECC-1898: Remove accessor from cache
                  * This workaround was disabled because it was causing problems with the unaliasing mars.step,
                  * i.e., when unaliasing "mars.step" it also unaliases "step"
diff --git a/src/action_class_assert.cc b/src/action_class_assert.cc
index bc449c7ab..9be7a0fc0 100644
--- a/src/action_class_assert.cc
+++ b/src/action_class_assert.cc
@@ -112,7 +112,7 @@ static void dump(grib_action* act, FILE* f, int lvl)
 static void destroy(grib_context* context, grib_action* act)
 {
     grib_action_assert* a = (grib_action_assert*)act;
-    grib_expression_free(context, a->expression);
+    a->expression->destroy(context);
     grib_context_free_persistent(context, act->name);
     grib_context_free_persistent(context, act->op);
 }
@@ -123,7 +123,7 @@ static int execute(grib_action* a, grib_handle* h)
     double res               = 0;
     grib_action_assert* self = (grib_action_assert*)a;
 
-    if ((ret = grib_expression_evaluate_double(h, self->expression, &res)) != GRIB_SUCCESS)
+    if ((ret = self->expression->evaluate_double(h, &res)) != GRIB_SUCCESS)
         return ret;
 
     if (res != 0) {
@@ -131,7 +131,7 @@ static int execute(grib_action* a, grib_handle* h)
     }
     else {
         grib_context_log(h->context, GRIB_LOG_ERROR, "Assertion failure: ");
-        grib_expression_print(h->context, self->expression, h, stderr);
+        self->expression->print(h->context, h, stderr);
         fprintf(stderr, "\n");
         return GRIB_ASSERTION_FAILURE;
     }
@@ -144,7 +144,7 @@ static int notify_change(grib_action* a, grib_accessor* observer, grib_accessor*
     int ret = GRIB_SUCCESS;
     long lres;
 
-    if ((ret = grib_expression_evaluate_long(grib_handle_of_accessor(observed), self->expression, &lres)) != GRIB_SUCCESS)
+    if ((ret = self->expression->evaluate_long(grib_handle_of_accessor(observed), &lres)) != GRIB_SUCCESS)
         return ret;
 
     if (lres != 0)
diff --git a/src/action_class_concept.cc b/src/action_class_concept.cc
index 17886564b..598a4cd60 100644
--- a/src/action_class_concept.cc
+++ b/src/action_class_concept.cc
@@ -321,11 +321,11 @@ static int concept_condition_expression_true(grib_handle* h, grib_concept_condit
     long lres = 0;
     int ok    = 0;
     int err   = 0;
-    const int type = grib_expression_native_type(h, c->expression);
+    const int type = c->expression->native_type(h);
 
     switch (type) {
         case GRIB_TYPE_LONG:
-            grib_expression_evaluate_long(h, c->expression, &lres);
+            c->expression->evaluate_long(h, &lres);
             ok = (grib_get_long(h, c->name, &lval) == GRIB_SUCCESS) &&
                  (lval == lres);
             if (ok)
@@ -335,7 +335,7 @@ static int concept_condition_expression_true(grib_handle* h, grib_concept_condit
         case GRIB_TYPE_DOUBLE: {
             double dval;
             double dres = 0.0;
-            grib_expression_evaluate_double(h, c->expression, &dres);
+            c->expression->evaluate_double(h, &dres);
             ok = (grib_get_double(h, c->name, &dval) == GRIB_SUCCESS) &&
                  (dval == dres);
             if (ok)
@@ -351,7 +351,7 @@ static int concept_condition_expression_true(grib_handle* h, grib_concept_condit
             size_t size = sizeof(tmp);
 
             ok = (grib_get_string(h, c->name, buf, &len) == GRIB_SUCCESS) &&
-                 ((cval = grib_expression_evaluate_string(h, c->expression, tmp, &size, &err)) != NULL) &&
+                 ((cval = c->expression->evaluate_string(h, tmp, &size, &err)) != NULL) &&
                  (err == 0) && (strcmp(buf, cval) == 0);
             if (ok) {
                 snprintf(exprVal, size, "%s", cval);
diff --git a/src/action_class_gen.cc b/src/action_class_gen.cc
index eaf1627ff..660931b9f 100644
--- a/src/action_class_gen.cc
+++ b/src/action_class_gen.cc
@@ -149,7 +149,7 @@ static int create_accessor(grib_section* p, grib_action* act, grib_loader* loade
 static int notify_change(grib_action* act, grib_accessor* notified, grib_accessor* changed)
 {
     if (act->default_value)
-        return notified->pack_expression(grib_arguments_get_expression(grib_handle_of_accessor(notified), act->default_value, 0));
+        return notified->pack_expression(act->default_value->get_expression(grib_handle_of_accessor(notified), 0));
     return GRIB_SUCCESS;
 }
 
diff --git a/src/action_class_if.cc b/src/action_class_if.cc
index 5d4140710..94609585c 100644
--- a/src/action_class_if.cc
+++ b/src/action_class_if.cc
@@ -141,7 +141,7 @@ static int create_accessor(grib_section* p, grib_action* act, grib_loader* h)
     gs = as->sub_section_;
     grib_push_accessor(as, p->block);
 
-    if ((ret = grib_expression_evaluate_long(p->h, a->expression, &lres)) != GRIB_SUCCESS)
+    if ((ret = a->expression->evaluate_long(p->h, &lres)) != GRIB_SUCCESS)
         return ret;
 
     if (lres)
@@ -151,7 +151,7 @@ static int create_accessor(grib_section* p, grib_action* act, grib_loader* h)
 
     if (p->h->context->debug > 1) {
         fprintf(stderr, "EVALUATE create_accessor_handle ");
-        grib_expression_print(p->h->context, a->expression, p->h, stderr);
+        a->expression->print(p->h->context, p->h, stderr);
         fprintf(stderr, " [%s][_if%p]\n", (next == a->block_true ? "true" : "false"), (void*)a);
 
         /*grib_dump_action_branch(stdout,next,5);*/
@@ -172,7 +172,7 @@ static int create_accessor(grib_section* p, grib_action* act, grib_loader* h)
 
 static void print_expression_debug_info(grib_context* ctx, grib_expression* exp, grib_handle* h)
 {
-    grib_expression_print(ctx, exp, h, stderr); /* writes without a newline */
+    exp->print(ctx, h, stderr); /* writes without a newline */
     fprintf(stderr, "\n");
 }
 
@@ -185,9 +185,9 @@ static int execute(grib_action* act, grib_handle* h)
     long lres         = 0;
 
     /* See GRIB-394 */
-    int type = grib_expression_native_type(h, a->expression);
+    int type = a->expression->native_type(h);
     if (type != GRIB_TYPE_DOUBLE) {
-        if ((ret = grib_expression_evaluate_long(h, a->expression, &lres)) != GRIB_SUCCESS) {
+        if ((ret = a->expression->evaluate_long(h, &lres)) != GRIB_SUCCESS) {
             if (ret == GRIB_NOT_FOUND)
                 lres = 0;
             else {
@@ -199,7 +199,7 @@ static int execute(grib_action* act, grib_handle* h)
     }
     else {
         double dres = 0.0;
-        ret         = grib_expression_evaluate_double(h, a->expression, &dres);
+        ret         = a->expression->evaluate_double(h, &dres);
         lres        = (long)dres;
         if (ret != GRIB_SUCCESS) {
             if (ret == GRIB_NOT_FOUND)
@@ -236,7 +236,7 @@ static void dump(grib_action* act, FILE* f, int lvl)
         grib_context_print(act->context, f, "     ");
 
     printf("if(%s) { ", act->name);
-    grib_expression_print(act->context, a->expression, 0, stdout);
+    a->expression->print(act->context, 0, stdout);
     printf("\n");
 
     if (a->block_true) {
@@ -248,7 +248,7 @@ static void dump(grib_action* act, FILE* f, int lvl)
         for (i = 0; i < lvl; i++)
             grib_context_print(act->context, f, "     ");
         printf("else(%s) { ", act->name);
-        grib_expression_print(act->context, a->expression, 0, stdout);
+        a->expression->print(act->context, 0, stdout);
         /*     grib_context_print(act->context,f,"ELSE \n" );*/
         grib_dump_action_branch(f, a->block_false, lvl + 1);
     }
@@ -265,7 +265,7 @@ static grib_action* reparse(grib_action* a, grib_accessor* acc, int* doit)
 
     /* printf("reparse %s %s\n",a->name,acc->name); */
 
-    if ((ret = grib_expression_evaluate_long(grib_handle_of_accessor(acc), self->expression, &lres)) != GRIB_SUCCESS)
+    if ((ret = self->expression->evaluate_long(grib_handle_of_accessor(acc), &lres)) != GRIB_SUCCESS)
         grib_context_log(acc->context_,
                          GRIB_LOG_ERROR, "action_class_if::reparse: grib_expression_evaluate_long failed: %s",
                          grib_get_error_message(ret));
@@ -294,7 +294,7 @@ static void destroy(grib_context* context, grib_action* act)
         f = nf;
     }
 
-    grib_expression_free(context, a->expression);
+    a->expression->destroy(context);
 
     grib_context_free_persistent(context, act->name);
     grib_context_free_persistent(context, act->debug_info);
diff --git a/src/action_class_list.cc b/src/action_class_list.cc
index 00f8d1459..acc36c6a2 100644
--- a/src/action_class_list.cc
+++ b/src/action_class_list.cc
@@ -102,7 +102,7 @@ static int create_accessor(grib_section* p, grib_action* act, grib_loader* h)
     int ret           = 0;
     long val          = 0;
 
-    if ((ret = grib_expression_evaluate_long(p->h, a->expression, &val)) != GRIB_SUCCESS) {
+    if ((ret = a->expression->evaluate_long(p->h, &val)) != GRIB_SUCCESS) {
         grib_context_log(p->h->context, GRIB_LOG_DEBUG, "List %s creating %ld values: Unable to evaluate long", act->name, val);
         return ret;
     }
@@ -159,7 +159,7 @@ static grib_action* reparse(grib_action* a, grib_accessor* acc, int* doit)
 
     long val = 0;
 
-    int ret = grib_expression_evaluate_long(grib_handle_of_accessor(acc), self->expression, &val);
+    int ret = self->expression->evaluate_long(grib_handle_of_accessor(acc), &val);
     if (ret != GRIB_SUCCESS) {
         grib_context_log(acc->context_, GRIB_LOG_ERROR,
                 "List %s creating %ld values: Unable to evaluate long", acc->name_, val);
@@ -183,5 +183,5 @@ static void destroy(grib_context* context, grib_action* act)
 
     grib_context_free_persistent(context, act->name);
     grib_context_free_persistent(context, act->op);
-    grib_expression_free(context, self->expression);
+    self->expression->destroy(context);
 }
diff --git a/src/action_class_remove.cc b/src/action_class_remove.cc
index 479811381..e46809dda 100644
--- a/src/action_class_remove.cc
+++ b/src/action_class_remove.cc
@@ -114,13 +114,13 @@ static int create_accessor(grib_section* p, grib_action* act, grib_loader* h)
 {
     grib_action_remove* a = (grib_action_remove*)act;
 
-    grib_accessor* ga = grib_find_accessor(p->h, grib_arguments_get_name(p->h, a->args, 0));
+    grib_accessor* ga = grib_find_accessor(p->h, a->args->get_name(p->h, 0));
 
     if (ga) {
         remove_accessor(ga);
     } else {
         grib_context_log(act->context, GRIB_LOG_DEBUG,
-                         "Action_class_remove: create_accessor: No accessor named %s to remove", grib_arguments_get_name(p->h, a->args, 0));
+                         "Action_class_remove: create_accessor: No accessor named %s to remove", a->args->get_name(p->h, 0));
     }
     return GRIB_SUCCESS;
 }
diff --git a/src/action_class_set.cc b/src/action_class_set.cc
index 799bd6be1..53ac105a0 100644
--- a/src/action_class_set.cc
+++ b/src/action_class_set.cc
@@ -124,7 +124,7 @@ static void destroy(grib_context* context, grib_action* act)
     grib_action_set* a = (grib_action_set*)act;
 
     grib_context_free_persistent(context, a->name);
-    grib_expression_free(context, a->expression);
+    a->expression->destroy(context);
     grib_context_free_persistent(context, act->name);
     grib_context_free_persistent(context, act->op);
 }
diff --git a/src/action_class_switch.cc b/src/action_class_switch.cc
index 547149987..d792d7cac 100644
--- a/src/action_class_switch.cc
+++ b/src/action_class_switch.cc
@@ -142,35 +142,35 @@ static int execute(grib_action* act, grib_handle* h)
     Assert(args);
 
     while (c) {
-        e      = args->expression;
+        e      = args->expression_;
         values = c->values;
-        value  = values->expression;
+        value  = values->expression_;
         ok     = 0;
         while (e && value) {
-            if (!strcmp(value->cclass->name, "true"))
+            if (!strcmp(value->class_name(), "true"))
                 ok = 1;
             else {
-                type = grib_expression_native_type(h, value);
+                type = value->native_type(h);
 
                 switch (type) {
                     case GRIB_TYPE_LONG:
-                        ok = (grib_expression_evaluate_long(h, value, &lres) == GRIB_SUCCESS) &&
-                             (grib_expression_evaluate_long(h, e, &lval) == GRIB_SUCCESS) &&
+                        ok = (value->evaluate_long(h, &lres) == GRIB_SUCCESS) &&
+                             (e->evaluate_long(h, &lval) == GRIB_SUCCESS) &&
                              (lval == lres);
                         break;
 
                     case GRIB_TYPE_DOUBLE:
-                        ok = (grib_expression_evaluate_double(h, value, &dres) == GRIB_SUCCESS) &&
-                             (grib_expression_evaluate_double(h, e, &dval) == GRIB_SUCCESS) &&
+                        ok = (value->evaluate_double(h, &dres) == GRIB_SUCCESS) &&
+                             (e->evaluate_double(h, &dval) == GRIB_SUCCESS) &&
                              (dval == dres);
                         break;
 
                     case GRIB_TYPE_STRING:
                         len  = sizeof(buf);
                         size = sizeof(tmp);
-                        ok   = ((cres = grib_expression_evaluate_string(h, e, buf, &len, &err)) != NULL) &&
+                        ok   = ((cres = e->evaluate_string(h, buf, &len, &err)) != NULL) &&
                                (err == 0) &&
-                               ((cval = grib_expression_evaluate_string(h, value, tmp, &size, &err)) != NULL) &&
+                               ((cval = value->evaluate_string(h, tmp, &size, &err)) != NULL) &&
                                (err == 0) &&
                                ((strcmp(buf, cval) == 0) || (strcmp(cval, "*") == 0));
                         break;
@@ -183,15 +183,15 @@ static int execute(grib_action* act, grib_handle* h)
             if (!ok)
                 break;
 
-            args = args->next;
+            args = args->next_;
             if (args)
-                e = args->expression;
+                e = args->expression_;
             else
                 e = NULL;
 
-            values = values->next;
+            values = values->next_;
             if (values)
-                value = values->expression;
+                value = values->expression_;
             else
                 value = NULL;
         }
diff --git a/src/action_class_when.cc b/src/action_class_when.cc
index a2a770e7f..16cb8790a 100644
--- a/src/action_class_when.cc
+++ b/src/action_class_when.cc
@@ -35,37 +35,38 @@ or edit "action.class" and rerun ./make_class.pl
 
 */
 
-static void init_class      (grib_action_class*);
-static void dump            (grib_action* d, FILE*,int);
-static void destroy         (grib_context*,grib_action*);
-static int create_accessor(grib_section*,grib_action*,grib_loader*);
-static int notify_change(grib_action* a, grib_accessor* observer,grib_accessor* observed);
+static void init_class(grib_action_class*);
+static void dump(grib_action* d, FILE*, int);
+static void destroy(grib_context*, grib_action*);
+static int create_accessor(grib_section*, grib_action*, grib_loader*);
+static int notify_change(grib_action* a, grib_accessor* observer, grib_accessor* observed);
 
 
-typedef struct grib_action_when {
-    grib_action          act;
+typedef struct grib_action_when
+{
+    grib_action act;
     /* Members defined in when */
-    grib_expression *expression;
-    grib_action     *block_true;
-    grib_action     *block_false;
+    grib_expression* expression;
+    grib_action* block_true;
+    grib_action* block_false;
     int loop;
 } grib_action_when;
 
 
 static grib_action_class _grib_action_class_when = {
-    0,                              /* super */
-    "action_class_when",                 /* name */
-    sizeof(grib_action_when),            /* size */
-    0,                                   /* inited  */
-    &init_class,                         /* init_class */
-    0,                               /* init */
-    &destroy,                            /* destroy */
-    &dump,                               /* dump */
-    0,                               /* xref */
-    &create_accessor,                    /* create_accessor */
-    &notify_change,                      /* notify_change */
-    0,                            /* reparse */
-    0,                            /* execute */
+    0,                        /* super */
+    "action_class_when",      /* name */
+    sizeof(grib_action_when), /* size */
+    0,                        /* inited  */
+    &init_class,              /* init_class */
+    0,                        /* init */
+    &destroy,                 /* destroy */
+    &dump,                    /* dump */
+    0,                        /* xref */
+    &create_accessor,         /* create_accessor */
+    &notify_change,           /* notify_change */
+    0,                        /* reparse */
+    0,                        /* execute */
 };
 
 grib_action_class* grib_action_class_when = &_grib_action_class_when;
@@ -77,7 +78,7 @@ static void init_class(grib_action_class* c)
 
 /* The check on self->loop can only be done in non-threaded mode */
 #if defined(DEBUG) && GRIB_PTHREADS == 0 && GRIB_OMP_THREADS == 0
-#define CHECK_LOOP 1
+    #define CHECK_LOOP 1
 #endif
 
 grib_action* grib_action_create_when(grib_context* context,
@@ -143,7 +144,7 @@ static void dump(grib_action* act, FILE* f, int lvl)
         grib_context_print(act->context, f, "     ");
 
     printf("when(%s) { ", act->name);
-    grib_expression_print(act->context, a->expression, 0, stdout);
+    a->expression->print(act->context, 0, stdout);
     printf("\n");
 
     grib_dump_action_branch(f, a->block_true, lvl + 1);
@@ -165,9 +166,9 @@ static void dump(grib_action* act, FILE* f, int lvl)
 }
 
 #ifdef CHECK_LOOP
-#define SET_LOOP(self, v) self->loop = v;
+    #define SET_LOOP(self, v) self->loop = v;
 #else
-#define SET_LOOP(self, v)
+    #define SET_LOOP(self, v)
 #endif
 
 static int notify_change(grib_action* a, grib_accessor* observer, grib_accessor* observed)
@@ -183,13 +184,13 @@ static int notify_change(grib_action* a, grib_accessor* observer, grib_accessor*
      */
     grib_handle* hand = grib_handle_of_accessor(observed);
 
-    if ((ret = grib_expression_evaluate_long(hand, self->expression, &lres)) != GRIB_SUCCESS)
+    if ((ret = self->expression->evaluate_long(hand, &lres)) != GRIB_SUCCESS)
         return ret;
 #ifdef CHECK_LOOP
     if (self->loop) {
         printf("LOOP detected...\n");
-        printf("WHEN triggered by %s %ld\n", observed->name, lres);
-        grib_expression_print(observed->context, self->expression, 0, stderr);
+        printf("WHEN triggered by %s %ld\n", observed->name_, lres);
+        self->expression->print(observed->context_, 0, stderr);
         fprintf(stderr, "\n");
         return ret;
     }
@@ -198,9 +199,9 @@ static int notify_change(grib_action* a, grib_accessor* observer, grib_accessor*
 
     if (hand->context->debug > 0) {
         grib_context_log(hand->context, GRIB_LOG_DEBUG,
-                "------------- SECTION action %s is triggered by [%s] (%s)",
-                a->name, observed->name_, a->debug_info ? a->debug_info : "no debug info");
-        grib_expression_print(observed->context_, self->expression, 0, stderr);
+                         "------------- SECTION action %s is triggered by [%s] (%s)",
+                         a->name, observed->name_, a->debug_info ? a->debug_info : "no debug info");
+        self->expression->print(observed->context_, 0, stderr);
         fprintf(stderr, "\n");
     }
 
@@ -241,7 +242,7 @@ static void destroy(grib_context* context, grib_action* act)
         t = nt;
     }
 
-    grib_expression_free(context, self->expression);
+    self->expression->destroy(context);
 
     grib_context_free_persistent(context, act->name);
     grib_context_free_persistent(context, act->debug_info);
diff --git a/src/codes_util.cc b/src/codes_util.cc
index bb705b335..0175ecb2f 100644
--- a/src/codes_util.cc
+++ b/src/codes_util.cc
@@ -545,3 +545,15 @@ int codes_get_features(char* result, size_t* length, int select)
     *length = actual_length;
     return GRIB_SUCCESS;
 }
+
+// Returns 1 if the key is computed (virtual) and 0 if it is coded
+int codes_key_is_computed(const grib_handle* h, const char* key, int* err)
+{
+    const grib_accessor* acc = grib_find_accessor(h, key);
+    if (!acc) {
+        *err = GRIB_NOT_FOUND;
+        return 0;
+    }
+    *err = GRIB_SUCCESS;
+    return (acc->length_ == 0);
+}
diff --git a/src/eccodes.cc b/src/eccodes.cc
index d26644062..34ff02f8c 100644
--- a/src/eccodes.cc
+++ b/src/eccodes.cc
@@ -599,22 +599,6 @@ void codes_context_set_data_quality_checks(codes_context* c, int val)
     grib_context_set_data_quality_checks(c, val);
 }
 
-void codes_context_set_memory_proc(codes_context* c, grib_malloc_proc p_malloc, grib_free_proc p_free, grib_realloc_proc p_realloc)
-{
-    // This function is deprecated and will later be removed
-    grib_context_set_memory_proc(c, p_malloc, p_free, p_realloc);
-}
-void codes_context_set_persistent_memory_proc(codes_context* c, grib_malloc_proc p_malloc, grib_free_proc p_free)
-{
-    // This function is deprecated and will later be removed
-    grib_context_set_persistent_memory_proc(c, p_malloc, p_free);
-}
-void codes_context_set_buffer_memory_proc(codes_context* c, grib_malloc_proc p_malloc, grib_free_proc p_free, grib_realloc_proc p_realloc)
-{
-    // This function is deprecated and will later be removed
-    grib_context_set_buffer_memory_proc(c, p_malloc, p_free, p_realloc);
-}
-
 void codes_context_set_print_proc(codes_context* c, grib_print_proc p_print)
 {
     grib_context_set_print_proc(c, p_print);
diff --git a/src/eccodes.h b/src/eccodes.h
index 46a048d43..e1335c884 100644
--- a/src/eccodes.h
+++ b/src/eccodes.h
@@ -1177,38 +1177,6 @@ void codes_context_set_samples_path(codes_context* c, const char* path);
 void codes_context_set_debug(codes_context* c, int mode);
 void codes_context_set_data_quality_checks(codes_context* c, int val);
 
-/**
- *  Sets memory procedures of the context
- *
- * @param c         : the context to be modified
- * @param p_malloc  : the memory allocation procedure to be set @see codes_malloc_proc
- * @param p_free    : the memory freeing procedure to be set @see codes_free_proc
- * @param p_realloc : the memory reallocation procedure to be set @see codes_realloc_proc
- */
-void codes_context_set_memory_proc(codes_context* c, codes_malloc_proc p_malloc,
-                                   codes_free_proc p_free, codes_realloc_proc p_realloc) ECCODES_DEPRECATED;
-
-/**
- *  Sets memory procedures of the context for persistent data
- *
- * @param c           : the context to be modified
- * @param griballoc   : the memory allocation procedure to be set @see codes_malloc_proc
- * @param gribfree    : the memory freeing procedure to be set @see codes_free_proc
- */
-void codes_context_set_persistent_memory_proc(codes_context* c, codes_malloc_proc p_malloc,
-                                              codes_free_proc p_free) ECCODES_DEPRECATED;
-
-/**
- *  Sets memory procedures of the context for large buffers
- *
- * @param c        : the context to be modified
- * @param p_malloc : the memory allocation procedure to be set @see codes_malloc_proc
- * @param p_free   : the memory freeing procedure to be set @see codes_free_proc
- * @param p_free   : the memory reallocation procedure to be set @see codes_realloc_proc
- */
-void codes_context_set_buffer_memory_proc(codes_context* c, codes_malloc_proc p_malloc,
-                                          codes_free_proc p_free, codes_realloc_proc p_realloc) ECCODES_DEPRECATED;
-
 /**
  *  Sets the context printing procedure used for user interaction
  *
@@ -1371,6 +1339,9 @@ int codes_is_missing(const codes_handle* h, const char* key, int* err);
    Returns a bool i.e. 0 or 1 */
 int codes_is_defined(const codes_handle* h, const char* key);
 
+/* Returns 1 if the key is computed (virtual) and 0 if it is coded */
+int codes_key_is_computed(const grib_handle* h, const char* key, int* err);
+
 /* Returns 1 if the BUFR key is in the header and 0 if it is in the data section.
    The error code is the final argument */
 int codes_bufr_key_is_header(const codes_handle* h, const char* key, int* err);
diff --git a/src/eccodes_prototypes.h b/src/eccodes_prototypes.h
index fcc74f3f2..13640a376 100644
--- a/src/eccodes_prototypes.h
+++ b/src/eccodes_prototypes.h
@@ -434,9 +434,6 @@ void* grib_context_buffer_malloc(const grib_context* c, size_t size);
 void grib_context_buffer_free(const grib_context* c, void* p);
 void* grib_context_buffer_realloc(const grib_context* c, void* p, size_t size);
 void* grib_context_buffer_malloc_clear(const grib_context* c, size_t size);
-void grib_context_set_memory_proc(grib_context* c, grib_malloc_proc m, grib_free_proc f, grib_realloc_proc r);
-void grib_context_set_persistent_memory_proc(grib_context* c, grib_malloc_proc m, grib_free_proc f);
-void grib_context_set_buffer_memory_proc(grib_context* c, grib_malloc_proc m, grib_free_proc f, grib_realloc_proc r);
 void grib_context_set_data_accessing_proc(grib_context* c, grib_data_read_proc read, grib_data_write_proc write, grib_data_tell_proc tell);
 void grib_context_log(const grib_context* c, int level, const char* fmt, ...);
 void grib_context_print(const grib_context* c, void* descriptor, const char* fmt, ...);
@@ -799,17 +796,6 @@ grib_expression* new_sub_string_expression(grib_context* c, const char* value, s
 //int grib_nearest_get_radius(grib_handle* h, double* radiusInKm);
 //void grib_binary_search(const double xx[], const size_t n, double x, size_t* ju, size_t* jl);
 //int grib_nearest_find_multiple(const grib_handle* h, int is_lsm, const double* inlats, const double* inlons, long npoints, double* outlats, double* outlons, double* values, double* distances, int* indexes);
-//int grib_nearest_find_generic(grib_nearest* nearest, grib_handle* h, double inlat, double inlon, unsigned long flags,
-//                              const char* values_keyname,
-//                              double** out_lats,
-//                              int* out_lats_count,
-//                              double** out_lons,
-//                              int* out_lons_count,
-//                              double** out_distances,
-//                              double* outlats, double* outlons, double* values, double* distances, int* indexes, size_t* len);
-
-/* grib_nearest_class.cc */
-//eccodes::geo_nearest::Nearest* grib_nearest_factory(grib_handle* h, grib_arguments* args, int* error);
 
 /* grib_iterator.cc */
 int grib_get_data(const grib_handle* h, double* lats, double* lons, double* values);
@@ -827,23 +813,23 @@ eccodes::geo_iterator::Iterator* grib_iterator_factory(grib_handle* h, grib_argu
 int transform_iterator_data(grib_context* c, double* data, long iScansNegatively, long jScansPositively, long jPointsAreConsecutive, long alternativeRowScanning, size_t numPoints, long nx, long ny);
 
 /* grib_expression.cc */
-int grib_expression_native_type(grib_handle* h, grib_expression* g);
-int grib_expression_evaluate_long(grib_handle* h, grib_expression* g, long* result);
-int grib_expression_evaluate_double(grib_handle* h, grib_expression* g, double* result);
-const char* grib_expression_evaluate_string(grib_handle* h, grib_expression* g, char* buf, size_t* size, int* err);
-const char* grib_expression_get_name(grib_expression* g);
-void grib_expression_print(grib_context* ctx, grib_expression* g, grib_handle* f, FILE*);
-void grib_expression_free(grib_context* ctx, grib_expression* g);
-void grib_expression_add_dependency(grib_expression* e, grib_accessor* observer);
-grib_arguments* grib_arguments_new(grib_context* c, grib_expression* g, grib_arguments* n);
-void grib_arguments_free(grib_context* c, grib_arguments* g);
-void grib_arguments_print(grib_context* c, grib_arguments* g, grib_handle* f);
-const char* grib_arguments_get_name(grib_handle* h, grib_arguments* args, int n);
-const char* grib_arguments_get_string(grib_handle* h, grib_arguments* args, int n);
-long grib_arguments_get_long(grib_handle* h, grib_arguments* args, int n);
-double grib_arguments_get_double(grib_handle* h, grib_arguments* args, int n);
-grib_expression* grib_arguments_get_expression(grib_handle* h, grib_arguments* args, int n);
-int grib_arguments_get_count(grib_arguments* args);
+//int grib_expression_native_type(grib_handle* h, grib_expression* g);
+//int grib_expression_evaluate_long(grib_handle* h, grib_expression* g, long* result);
+//int grib_expression_evaluate_double(grib_handle* h, grib_expression* g, double* result);
+//const char* grib_expression_evaluate_string(grib_handle* h, grib_expression* g, char* buf, size_t* size, int* err);
+//const char* grib_expression_get_name(grib_expression* g);
+//void grib_expression_print(grib_context* ctx, grib_expression* g, grib_handle* f, FILE*);
+//void grib_expression_free(grib_context* ctx, grib_expression* g);
+//void grib_expression_add_dependency(grib_expression* e, grib_accessor* observer);
+//grib_arguments* grib_arguments_new(grib_context* c, grib_expression* g, grib_arguments* n);
+//void grib_arguments_free(grib_context* c, grib_arguments* g);
+//void grib_arguments_print(grib_context* c, grib_arguments* g, grib_handle* f);
+//const char* grib_arguments_get_name(grib_handle* h, grib_arguments* args, int n);
+//const char* grib_arguments_get_string(grib_handle* h, grib_arguments* args, int n);
+//long grib_arguments_get_long(grib_handle* h, grib_arguments* args, int n);
+//double grib_arguments_get_double(grib_handle* h, grib_arguments* args, int n);
+//grib_expression* grib_arguments_get_expression(grib_handle* h, grib_arguments* args, int n);
+//int grib_arguments_get_count(grib_arguments* args);
 
 /* codes_util.cc */
 double normalise_longitude_in_degrees(double lon);
@@ -861,6 +847,7 @@ bool is_sorted_descending(const double arr[], size_t n);
 int compute_scaled_value_and_scale_factor(double input, int64_t scaled_value_max, int64_t scale_factor_max, int64_t* ret_value, int64_t* ret_factor);
 int codes_is_feature_enabled(const char* feature);
 int codes_get_features(char* result, size_t* length, int select);
+int codes_key_is_computed(const grib_handle* h, const char* key, int* err);
 
 
 /* grib_util.cc */
diff --git a/src/expression.class b/src/expression.class
deleted file mode 100644
index 0db380e7c..000000000
--- a/src/expression.class
+++ /dev/null
@@ -1,39 +0,0 @@
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    init(grib_expression* e);
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static string  get_name(grib_expression* e);
-static int     native_type(grib_expression*,grib_handle*);
-static int     evaluate_long(grib_expression*,grib_handle*,long*);
-static int     evaluate_double(grib_expression*,grib_handle*,double*);
-static string  evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
-
-typedef struct grib_expression_NAME{
-  grib_expression base;
-  MEMBERS
-} grib_expression_NAME;
-
-extern grib_expression_class* SUPER;
-
-static grib_expression_class _grib_expression_class_NAME = {
-    &SUPER,                      /* super */
-    "NAME",                      /* name  */
-    sizeof(grib_expression_NAME),/* size of instance */
-    0,                           /* inited */
-    &init,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    &get_name,
-    &evaluate_long,
-    &evaluate_double,
-    &evaluate_string,
-};
-
-grib_expression_class* grib_expression_class_NAME = &_grib_expression_class_NAME;
-
-ADD_TO_FILE grib_expression_class.h      extern grib_expression_class* grib_expression_class_NAME;
-ADD_TO_FILE grib_expression_factory.h    { "NAME", &grib_expression_class_NAME, },
diff --git a/src/expression/grib_arguments.cc b/src/expression/grib_arguments.cc
new file mode 100644
index 000000000..96a8030ec
--- /dev/null
+++ b/src/expression/grib_arguments.cc
@@ -0,0 +1,145 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_arguments.h"
+
+
+grib_arguments* grib_arguments_new(grib_context* c, eccodes::Expression* g, eccodes::Arguments* n)
+{
+    return new eccodes::Arguments(c, g, n);
+}
+
+void grib_arguments_free(grib_context* c, grib_arguments* g)
+{
+    if (g) {
+        // TODO(maee): Check for memory leaks
+        // grib_arguments_free(c, g->next_);
+        // grib_expression_free(c, g->expression_);
+        delete g;
+    }
+}
+
+namespace eccodes {
+
+Arguments::Arguments(grib_context* c, Expression* g, Arguments* n)
+{
+    context_    = c;
+    expression_ = g;
+    next_       = n;
+}
+
+Arguments::~Arguments()
+{
+    grib_arguments_free(context_, next_);
+    grib_expression_free(context_, expression_);
+}
+
+void Arguments::print(grib_handle* f) const
+{
+    if (expression_)
+        expression_->print(context_, f, stdout);
+    if (next_) {
+        printf(",");
+        next_->print(f);
+    }
+}
+
+const char* Arguments::get_name(grib_handle* h, int n) const
+{
+    const Expression* e = NULL;
+    const Arguments* args = this;
+    while (args && n-- > 0) {
+        args = args->next_;
+    }
+
+    if (!args)
+        return NULL;
+
+    e = args->expression_;
+    return e ? e->get_name() : NULL;
+}
+
+const char* Arguments::get_string(grib_handle* h, int n) const
+{
+    const Arguments* args = this;
+    int ret               = 0;
+    while (args && n-- > 0) {
+        args = args->next_;
+    }
+
+    if (!args)
+        return NULL;
+
+    const Expression* e = args->expression_;
+    return e->evaluate_string(h, NULL, NULL, &ret);
+}
+
+long Arguments::get_long(grib_handle* h, int n) const
+{
+    int ret               = 0;
+    long lres             = 0;
+    const Arguments* args = this;
+    while (args && n-- > 0) {
+        args = args->next_;
+    }
+
+    if (!args)
+        return 0;
+
+    const grib_expression* e = args->expression_;
+    ret = e->evaluate_long(h, &lres);
+    (void)ret;
+    return lres;
+}
+
+double Arguments::get_double(grib_handle* h, int n) const
+{
+    int ret     = 0;
+    double dres = 0.0;
+
+    const Arguments* args = this;
+    while (args && n-- > 0) {
+        args = args->next_;
+    }
+
+    if (!args)
+        return 0;
+
+    const Expression* e = args->expression_;
+    ret = e->evaluate_double(h, &dres);
+    (void)ret;
+    return dres;
+}
+
+grib_expression* Arguments::get_expression(grib_handle* h, int n) const
+{
+    const Arguments* args = this;
+    while (args && n-- > 0) {
+        args = args->next_;
+    }
+
+    if (!args)
+        return 0;
+
+    return args->expression_;
+}
+
+int Arguments::get_count() const
+{
+    const Arguments* args = this;
+    int n                 = 0;
+    while (args) {
+        args = args->next_;
+        n++;
+    }
+    return n;
+}
+
+}  // namespace eccodes
diff --git a/src/expression/grib_arguments.h b/src/expression/grib_arguments.h
new file mode 100644
index 000000000..e71711923
--- /dev/null
+++ b/src/expression/grib_arguments.h
@@ -0,0 +1,42 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_api_internal.h"
+#include "grib_expression.h"
+
+namespace eccodes {
+
+class Arguments
+{
+public:
+    Arguments(grib_context* c, Expression* g, Arguments* n);
+    ~Arguments();
+
+    void print(grib_handle* f) const;
+    const char* get_name(grib_handle* h, int n) const;
+    const char* get_string(grib_handle* h, int n) const;
+    long get_long(grib_handle* h, int n) const;
+    double get_double(grib_handle* h, int n) const;
+    grib_expression* get_expression(grib_handle* h, int n) const;
+    int get_count() const;
+
+    // TODO(maee): make this private
+    // private:
+    Arguments* next_        = nullptr;
+    Expression* expression_ = nullptr;
+    grib_context* context_  = nullptr;
+};
+
+}  // namespace eccodes
+
+eccodes::Arguments* grib_arguments_new(grib_context* c, grib_expression* g, eccodes::Arguments* n);
+void grib_arguments_free(grib_context* c, grib_arguments* g);
diff --git a/src/expression/grib_expression.cc b/src/expression/grib_expression.cc
new file mode 100644
index 000000000..e5435dcab
--- /dev/null
+++ b/src/expression/grib_expression.cc
@@ -0,0 +1,56 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression.h"
+
+void grib_expression_free(grib_context* ctx, grib_expression* g)
+{
+    if (g) {
+        delete g;
+    }
+}
+
+namespace eccodes {
+
+int Expression::native_type(grib_handle* h) const
+{
+    grib_context_log(h->context, GRIB_LOG_FATAL, "%s: No native_type() in %s", __func__, class_name());
+    return 0;
+}
+
+int Expression::evaluate_long(grib_handle* h, long* result) const
+{
+    return GRIB_INVALID_TYPE;
+}
+
+int Expression::evaluate_double(grib_handle* h, double* result) const
+{
+    return GRIB_INVALID_TYPE;
+}
+
+const char* Expression::evaluate_string(grib_handle* h, char* buf, size_t* size, int* err) const
+{
+    grib_context_log(h->context, GRIB_LOG_ERROR, "%s: No evaluate_string() in %s", __func__, class_name());
+    *err = GRIB_INVALID_TYPE;
+
+    return nullptr;
+}
+
+const char* Expression::get_name() const
+{
+    grib_context_log(grib_context_get_default(), GRIB_LOG_FATAL, "%s: No get_name() in %s", __func__, class_name());
+    return nullptr;
+}
+
+void Expression::print(grib_context* ctx, grib_handle* f, FILE* out) const {}
+
+void Expression::add_dependency(grib_accessor* observer) {}
+
+}  // namespace eccodes
diff --git a/src/expression/grib_expression.h b/src/expression/grib_expression.h
new file mode 100644
index 000000000..f61690e0c
--- /dev/null
+++ b/src/expression/grib_expression.h
@@ -0,0 +1,50 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_api_internal.h"
+#include <functional>
+
+namespace eccodes {
+
+class Expression
+{
+public:
+    using string = const char*;
+
+    using PackProc        = std::function<int(grib_handle*, const double*, size_t, void*, size_t*)>;
+    using UnpackProc      = std::function<int(grib_handle*, const void*, size_t, double*, size_t*)>;
+    using BinopLongProc   = std::function<long(long, long)>;
+    using UnopLongProc    = std::function<long(long)>;
+    using BinopDoubleProc = std::function<double(double, double)>;
+    using UnopDoubleProc  = std::function<double(double)>;
+    using BinopStringProc = std::function<int(char*, char*)>;
+
+    virtual ~Expression() {};
+    virtual void destroy(grib_context*) {};
+    virtual void print(grib_context*, grib_handle*, FILE*) const;
+    virtual void add_dependency(grib_accessor*);
+    virtual string get_name() const;
+    virtual int native_type(grib_handle*) const;
+    virtual int evaluate_long(grib_handle*, long*) const;
+    virtual int evaluate_double(grib_handle*, double*) const;
+    virtual string evaluate_string(grib_handle*, char*, size_t*, int*) const;
+
+    virtual const char* class_name() const = 0;
+};
+
+}  // namespace eccodes
+
+using grib_expression = eccodes::Expression;
+
+// Defined in grib_expression_class_accessor.cc
+// grib_expression* new_accessor_expression(grib_context*, const char*, long, size_t);
+void grib_expression_free(grib_context*, grib_expression*);
diff --git a/src/expression/grib_expression_class_accessor.cc b/src/expression/grib_expression_class_accessor.cc
new file mode 100644
index 000000000..4dbab030b
--- /dev/null
+++ b/src/expression/grib_expression_class_accessor.cc
@@ -0,0 +1,122 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression_class_accessor.h"
+
+namespace eccodes::expression {
+
+const char* Accessor::get_name() const
+{
+    return name_;
+}
+
+int Accessor::evaluate_long(grib_handle* h, long* result) const
+{
+    return grib_get_long_internal(h, name_, result);
+}
+
+int Accessor::evaluate_double(grib_handle* h, double* result) const
+{
+    return grib_get_double_internal(h, name_, result);
+}
+
+Accessor::string Accessor::evaluate_string(grib_handle* h, char* buf, size_t* size, int* err) const
+{
+    char mybuf[1024]            = {0,};
+    long start = start_;
+    if (length_ > sizeof(mybuf)) {
+        *err = GRIB_INVALID_ARGUMENT;
+        return NULL;
+    }
+
+    Assert(buf);
+    if ((*err = grib_get_string_internal(h, name_, mybuf, size)) != GRIB_SUCCESS)
+        return NULL;
+
+    if (start_ < 0)
+        start += *size;
+
+    if (length_ != 0) {
+        if (start >= 0)
+            memcpy(buf, mybuf + start, length_);
+        buf[length_] = 0;
+    }
+    else {
+        memcpy(buf, mybuf, *size);
+        if (*size == 1024)
+            *size = *size - 1; /* ECC-336 */
+        buf[*size] = 0;
+    }
+    return buf;
+}
+
+void Accessor::print(grib_context* c, grib_handle* hand, FILE* out) const
+{
+    int err = 0;
+    fprintf(out, "access('%s", name_);
+    if (hand) {
+        const int ntype = native_type(hand);
+        if (ntype == GRIB_TYPE_STRING) {
+            char buf[256] = {0,};
+            size_t len = sizeof(buf);
+            err = grib_get_string(hand, name_, buf, &len);
+            if (!err) fprintf(out, "=%s", buf);
+        }
+        else if (ntype == GRIB_TYPE_LONG) {
+            long lVal = 0;
+            err = grib_get_long(hand, name_, &lVal);
+            if (!err) fprintf(out, "=%ld", lVal);
+        }
+    }
+    fprintf(out, "')");
+}
+
+void Accessor::destroy(grib_context* c)
+{
+    grib_context_free_persistent(c, name_);
+}
+
+void Accessor::add_dependency(grib_accessor* observer)
+{
+    grib_accessor* observed = grib_find_accessor(grib_handle_of_accessor(observer), name_);
+
+    if (!observed) {
+        /* grib_context_log(observer->context, GRIB_LOG_ERROR, */
+        /* "Error in accessor_add_dependency: cannot find [%s]", name_); */
+        /* Assert(observed); */
+        return;
+    }
+
+    grib_dependency_add(observer, observed);
+}
+
+Accessor::Accessor(grib_context* c, const char* name, long start, size_t length)
+{
+    name_    = grib_context_strdup_persistent(c, name);
+    start_   = start;
+    length_  = length;
+}
+
+int Accessor::native_type(grib_handle* h) const
+{
+    int type = 0;
+    int err;
+    if ((err = grib_get_native_type(h, name_, &type)) != GRIB_SUCCESS) {
+        grib_context_log(h->context, GRIB_LOG_ERROR,
+                         "Error in evaluating the type of '%s': %s", name_, grib_get_error_message(err));
+    }
+    return type;
+}
+
+}  // namespace eccodes::expression
+
+grib_expression* new_accessor_expression(grib_context* c, const char* name, long start, size_t length) {
+    return new eccodes::expression::Accessor(c, name, start, length);
+}
diff --git a/src/expression/grib_expression_class_accessor.h b/src/expression/grib_expression_class_accessor.h
new file mode 100644
index 000000000..3b8b0f05d
--- /dev/null
+++ b/src/expression/grib_expression_class_accessor.h
@@ -0,0 +1,40 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class Accessor : public Expression {
+public:
+    Accessor(grib_context*, const char*, long, size_t);
+
+    void destroy(grib_context*) override;
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override;
+    string get_name() const override;
+    int native_type(grib_handle*) const override;
+    int evaluate_long(grib_handle*, long*) const override;
+    int evaluate_double(grib_handle*, double*) const override;
+    string evaluate_string(grib_handle*, char*, size_t*, int*) const override;
+
+    const char* class_name() const override { return "accessor"; };
+
+private:
+    char* name_;
+    long start_;
+    size_t length_;
+};
+
+}  // namespace eccodes::expression
+
+grib_expression* new_accessor_expression(grib_context*, const char*, long, size_t);
diff --git a/src/expression/grib_expression_class_binop.cc b/src/expression/grib_expression_class_binop.cc
new file mode 100644
index 000000000..6037d929b
--- /dev/null
+++ b/src/expression/grib_expression_class_binop.cc
@@ -0,0 +1,144 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression_class_binop.h"
+
+namespace eccodes::expression {
+
+int Binop::evaluate_long(grib_handle* h, long* lres) const
+{
+    long v1 = 0;
+    long v2 = 0;
+
+//     {
+//         int typeLeft, typeRight;
+//         const char* nameLeft;
+//         const char* nameRight;
+//         typeLeft = grib_expression_native_type(h, left_);
+//         typeRight = grib_expression_native_type(h, right_);
+//         nameLeft = grib_expression_get_name(left_);
+//         nameRight= grib_expression_get_name(right_);
+//         printf("eval_long nameLeft=%s (type=%d), nameRight=%s (type=%d)\n",nameLeft,typeLeft, nameRight,typeRight);
+//         grib_expression_print(h->context, g, h);
+//         printf("\n");
+//     }
+
+    int ret = left_->evaluate_long(h, &v1);
+    if (ret != GRIB_SUCCESS)
+        return ret;
+
+    ret = right_->evaluate_long(h, &v2);
+    if (ret != GRIB_SUCCESS)
+        return ret;
+
+    *lres = long_func_(v1, v2);
+    return GRIB_SUCCESS;
+}
+
+int Binop::evaluate_double(grib_handle* h, double* dres) const
+{
+    double v1 = 0.0;
+    double v2 = 0.0;
+
+//     {
+//         int typeLeft, typeRight;
+//         const char* nameLeft;
+//         const char* nameRight;
+//         typeLeft = grib_expression_native_type(h, left_);
+//         typeRight = grib_expression_native_type(h, right_);
+//         nameLeft = grib_expression_get_name(left_);
+//         nameRight= grib_expression_get_name(right_);
+//         printf("eval_dbl nameLeft=%s (type=%d), nameRight=%s (type=%d)\n",nameLeft,typeLeft, nameRight,typeRight);
+//         grib_expression_print(h->context, g, h);
+//         printf("\n");
+//     }
+
+    int ret = left_->evaluate_double(h, &v1);
+    if (ret != GRIB_SUCCESS)
+        return ret;
+
+    ret = right_->evaluate_double(h, &v2);
+    if (ret != GRIB_SUCCESS)
+        return ret;
+
+    *dres = double_func_ ? double_func_(v1, v2) : long_func_(v1, v2);
+
+    return GRIB_SUCCESS;
+}
+
+void Binop::print(grib_context* c, grib_handle* f, FILE* out) const
+{
+    // Cover a subset of the most commonly used functions
+    // TODO(masn): Can be done in a much better way!
+    //             e.g., the yacc parser passing in the functions name
+    if (long_func_ && long_func_.target<std::equal_to<long>>()) {
+        fprintf(out, "equals(");
+    } else if (long_func_ && long_func_.target<std::not_equal_to<long>>()) {
+        fprintf(out, "not_equals(");
+    } else if (long_func_ && long_func_.target<std::less<long>>()) {
+        fprintf(out, "less_than(");
+    } else if (long_func_ && long_func_.target<std::greater<long>>()) {
+        fprintf(out, "greater_than(");
+    } else {
+        fprintf(out, "binop(");
+    }
+    left_->print(c, f, out);
+    fprintf(out, ",");
+    right_->print(c, f, out);
+    fprintf(out, ")");
+}
+
+void Binop::destroy(grib_context* c)
+{
+    left_->destroy(c);
+    right_->destroy(c);
+}
+
+void Binop::add_dependency(grib_accessor* observer)
+{
+    left_->add_dependency(observer);
+    right_->add_dependency(observer);
+}
+
+Binop::Binop(grib_context* c,
+             BinopLongProc long_func,
+             BinopDoubleProc double_func,
+             Expression* left, Expression* right)
+{
+    left_        = left;
+    right_       = right;
+    long_func_   = long_func;
+    double_func_ = double_func;
+}
+
+int Binop::native_type(grib_handle* h) const
+{
+    /* See GRIB-394 : The type of this binary expression will be double if any of its operands are double */
+    if (left_->native_type(h) == GRIB_TYPE_DOUBLE ||
+        right_->native_type(h) == GRIB_TYPE_DOUBLE) {
+        return GRIB_TYPE_DOUBLE;
+    }
+    return long_func_ ? GRIB_TYPE_LONG : GRIB_TYPE_DOUBLE;
+}
+
+}  // namespace eccodes::expression
+
+
+grib_expression* new_binop_expression(grib_context* c, grib_binop_long_proc long_func, grib_binop_double_proc double_func, grib_expression* left, grib_expression* right) {
+    return new eccodes::expression::Binop(c, long_func, double_func, left, right);
+}
+
+//grib_expression* new_binop_expression(grib_context* c,
+//                                      eccodes::Expression::BinopLongProc long_func,
+//                                      eccodes::Expression::BinopDoubleProc double_func,
+//                                      grib_expression* left, grib_expression* right)
+//{
+//    return new eccodes::expression::Binop(c, long_func, double_func, left, right);
+//}
diff --git a/src/expression/grib_expression_class_binop.h b/src/expression/grib_expression_class_binop.h
new file mode 100644
index 000000000..e0a4f2e69
--- /dev/null
+++ b/src/expression/grib_expression_class_binop.h
@@ -0,0 +1,40 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class Binop : public Expression {
+public:
+    Binop(grib_context*, BinopLongProc, BinopDoubleProc, Expression*, Expression*);
+
+    void destroy(grib_context*) override;
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override;
+    int native_type(grib_handle*) const override;
+    int evaluate_long(grib_handle*, long*) const override;
+    int evaluate_double(grib_handle*, double*) const override;
+
+    const char* class_name() const override { return "binop"; };
+
+private:
+    Expression* left_ = nullptr;
+    Expression* right_ = nullptr;
+    BinopLongProc long_func_ = nullptr;
+    BinopDoubleProc double_func_ = nullptr;
+    BinopStringProc string_func_ = nullptr;
+};
+
+}  // namespace eccodes::expression
+
+grib_expression* new_binop_expression(grib_context*, grib_binop_long_proc, grib_binop_double_proc, grib_expression*, grib_expression*);
diff --git a/src/expression/grib_expression_class_double.cc b/src/expression/grib_expression_class_double.cc
new file mode 100644
index 000000000..82d9aaa88
--- /dev/null
+++ b/src/expression/grib_expression_class_double.cc
@@ -0,0 +1,47 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression_class_double.h"
+
+namespace eccodes::expression {
+
+int Double::evaluate_long(grib_handle* h, long* lres) const
+{
+    *lres = value_;
+    return GRIB_SUCCESS;
+}
+
+int Double::evaluate_double(grib_handle* h, double* dres) const
+{
+    *dres = value_;
+    return GRIB_SUCCESS;
+}
+
+void Double::print(grib_context* c, grib_handle* f, FILE* out) const
+{
+    fprintf(out, "double(%g)", value_);
+}
+
+Double::Double(grib_context* c, double value)
+{
+    value_ = value;
+}
+
+int Double::native_type(grib_handle* h) const
+{
+    return GRIB_TYPE_DOUBLE;
+}
+
+}  // namespace eccodes::expression
+
+grib_expression* new_double_expression(grib_context* c, double value)
+{
+    return new eccodes::expression::Double(c, value);
+}
diff --git a/src/expression/grib_expression_class_double.h b/src/expression/grib_expression_class_double.h
new file mode 100644
index 000000000..5df2cb258
--- /dev/null
+++ b/src/expression/grib_expression_class_double.h
@@ -0,0 +1,36 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class Double : public Expression
+{
+public:
+    Double(grib_context*, double);
+
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override {}
+    int native_type(grib_handle*) const override;
+    int evaluate_long(grib_handle*, long*) const override;
+    int evaluate_double(grib_handle*, double*) const override;
+
+    const char* class_name() const override { return "double"; };
+
+private:
+    double value_ = 0.0;
+};
+
+}  // namespace eccodes::expression
+
+grib_expression* new_double_expression(grib_context*, double);
diff --git a/src/grib_expression_class_functor.cc b/src/expression/grib_expression_class_functor.cc
similarity index 55%
rename from src/grib_expression_class_functor.cc
rename to src/expression/grib_expression_class_functor.cc
index a85374886..901e357a5 100644
--- a/src/grib_expression_class_functor.cc
+++ b/src/expression/grib_expression_class_functor.cc
@@ -8,70 +8,13 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#include "grib_api_internal.h"
+#include "grib_expression_class_functor.h"
 #include <string>
 #include <algorithm>
 
-/*
-   This is used by make_class.pl
 
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = destroy
-   IMPLEMENTS = native_type
-   IMPLEMENTS = evaluate_long
-   IMPLEMENTS = print
-   IMPLEMENTS = add_dependency
-   MEMBERS    = char *name
-   MEMBERS    = grib_arguments *args
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static int     native_type(grib_expression*,grib_handle*);
-static int     evaluate_long(grib_expression*,grib_handle*,long*);
-
-typedef struct grib_expression_functor{
-  grib_expression base;
-    /* Members defined in functor */
-    char *name;
-    grib_arguments *args;
-} grib_expression_functor;
-
-
-static grib_expression_class _grib_expression_class_functor = {
-    0,                      /* super */
-    "functor",                      /* name  */
-    sizeof(grib_expression_functor),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    0,
-    &evaluate_long,
-    0,
-    0,
-};
-
-grib_expression_class* grib_expression_class_functor = &_grib_expression_class_functor;
-
-/* END_CLASS_IMP */
+namespace eccodes::expression
+{
 
 // See ECC-1936. We cannot use strcasestr (not on Windows and non-standard)
 static bool string_contains_case(const char* haystack, const char* needle, bool case_sensitive)
@@ -90,30 +33,31 @@ static bool string_contains_case(const char* haystack, const char* needle, bool
     return copy_haystack.find(copy_needle) != std::string::npos;
 }
 
-static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
+int Functor::evaluate_long(grib_handle* h, long* lres) const
 {
-    grib_expression_functor* e = (grib_expression_functor*)g;
-
-    // if (STR_EQUAL(e->name, "lookup")) {
+    // if (STR_EQUAL(name_, "lookup")) {
     //     return GRIB_SUCCESS;
     // }
 
-    if (STR_EQUAL(e->name, "new")) {
+    if (STR_EQUAL(name_, "new")) {
         *lres = h->loader != NULL;
         return GRIB_SUCCESS;
     }
 
-    if (STR_EQUAL(e->name, "abs")) {
-        grib_expression* exp = grib_arguments_get_expression(h, e->args, 0);
-        long lval = 0;
-        int ret = grib_expression_evaluate_long(h, exp, &lval);
-        *lres = abs(lval);
-        return ret;
+    if (STR_EQUAL(name_, "abs")) {
+        const grib_expression* exp = args_ ? args_->get_expression(h, 0) : nullptr;
+        if (exp) {
+            long lval = 0;
+            int ret = exp->evaluate_long(h, &lval);
+            *lres = abs(lval);
+            return ret;
+        }
+        return GRIB_INVALID_ARGUMENT;
     }
 
-    if (STR_EQUAL(e->name, "size")) {
+    if (STR_EQUAL(name_, "size")) {
         *lres = 0;
-        const char* keyName = grib_arguments_get_name(h, e->args, 0);
+        const char* keyName = args_ ? args_->get_name(h, 0) : nullptr;
         if (keyName) {
             size_t size = 0;
             int err = grib_get_size(h, keyName, &size);
@@ -124,16 +68,16 @@ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
         return GRIB_INVALID_ARGUMENT;
     }
 
-    if (STR_EQUAL(e->name, "debug_mode")) {
-        const int n = grib_arguments_get_count(e->args);
+    if (STR_EQUAL(name_, "debug_mode")) {
+        const int n = args_ ? args_->get_count() : 0;
         if (n != 1) return GRIB_INVALID_ARGUMENT;
-        const int dmode = grib_arguments_get_long(h, e->args, 0);
+        const int dmode = args_ ? args_->get_long(h, 0) : 0;
         grib_context_set_debug(0, dmode);
         return GRIB_SUCCESS;
     }
 
-    if (STR_EQUAL(e->name, "missing")) {
-        const char* keyName = grib_arguments_get_name(h, e->args, 0);
+    if (STR_EQUAL(name_, "missing")) {
+        const char* keyName = args_ ? args_->get_name(h, 0) : nullptr;
         if (keyName) {
             long val = 0;
             int err  = 0;
@@ -159,8 +103,8 @@ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
         return GRIB_SUCCESS;
     }
 
-    if (STR_EQUAL(e->name, "defined")) {
-        const char* keyName = grib_arguments_get_name(h, e->args, 0);
+    if (STR_EQUAL(name_, "defined")) {
+        const char* keyName = args_ ? args_->get_name(h, 0) : nullptr;
         if (keyName) {
             const grib_accessor* a = grib_find_accessor(h, keyName);
             *lres = a != NULL ? 1 : 0;
@@ -170,12 +114,12 @@ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
         return GRIB_SUCCESS;
     }
 
-    if (STR_EQUAL(e->name, "environment_variable")) {
+    if (STR_EQUAL(name_, "environment_variable")) {
         // ECC-1520: This implementation has some limitations:
         // 1. Cannot distinguish between environment variable NOT SET
         //    and SET but equal to 0
         // 2. Cannot deal with string values
-        const char* p = grib_arguments_get_name(h, e->args, 0);
+        const char* p = args_ ? args_->get_name(h, 0) : nullptr;
         if (p) {
             const char* env = getenv(p);
             if (env) {
@@ -190,16 +134,16 @@ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
         return GRIB_SUCCESS;
     }
 
-    if (STR_EQUAL(e->name, "changed")) {
+    if (STR_EQUAL(name_, "changed")) {
         *lres = 1;
         return GRIB_SUCCESS;
     }
 
-    if (STR_EQUAL(e->name, "contains")) {
+    if (STR_EQUAL(name_, "contains")) {
         *lres = 0;
-        const int n = grib_arguments_get_count(e->args);
+        const int n = args_ ? args_->get_count() : 0;
         if (n != 3) return GRIB_INVALID_ARGUMENT;
-        const char* keyName = grib_arguments_get_name(h, e->args, 0);
+        const char* keyName = args_ ? args_->get_name(h, 0) : nullptr;
         if (!keyName) return GRIB_INVALID_ARGUMENT;
         int type = 0;
         int err = grib_get_native_type(h, keyName, &type);
@@ -209,9 +153,9 @@ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
             size_t len = sizeof(keyValue);
             err = grib_get_string(h, keyName, keyValue, &len);
             if (err) return err;
-            const char* sValue = grib_arguments_get_string(h, e->args, 1);
+            const char* sValue = args_->get_string(h, 1);
             if (!sValue) return GRIB_INVALID_ARGUMENT;
-            const bool case_sens = grib_arguments_get_long(h, e->args, 2) == 0; // 0=case-sensitive, 1=case-insensitive
+            const bool case_sens = args_->get_long(h, 2) == 0; // 0=case-sensitive, 1=case-insensitive
             const bool contains = string_contains_case(keyValue, sValue, case_sens);
             if (contains) {
                 *lres = 1;
@@ -224,21 +168,21 @@ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
         return GRIB_SUCCESS;
     }
 
-    if (STR_EQUAL(e->name, "is_one_of")) {
+    if (STR_EQUAL(name_, "is_one_of")) {
         *lres = 0;
-        const char* keyName = grib_arguments_get_name(h, e->args, 0);
+        const char* keyName = args_->get_name(h, 0);
         if (!keyName) return GRIB_INVALID_ARGUMENT;
         int type = 0;
         int err = grib_get_native_type(h, keyName, &type);
         if (err) return err;
-        int n = grib_arguments_get_count(e->args);
+        int n = args_->get_count();
         if (type == GRIB_TYPE_STRING) {
             char keyValue[254] = {0,};
             size_t len = sizeof(keyValue);
             err = grib_get_string(h, keyName, keyValue, &len);
             if (err) return err;
             for (int i = 1; i < n; ++i) { // skip 1st argument which is the key
-                const char* sValue = grib_arguments_get_string(h, e->args, i);
+                const char* sValue = args_->get_string(h, i);
                 if (sValue && STR_EQUAL(keyValue, sValue)) {
                     *lres = 1;
                     return GRIB_SUCCESS;
@@ -250,7 +194,7 @@ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
             err = grib_get_long(h, keyName, &keyValue);
             if (err) return err;
             for (int i = 1; i < n; ++i) { // skip 1st argument which is the key
-                long lValue = grib_arguments_get_long(h, e->args, i);
+                long lValue = args_->get_long(h, i);
                 if (keyValue == lValue) {
                     *lres = 1;
                     return GRIB_SUCCESS;
@@ -263,47 +207,48 @@ static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
         return GRIB_SUCCESS;
     }
 
-    if (STR_EQUAL(e->name, "gribex_mode_on")) {
+    if (STR_EQUAL(name_, "gribex_mode_on")) {
         *lres = h->context->gribex_mode_on ? 1 : 0;
         return GRIB_SUCCESS;
     }
 
-    grib_context_log(h->context, GRIB_LOG_ERROR, "grib_expression_class_functor::%s failed for '%s'", __func__, e->name);
+    grib_context_log(h->context, GRIB_LOG_ERROR, "grib_expression_class_functor::%s failed for '%s'", __func__, name_);
     return GRIB_NOT_IMPLEMENTED;
 }
 
-static void print(grib_context* c, grib_expression* g, grib_handle* f, FILE* out)
+void Functor::print(grib_context* c,grib_handle* f, FILE* out) const
 {
-    const grib_expression_functor* e = (grib_expression_functor*)g;
-    fprintf(out, "%s(", e->name);
-    // grib_expression_print(c,e->args,f);
+    fprintf(out, "%s(", name_);
+    // grib_expression_print(c,args_,f);
     fprintf(out, ")");
 }
 
-static void destroy(grib_context* c, grib_expression* g)
+void Functor::destroy(grib_context* c)
 {
-    grib_expression_functor* e = (grib_expression_functor*)g;
-    grib_context_free_persistent(c, e->name);
-    grib_arguments_free(c, e->args);
+    grib_context_free_persistent(c, name_);
+    grib_arguments_free(c, args_);
 }
 
-static void add_dependency(grib_expression* g, grib_accessor* observer)
+void Functor::add_dependency(grib_accessor* observer)
 {
-    grib_expression_functor* e = (grib_expression_functor*)g;
-    if (strcmp(e->name, "defined"))
-        grib_dependency_observe_arguments(observer, e->args);
+    if (strcmp(name_, "defined"))
+        grib_dependency_observe_arguments(observer, args_);
 }
 
-grib_expression* new_func_expression(grib_context* c, const char* name, grib_arguments* args)
+Functor::Functor(grib_context* c, const char* name, grib_arguments* args)
 {
-    grib_expression_functor* e = (grib_expression_functor*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_functor));
-    e->base.cclass             = grib_expression_class_functor;
-    e->name                    = grib_context_strdup_persistent(c, name);
-    e->args                    = args;
-    return (grib_expression*)e;
+    name_ = grib_context_strdup_persistent(c, name);
+    args_ = args;
 }
 
-static int native_type(grib_expression* g, grib_handle* h)
+int Functor::native_type(grib_handle* h) const
 {
     return GRIB_TYPE_LONG;
 }
+
+}  // namespace eccodes::expression
+
+
+grib_expression* new_func_expression(grib_context* c, const char* name, grib_arguments* args) {
+    return new eccodes::expression::Functor(c, name, args);
+}
diff --git a/src/expression/grib_expression_class_functor.h b/src/expression/grib_expression_class_functor.h
new file mode 100644
index 000000000..70b0a366a
--- /dev/null
+++ b/src/expression/grib_expression_class_functor.h
@@ -0,0 +1,43 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class Functor : public Expression {
+public:
+    Functor(grib_context* c, const char*, grib_arguments*);
+
+    void destroy(grib_context*) override;
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override;
+    int native_type(grib_handle*) const override;
+    int evaluate_long(grib_handle*, long*) const override;
+
+    const char* class_name() const override { return "functor"; };
+
+    char* name() { return name_; }  // For testing
+
+private:
+    char* name_ = nullptr;
+    grib_arguments* args_ = nullptr;
+
+    friend Expression* new_func_expression(grib_context*, const char*, grib_arguments*);
+};
+
+Expression* new_func_expression(grib_context*, const char*, grib_arguments*);
+
+}  // namespace eccodes::expression
+
+
+grib_expression* new_func_expression(grib_context*, const char*, grib_arguments*);
diff --git a/src/expression/grib_expression_class_is_in_dict.cc b/src/expression/grib_expression_class_is_in_dict.cc
new file mode 100644
index 000000000..f62ea7f84
--- /dev/null
+++ b/src/expression/grib_expression_class_is_in_dict.cc
@@ -0,0 +1,175 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression_class_is_in_dict.h"
+
+namespace eccodes::expression {
+
+grib_trie* IsInDict::load_dictionary(grib_context* c, int* err) const
+{
+    char* filename  = NULL;
+    char line[1024] = {0,};
+    char key[1024] = {0,};
+    char* list = 0;
+    grib_trie* dictionary = NULL;
+    FILE* f = NULL;
+    int i = 0;
+
+    *err = GRIB_SUCCESS;
+
+    filename = grib_context_full_defs_path(c, dictionary_);
+    if (!filename) {
+        grib_context_log(c, GRIB_LOG_ERROR, "unable to find def file %s", dictionary_);
+        *err = GRIB_FILE_NOT_FOUND;
+        return NULL;
+    }
+    else {
+        grib_context_log(c, GRIB_LOG_DEBUG, "is_in_dict: found def file %s", filename);
+    }
+    dictionary = (grib_trie*)grib_trie_get(c->lists, filename);
+    if (dictionary) {
+        grib_context_log(c, GRIB_LOG_DEBUG, "using dictionary %s from cache", dictionary_);
+        return dictionary;
+    }
+    else {
+        grib_context_log(c, GRIB_LOG_DEBUG, "using dictionary %s from file %s", dictionary_, filename);
+    }
+
+    f = codes_fopen(filename, "r");
+    if (!f) {
+        *err = GRIB_IO_PROBLEM;
+        return NULL;
+    }
+
+    dictionary = grib_trie_new(c);
+
+    while (fgets(line, sizeof(line) - 1, f)) {
+        i = 0;
+        while (line[i] != '|' && line[i] != 0) {
+            key[i] = line[i];
+            i++;
+        }
+        key[i] = 0;
+        list   = (char*)grib_context_malloc_clear(c, strlen(line) + 1);
+        memcpy(list, line, strlen(line));
+        grib_trie_insert(dictionary, key, list);
+    }
+
+    grib_trie_insert(c->lists, filename, dictionary);
+
+    fclose(f);
+
+    return dictionary;
+}
+
+Expression::string IsInDict::get_name() const
+{
+    return key_;
+}
+
+int IsInDict::evaluate_long(grib_handle* h, long* result) const
+{
+    int err = 0;
+    char mybuf[1024] = {0,};
+    size_t size = 1024;
+
+    grib_trie* dict = load_dictionary(h->context, &err);
+
+    if ((err = grib_get_string_internal(h, key_, mybuf, &size)) != GRIB_SUCCESS)
+        return err;
+
+    if (grib_trie_get(dict, mybuf))
+        *result = 1;
+    else
+        *result = 0;
+
+    return err;
+}
+
+int IsInDict::evaluate_double(grib_handle* h, double* result) const
+{
+    return GRIB_NOT_IMPLEMENTED;
+
+    // grib_expression_is_in_dict* e = (grib_expression_is_in_dict*)g;
+    // int err                       = 0;
+    // char mybuf[1024]              = {0,};
+    // size_t size = 1024;
+    // grib_trie* list = load_dictionary(h->context, g, &err);
+    // if ((err = grib_get_string_internal(h, key_, mybuf, &size)) != GRIB_SUCCESS)
+    //     return err;
+    // if (grib_trie_get(list, mybuf))
+    //     *result = 1;
+    // else
+    //     *result = 0;
+    // return err;
+}
+
+Expression::string IsInDict::evaluate_string(grib_handle* h, char* buf, size_t* size, int* err) const
+{
+    *err = GRIB_NOT_IMPLEMENTED;
+    return NULL;
+
+    // grib_expression_is_in_dict* e = (grib_expression_is_in_dict*)g;
+    // char mybuf[1024]              = {0,};
+    // size_t sizebuf = 1024;
+    // long result;
+    // grib_trie* list = load_dictionary(h->context, g, err);
+    // if ((*err = grib_get_string_internal(h, key_, mybuf, &sizebuf)) != GRIB_SUCCESS)
+    //     return NULL;
+    // if (grib_trie_get(list, mybuf))
+    //     result = 1;
+    // else
+    //     result = 0;
+    // snprintf(buf, 32, "%ld", result);
+    // *size = strlen(buf);
+    // return buf;
+}
+
+void IsInDict::print(grib_context* c, grib_handle* f, FILE* out) const
+{
+    fprintf(out, "access('%s", key_);
+    if (f) {
+        long s = 0;
+        grib_get_long(f, key_, &s);
+        fprintf(out, "=%ld", s);
+    }
+    fprintf(out, "')");
+}
+
+IsInDict::IsInDict(grib_context* c, const char* name, const char* list)
+{
+    key_        = grib_context_strdup_persistent(c, name);
+    dictionary_ = grib_context_strdup_persistent(c, list);
+}
+
+int IsInDict::native_type(grib_handle* h) const
+{
+    return GRIB_TYPE_LONG;
+}
+
+void IsInDict::add_dependency(grib_accessor* observer)
+{
+    grib_accessor* observed = grib_find_accessor(grib_handle_of_accessor(observer), key_);
+
+    if (!observed) {
+        /* grib_context_log(observer->context, GRIB_LOG_ERROR, */
+        /* "Error in accessor_add_dependency: cannot find [%s]", name_); */
+        /* Assert(observed); */
+        return;
+    }
+
+    grib_dependency_add(observer, observed);
+}
+
+}  // namespace eccodes::expression
+
+grib_expression* new_is_in_dict_expression(grib_context* c, const char* name, const char* list) {
+    return new eccodes::expression::IsInDict(c, name, list);
+}
diff --git a/src/expression/grib_expression_class_is_in_dict.h b/src/expression/grib_expression_class_is_in_dict.h
new file mode 100644
index 000000000..4a5b62d57
--- /dev/null
+++ b/src/expression/grib_expression_class_is_in_dict.h
@@ -0,0 +1,43 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class IsInDict : public Expression {
+public:
+    IsInDict(grib_context*, const char*, const char*);
+
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override;
+    string get_name() const override;
+    int native_type(grib_handle*) const override;
+    int evaluate_long(grib_handle*, long*) const override;
+    int evaluate_double(grib_handle*, double*) const override;
+    string evaluate_string(grib_handle*, char*, size_t*, int*) const override;
+
+    const char* class_name() const override { return "is_in_dict"; };
+
+private:
+    const char* key_        = nullptr;
+    const char* dictionary_ = nullptr;
+
+    grib_trie* load_dictionary(grib_context*, int* err) const;
+    friend Expression* new_is_in_dict_expression(grib_context*, const char*, const char*);
+};
+
+Expression* new_is_in_dict_expression(grib_context*, const char*, const char*);
+
+}  // namespace eccodes::expression
+
+grib_expression* new_is_in_dict_expression(grib_context*, const char*, const char*);
diff --git a/src/expression/grib_expression_class_is_in_list.cc b/src/expression/grib_expression_class_is_in_list.cc
new file mode 100644
index 000000000..63ee22ecc
--- /dev/null
+++ b/src/expression/grib_expression_class_is_in_list.cc
@@ -0,0 +1,183 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression_class_is_in_list.h"
+#include "eccodes_prototypes.h"
+
+namespace eccodes::expression {
+
+grib_trie* IsInList::load_list(grib_context* c,  int* err) const
+{
+    char* filename  = NULL;
+    char line[1024] = {0,};
+    grib_trie* list = NULL;
+    FILE* f         = NULL;
+
+    *err = GRIB_SUCCESS;
+
+    filename = grib_context_full_defs_path(c, list_);
+    if (!filename) {
+        grib_context_log(c, GRIB_LOG_ERROR, "unable to find def file %s", list_);
+        *err = GRIB_FILE_NOT_FOUND;
+        return NULL;
+    }
+    else {
+        grib_context_log(c, GRIB_LOG_DEBUG, "is_in_list: found def file %s", filename);
+    }
+    list = (grib_trie*)grib_trie_get(c->lists, filename);
+    if (list) {
+        grib_context_log(c, GRIB_LOG_DEBUG, "using list %s from cache", list_);
+        return list;
+    }
+    else {
+        grib_context_log(c, GRIB_LOG_DEBUG, "using list %s from file %s", list_, filename);
+    }
+
+    f = codes_fopen(filename, "r");
+    if (!f) {
+        *err = GRIB_IO_PROBLEM;
+        return NULL;
+    }
+
+    list = grib_trie_new(c);
+
+    while (fgets(line, sizeof(line) - 1, f)) {
+        unsigned char* p = (unsigned char*)line;
+        while (*p != 0) {
+            if (*p < 33) {
+                *p = 0;
+                break;
+            }
+            p++;
+        }
+        grib_trie_insert(list, line, line);
+    }
+
+    grib_trie_insert(c->lists, filename, list);
+
+    fclose(f);
+
+    return list;
+}
+
+const char* IsInList::get_name() const
+{
+    return name_;
+}
+
+int IsInList::evaluate_long(grib_handle* h, long* result) const
+{
+    int err = 0;
+    char mybuf[1024] = {0,};
+    size_t size = 1024;
+
+    grib_trie* list = load_list(h->context, &err);
+
+    if ((err = grib_get_string_internal(h, name_, mybuf, &size)) != GRIB_SUCCESS)
+        return err;
+
+    if (grib_trie_get(list, mybuf))
+        *result = 1;
+    else
+        *result = 0;
+
+    return err;
+}
+
+int IsInList::evaluate_double(grib_handle* h, double* result) const
+{
+    return GRIB_NOT_IMPLEMENTED;
+    // grib_expression_is_in_list* e = (grib_expression_is_in_list*)g;
+    // int err                       = 0;
+    // char mybuf[1024]              = {0,};
+    // size_t size = 1024;
+    // grib_trie* list = load_list(h->context, g, &err);
+    // if ((err = grib_get_string_internal(h, name_, mybuf, &size)) != GRIB_SUCCESS)
+    //     return err;
+    // if (grib_trie_get(list, mybuf))
+    //     *result = 1;
+    // else
+    //     *result = 0;
+    // return err;
+}
+
+Expression::string IsInList::evaluate_string(grib_handle* h, char* buf, size_t* size, int* err) const
+{
+    char mybuf[1024] = {0,};
+    size_t sizebuf = 1024;
+    long result;
+
+    grib_trie* list = load_list(h->context, err);
+
+    if ((*err = grib_get_string_internal(h, name_, mybuf, &sizebuf)) != GRIB_SUCCESS)
+        return NULL;
+
+    if (grib_trie_get(list, mybuf))
+        result = 1;
+    else
+        result = 0;
+
+    snprintf(buf, 32, "%ld", result);
+    *size = strlen(buf);
+    return buf;
+}
+
+void IsInList::print(grib_context* c, grib_handle* f, FILE* out) const
+{
+    fprintf(out, "access('%s", name_);
+    if (f) {
+        long s = 0;
+        grib_get_long(f, name_, &s);
+        fprintf(out, "=%ld", s);
+    }
+    fprintf(out, "')");
+}
+
+
+void IsInList::add_dependency(grib_accessor* observer)
+{
+    grib_accessor* observed = grib_find_accessor(grib_handle_of_accessor(observer), name_);
+
+    if (!observed) {
+        /* grib_context_log(observer->context, GRIB_LOG_ERROR, */
+        /* "Error in accessor_add_dependency: cannot find [%s]", name_); */
+        /* Assert(observed); */
+        return;
+    }
+
+    grib_dependency_add(observer, observed);
+}
+
+void IsInList::destroy(grib_context* c) {
+    grib_context_free_persistent(c, name_);
+    grib_context_free_persistent(c, list_);
+}
+
+IsInList::IsInList(grib_context* c, const char* name, const char* list)
+{
+    name_ = grib_context_strdup_persistent(c, name);
+    list_ = grib_context_strdup_persistent(c, list);
+}
+
+int IsInList::native_type(grib_handle* h) const
+{
+    int type = 0;
+    int err;
+    if ((err = grib_get_native_type(h, name_, &type)) != GRIB_SUCCESS)
+        grib_context_log(h->context, GRIB_LOG_ERROR,
+                         "Error in native_type %s : %s", name_, grib_get_error_message(err));
+    return type;
+}
+
+}  // namespace eccodes::expression
+
+grib_expression* new_is_in_list_expression(grib_context* c, const char* name, const char* list) {
+    return new eccodes::expression::IsInList(c, name, list);
+}
diff --git a/src/expression/grib_expression_class_is_in_list.h b/src/expression/grib_expression_class_is_in_list.h
new file mode 100644
index 000000000..327f9f069
--- /dev/null
+++ b/src/expression/grib_expression_class_is_in_list.h
@@ -0,0 +1,42 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class IsInList : public Expression {
+public:
+    IsInList(grib_context*, const char*, const char*);
+
+    void destroy(grib_context*) override;
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override;
+    string get_name() const override;
+    int native_type(grib_handle*) const override;
+    int evaluate_long(grib_handle*, long*) const override;
+    int evaluate_double(grib_handle*, double*) const override;
+    string evaluate_string(grib_handle*, char*, size_t*, int*) const override;
+
+    const char* class_name() const override { return "is_in_list"; };
+
+private:
+    char* name_ = nullptr;
+    char* list_ = nullptr;
+
+    grib_trie* load_list(grib_context*,  int* err) const;
+    friend Expression* new_is_in_list_expression(grib_context*, const char*, const char*);
+};
+
+}  // namespace eccodes::expression
+
+grib_expression* new_is_in_list_expression(grib_context*, const char*, const char*);
diff --git a/src/expression/grib_expression_class_is_integer.cc b/src/expression/grib_expression_class_is_integer.cc
new file mode 100644
index 000000000..7dcd48be3
--- /dev/null
+++ b/src/expression/grib_expression_class_is_integer.cc
@@ -0,0 +1,121 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression_class_is_integer.h"
+
+namespace eccodes::expression {
+
+Expression::string IsInteger::get_name() const
+{
+    return name_;
+}
+
+int IsInteger::evaluate_long(grib_handle* h, long* result) const
+{
+    int err = 0;
+    char mybuf[1024] = {0,};
+    size_t size = 1024;
+    char* p     = 0;
+    char* start = 0;
+
+    if ((err = grib_get_string_internal(h, name_, mybuf, &size)) != GRIB_SUCCESS)
+        return err;
+
+    start = mybuf + start_;
+
+    if (length_ > 0)
+        start[length_] = 0;
+
+    strtol(start, &p, 10);
+
+    if (*p != 0)
+        *result = 0;
+    else
+        *result = 1;
+
+    return err;
+}
+
+int IsInteger::evaluate_double(grib_handle* h, double* result) const
+{
+    int err = 0;
+    long lresult = 0;
+
+    err = evaluate_long(h, &lresult);
+    *result = lresult;
+    return err;
+}
+
+Expression::string IsInteger::evaluate_string(grib_handle* h, char* buf, size_t* size, int* err) const
+{
+    long lresult   = 0;
+    double dresult = 0.0;
+
+    switch (native_type(h)) {
+        case GRIB_TYPE_LONG:
+            *err = evaluate_long(h, &lresult);
+            snprintf(buf, 32, "%ld", lresult);
+            break;
+        case GRIB_TYPE_DOUBLE:
+            *err = evaluate_double(h, &dresult);
+            snprintf(buf, 32, "%g", dresult);
+            break;
+    }
+    return buf;
+}
+
+void IsInteger::print(grib_context* c, grib_handle* f, FILE* out) const
+{
+    // grib_expression_is_integer* e = (grib_expression_is_integer*)g;
+    // printf("access('%s", name_);
+    // if (f) {
+    //     long s = 0;
+    //     grib_get_long(f, name_, &s);
+    //     printf("=%ld", s);
+    // }
+    // printf("')");
+}
+
+void IsInteger::destroy(grib_context* c)
+{
+    grib_context_free_persistent(c, name_);
+}
+
+void IsInteger::add_dependency(grib_accessor* observer)
+{
+    grib_accessor* observed       = grib_find_accessor(grib_handle_of_accessor(observer), name_);
+
+    if (!observed) {
+        /* grib_context_log(observer->context, GRIB_LOG_ERROR, */
+        /* "Error in accessor_add_dependency: cannot find [%s]", name_); */
+        /* Assert(observed); */
+        return;
+    }
+
+    grib_dependency_add(observer, observed);
+}
+
+IsInteger::IsInteger(grib_context* c, const char* name, int start, int length)
+{
+    name_     = grib_context_strdup_persistent(c, name);
+    start_    = start;
+    length_   = length;
+}
+
+int IsInteger::native_type(grib_handle* h) const
+{
+    return GRIB_TYPE_LONG;
+}
+
+}  // namespace eccodes::expression
+
+grib_expression* new_is_integer_expression(grib_context* c, const char* name, int start, int length) {
+    return new eccodes::expression::IsInteger(c, name, start, length);
+}
diff --git a/src/expression/grib_expression_class_is_integer.h b/src/expression/grib_expression_class_is_integer.h
new file mode 100644
index 000000000..416735eec
--- /dev/null
+++ b/src/expression/grib_expression_class_is_integer.h
@@ -0,0 +1,40 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class IsInteger : public Expression {
+public:
+    IsInteger(grib_context*, const char*, int, int);
+
+    void destroy(grib_context*) override;
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override;
+    string get_name() const override;
+    int native_type(grib_handle*) const override;
+    int evaluate_long(grib_handle*, long*) const override;
+    int evaluate_double(grib_handle*, double*) const override;
+    string evaluate_string(grib_handle*, char*, size_t*, int*) const override;
+
+    const char* class_name() const override { return "is_integer"; };
+
+private:
+    char* name_    = nullptr;
+    size_t start_  = 0;
+    size_t length_ = 0;
+};
+
+}  // namespace eccodes::expression
+
+grib_expression* new_is_integer_expression(grib_context*, const char*, int, int);
diff --git a/src/expression/grib_expression_class_length.cc b/src/expression/grib_expression_class_length.cc
new file mode 100644
index 000000000..1ac617a11
--- /dev/null
+++ b/src/expression/grib_expression_class_length.cc
@@ -0,0 +1,99 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression_class_length.h"
+
+namespace eccodes::expression {
+
+Expression::string Length::get_name() const
+{
+    return name_;
+}
+
+int Length::evaluate_long(grib_handle* h, long* result) const
+{
+    int err = 0;
+    char mybuf[1024] = {0,};
+    size_t size = 1024;
+    if ((err = grib_get_string_internal(h, name_, mybuf, &size)) != GRIB_SUCCESS)
+        return err;
+
+    *result = strlen(mybuf);
+    return err;
+}
+
+int Length::evaluate_double(grib_handle* h, double* result) const
+{
+    char mybuf[1024] = {0,};
+    size_t size = 1024;
+    int err = 0;
+    if ((err = grib_get_string_internal(h, name_, mybuf, &size)) != GRIB_SUCCESS)
+        return err;
+
+    *result = strlen(mybuf);
+    return err;
+}
+
+Expression::string Length::evaluate_string(grib_handle* h, char* buf, size_t* size, int* err) const
+{
+    char mybuf[1024] = {0,};
+    Assert(buf);
+    if ((*err = grib_get_string_internal(h, name_, mybuf, size)) != GRIB_SUCCESS)
+        return NULL;
+
+    snprintf(buf, 32, "%ld", (long)strlen(mybuf));
+    return buf;
+}
+
+void Length::print(grib_context* c, grib_handle* f, FILE* out) const
+{
+    fprintf(out, "access('%s", name_);
+    if (f) {
+        long s = 0;
+        grib_get_long(f, name_, &s);
+        fprintf(out, "=%ld", s);
+    }
+    fprintf(out, "')");
+}
+
+void Length::destroy(grib_context* c)
+{
+    grib_context_free_persistent(c, name_);
+}
+
+void Length::add_dependency(grib_accessor* observer)
+{
+    grib_accessor* observed = grib_find_accessor(grib_handle_of_accessor(observer), name_);
+
+    if (!observed) {
+        /* grib_context_log(observer->context, GRIB_LOG_ERROR, */
+        /* "Error in accessor_add_dependency: cannot find [%s]", name_); */
+        /* Assert(observed); */
+        return;
+    }
+
+    grib_dependency_add(observer, observed);
+}
+
+Length::Length(grib_context* c, const char* name)
+{
+    name_ = grib_context_strdup_persistent(c, name);
+}
+
+int Length::native_type(grib_handle* h) const
+{
+    return GRIB_TYPE_LONG;
+}
+
+} // namespace eccodes::expression
+
+grib_expression* new_length_expression(grib_context* c, const char* name) {
+    return new eccodes::expression::Length(c, name);
+}
diff --git a/src/expression/grib_expression_class_length.h b/src/expression/grib_expression_class_length.h
new file mode 100644
index 000000000..6919d1bcf
--- /dev/null
+++ b/src/expression/grib_expression_class_length.h
@@ -0,0 +1,38 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class Length : public Expression {
+public:
+    Length(grib_context* c, const char*);
+
+    void destroy(grib_context*) override;
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override;
+    string get_name() const override;
+    int native_type(grib_handle*) const override;
+    int evaluate_long(grib_handle*, long*) const override;
+    int evaluate_double(grib_handle*, double*) const override;
+    string evaluate_string(grib_handle*, char*, size_t*, int*) const override;
+
+    const char* class_name() const override { return "length"; };
+
+private:
+    char* name_   = nullptr;
+};
+
+}  // namespace eccodes::expression
+
+grib_expression* new_length_expression(grib_context* c, const char*);
diff --git a/src/expression/grib_expression_class_logical_and.cc b/src/expression/grib_expression_class_logical_and.cc
new file mode 100644
index 000000000..d5cfeaca8
--- /dev/null
+++ b/src/expression/grib_expression_class_logical_and.cc
@@ -0,0 +1,112 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression_class_logical_and.h"
+
+
+namespace eccodes::expression {
+
+int LogicalAnd::evaluate_long(grib_handle* h, long* lres) const
+{
+    long v1    = 0;
+    long v2    = 0;
+    double dv1 = 0;
+    double dv2 = 0;
+    int ret;
+
+    switch (left_->native_type(h)) {
+        case GRIB_TYPE_LONG:
+            ret = left_->evaluate_long(h, &v1);
+            if (ret != GRIB_SUCCESS)
+                return ret;
+            if (v1 == 0) {
+                *lres = 0;
+                return ret;
+            }
+            break;
+        case GRIB_TYPE_DOUBLE:
+            ret = left_->evaluate_double(h, &dv1);
+            if (ret != GRIB_SUCCESS)
+                return ret;
+            if (dv1 == 0) {
+                *lres = 0;
+                return ret;
+            }
+            break;
+        default:
+            return GRIB_INVALID_TYPE;
+    }
+
+    switch (right_->native_type(h)) {
+        case GRIB_TYPE_LONG:
+            ret = right_->evaluate_long(h, &v2);
+            if (ret != GRIB_SUCCESS)
+                return ret;
+            *lres = v2 ? 1 : 0;
+            break;
+        case GRIB_TYPE_DOUBLE:
+            ret = right_->evaluate_double(h, &dv2);
+            if (ret != GRIB_SUCCESS)
+                return ret;
+            *lres = dv2 ? 1 : 0;
+            break;
+        default:
+            return GRIB_INVALID_TYPE;
+    }
+
+    return GRIB_SUCCESS;
+}
+
+int LogicalAnd::evaluate_double(grib_handle* h, double* dres) const
+{
+    long lres = 0;
+    int ret = evaluate_long(h, &lres);
+    *dres = (double)lres;
+    return ret;
+}
+
+void LogicalAnd::print(grib_context* c, grib_handle* f, FILE* out) const
+{
+    fprintf(out, "(");
+    left_->print(c, f, out);
+    fprintf(out, " && ");
+    right_->print(c, f, out);
+    fprintf(out, ")");
+}
+
+void LogicalAnd::destroy(grib_context* c)
+{
+    left_->destroy(c);
+    right_->destroy(c);
+}
+
+void LogicalAnd::add_dependency(grib_accessor* observer)
+{
+    left_->add_dependency(observer);
+    right_->add_dependency(observer);
+}
+
+LogicalAnd::LogicalAnd(grib_context* c, Expression* left, Expression* right)
+{
+    left_  = left;
+    right_ = right;
+}
+
+int LogicalAnd::native_type(grib_handle* h) const
+{
+    return GRIB_TYPE_LONG;
+}
+
+} // namespace eccodes::expression
+
+
+grib_expression* new_logical_and_expression(grib_context* c, grib_expression* left, grib_expression* right) {
+    return new eccodes::expression::LogicalAnd(c, left, right);
+}
diff --git a/src/expression/grib_expression_class_logical_and.h b/src/expression/grib_expression_class_logical_and.h
new file mode 100644
index 000000000..830bbc7c1
--- /dev/null
+++ b/src/expression/grib_expression_class_logical_and.h
@@ -0,0 +1,37 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class LogicalAnd : public Expression {
+public:
+    LogicalAnd(grib_context*, Expression*, Expression*);
+
+    void destroy(grib_context*) override;
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override;
+    int native_type(grib_handle*) const override;
+    int evaluate_long(grib_handle*, long*) const override;
+    int evaluate_double(grib_handle*, double*) const override;
+
+    const char* class_name() const override { return "logical_and"; };
+
+private:
+    Expression* left_  = nullptr;
+    Expression* right_ = nullptr;
+};
+
+}  // namespace eccodes::expression
+
+grib_expression* new_logical_and_expression(grib_context*, grib_expression*, grib_expression*);
diff --git a/src/expression/grib_expression_class_logical_or.cc b/src/expression/grib_expression_class_logical_or.cc
new file mode 100644
index 000000000..ff6cd01cf
--- /dev/null
+++ b/src/expression/grib_expression_class_logical_or.cc
@@ -0,0 +1,112 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression_class_logical_or.h"
+
+namespace eccodes::expression {
+
+
+LogicalOr::LogicalOr(grib_context* c, Expression* left, Expression* right)
+{
+    left_  = left;
+    right_ = right;
+}
+
+int LogicalOr::evaluate_long(grib_handle* h, long* lres) const
+{
+    long v1    = 0;
+    long v2    = 0;
+    double dv1 = 0;
+    double dv2 = 0;
+    int ret;
+
+
+    switch (left_->native_type(h)) {
+        case GRIB_TYPE_LONG:
+            ret = left_->evaluate_long(h, &v1);
+            if (ret != GRIB_SUCCESS)
+                return ret;
+            if (v1 != 0) {
+                *lres = 1;
+                return ret;
+            }
+            break;
+        case GRIB_TYPE_DOUBLE:
+            ret = left_->evaluate_double(h, &dv1);
+            if (ret != GRIB_SUCCESS)
+                return ret;
+            if (dv1 != 0) {
+                *lres = 1;
+                return ret;
+            }
+            break;
+        default:
+            return GRIB_INVALID_TYPE;
+    }
+
+    switch (right_->native_type(h)) {
+        case GRIB_TYPE_LONG:
+            ret = right_->evaluate_long(h, &v2);
+            if (ret != GRIB_SUCCESS)
+                return ret;
+            *lres = v2 ? 1 : 0;
+            break;
+        case GRIB_TYPE_DOUBLE:
+            ret = right_->evaluate_double(h, &dv2);
+            if (ret != GRIB_SUCCESS)
+                return ret;
+            *lres = dv2 ? 1 : 0;
+            break;
+        default:
+            return GRIB_INVALID_TYPE;
+    }
+
+    return GRIB_SUCCESS;
+}
+
+int LogicalOr::evaluate_double(grib_handle* h, double* dres) const
+{
+    long lres = 0;
+    int ret = evaluate_long(h, &lres);
+    *dres = (double)lres;
+    return ret;
+}
+
+void LogicalOr::print(grib_context* c, grib_handle* f, FILE* out) const
+{
+    fprintf(out, "(");
+    left_->print(c, f, out);
+    fprintf(out, " || ");
+    right_->print(c, f, out);
+    fprintf(out, ")");
+}
+
+void LogicalOr::destroy(grib_context* c)
+{
+    left_->destroy(c);
+    right_->destroy(c);
+}
+
+void LogicalOr::add_dependency(grib_accessor* observer)
+{
+    left_->add_dependency(observer);
+    right_->add_dependency(observer);
+}
+
+int LogicalOr::native_type(grib_handle* h) const
+{
+    return GRIB_TYPE_LONG;
+}
+
+}  // namespace eccodes::expression
+
+grib_expression* new_logical_or_expression(grib_context* c, grib_expression* left, grib_expression* right) {
+    return new eccodes::expression::LogicalOr(c, left, right);
+}
diff --git a/src/expression/grib_expression_class_logical_or.h b/src/expression/grib_expression_class_logical_or.h
new file mode 100644
index 000000000..b964a2260
--- /dev/null
+++ b/src/expression/grib_expression_class_logical_or.h
@@ -0,0 +1,35 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class LogicalOr : public Expression {
+public:
+    LogicalOr(grib_context*, Expression*, Expression*);
+
+    void destroy(grib_context*) override;
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override;
+    int native_type(grib_handle*) const override;
+    int evaluate_long(grib_handle*, long*) const override;
+    int evaluate_double(grib_handle*, double*) const override;
+
+    const char* class_name() const override { return "logical_or"; };
+
+private:
+    Expression* left_  = nullptr;
+    Expression* right_ = nullptr;
+};
+
+}  // namespace eccodes::expression
+
+grib_expression* new_logical_or_expression(grib_context*, grib_expression*, grib_expression*);
diff --git a/src/expression/grib_expression_class_long.cc b/src/expression/grib_expression_class_long.cc
new file mode 100644
index 000000000..97e667eb8
--- /dev/null
+++ b/src/expression/grib_expression_class_long.cc
@@ -0,0 +1,46 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression_class_long.h"
+
+namespace eccodes::expression {
+
+int Long::evaluate_long(grib_handle* h, long* lres) const
+{
+    *lres = value_;
+    return GRIB_SUCCESS;
+}
+
+int Long::evaluate_double(grib_handle* h, double* dres) const
+{
+    *dres = value_;
+    return GRIB_SUCCESS;
+}
+
+void Long::print(grib_context* c, grib_handle* f, FILE* out) const
+{
+    fprintf(out, "long(%ld)", value_);
+}
+
+void Long::add_dependency(grib_accessor* observer)
+{
+    /* grib_expression_long* e = (grib_expression_long*)g; */
+}
+
+int Long::native_type(grib_handle* h) const
+{
+    return GRIB_TYPE_LONG;
+}
+
+}  // namespace eccodes::expression
+
+grib_expression* new_long_expression(grib_context* c, long value) {
+    return new eccodes::expression::Long(value);
+}
diff --git a/src/expression/grib_expression_class_long.h b/src/expression/grib_expression_class_long.h
new file mode 100644
index 000000000..f1a609b34
--- /dev/null
+++ b/src/expression/grib_expression_class_long.h
@@ -0,0 +1,35 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class Long : public Expression {
+public:
+    Long(long value) : value_(value) {}
+
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override;
+    int native_type(grib_handle*) const override;
+    int evaluate_long(grib_handle*, long*) const override;
+    int evaluate_double(grib_handle*, double*) const override;
+
+    const char* class_name() const override { return "long"; };
+
+private:
+    long value_ = 0;
+};
+
+}  // namespace eccodes::expression
+
+grib_expression* new_long_expression(grib_context*, long);
diff --git a/src/expression/grib_expression_class_string.cc b/src/expression/grib_expression_class_string.cc
new file mode 100644
index 000000000..4d2991439
--- /dev/null
+++ b/src/expression/grib_expression_class_string.cc
@@ -0,0 +1,49 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression_class_string.h"
+
+namespace eccodes::expression {
+
+String::String(grib_context* c, const char* value) {
+    value_ = grib_context_strdup_persistent(c, value);
+}
+
+Expression::string String::evaluate_string(grib_handle* h, char* buf, size_t* size, int* err) const
+{
+    *err = 0;
+    return value_;
+}
+
+void String::print(grib_context* c, grib_handle* f, FILE* out) const
+{
+    fprintf(out, "string('%s')", value_);
+}
+
+void String::destroy(grib_context* c)
+{
+    grib_context_free_persistent(c, value_);
+}
+
+void String::add_dependency(grib_accessor* observer)
+{
+    /* grib_expression_string* e = (grib_expression_string*)g; */
+}
+
+int String::native_type(grib_handle* h) const
+{
+    return GRIB_TYPE_STRING;
+}
+
+} // namespace eccodes::expression
+
+grib_expression* new_string_expression(grib_context* c, const char* value) {
+    return new eccodes::expression::String(c, value);
+}
diff --git a/src/expression/grib_expression_class_string.h b/src/expression/grib_expression_class_string.h
new file mode 100644
index 000000000..9de5ddbd3
--- /dev/null
+++ b/src/expression/grib_expression_class_string.h
@@ -0,0 +1,35 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class String : public Expression {
+public:
+    String(grib_context*, const char*);
+
+    void destroy(grib_context*) override;
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override;
+    int native_type(grib_handle*) const override;
+    string evaluate_string(grib_handle*, char*, size_t*, int*) const override;
+
+    const char* class_name() const override { return "string"; };
+
+private:
+    char* value_ = nullptr;
+};
+
+}  // namespace eccodes::expression
+
+grib_expression* new_string_expression(grib_context*, const char*);
diff --git a/src/expression/grib_expression_class_string_compare.cc b/src/expression/grib_expression_class_string_compare.cc
new file mode 100644
index 000000000..21cef316f
--- /dev/null
+++ b/src/expression/grib_expression_class_string_compare.cc
@@ -0,0 +1,104 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression_class_string_compare.h"
+
+namespace eccodes::expression {
+
+/* Note: A fast cut-down version of strcmp which does NOT return -1 */
+/* 0 means input strings are equal and 1 means not equal */
+GRIB_INLINE static int grib_inline_strcmp(const char* a, const char* b)
+{
+    if (*a != *b)
+        return 1;
+    while ((*a != 0 && *b != 0) && *(a) == *(b)) {
+        a++;
+        b++;
+    }
+    return (*a == 0 && *b == 0) ? 0 : 1;
+}
+
+int StringCompare::evaluate_long(grib_handle* h, long* lres) const
+{
+    int ret = 0;
+    char b1[1024] = {0,};
+    size_t l1 = sizeof(b1);
+    char b2[1024] = {0,};
+    size_t l2 = sizeof(b2);
+    const char* v1 = NULL;
+    const char* v2 = NULL;
+
+
+    v1 = left_->evaluate_string(h, b1, &l1, &ret);
+    if (!v1 || ret) {
+        *lres = 0;
+        return ret;
+    }
+
+    v2 = right_->evaluate_string(h, b2, &l2, &ret);
+    if (!v2 || ret) {
+        *lres = 0;
+        return ret;
+    }
+
+    if (eq_) // IS operator
+        *lres = (grib_inline_strcmp(v1, v2) == 0);
+    else // ISNOT operator
+        *lres = (grib_inline_strcmp(v1, v2) != 0);
+
+    return GRIB_SUCCESS;
+}
+
+int StringCompare::evaluate_double(grib_handle* h, double* dres) const
+{
+    long n;
+    int ret = evaluate_long(h, &n);
+    *dres   = n;
+    return ret;
+}
+
+void StringCompare::print(grib_context* c, grib_handle* f, FILE* out) const
+{
+    fprintf(out, "string_compare(");
+    left_->print(c, f, out);
+    fprintf(out, ",");
+    left_->print(c, f, out);
+    fprintf(out, ")");
+}
+
+void StringCompare::destroy(grib_context* c)
+{
+    left_->destroy(c);
+    right_->destroy(c);
+}
+
+void StringCompare::add_dependency(grib_accessor* observer)
+{
+    left_->add_dependency(observer);
+    right_->add_dependency(observer);
+}
+
+StringCompare::StringCompare(grib_context* c, Expression* left, Expression* right, int eq)
+{
+    left_  = left;
+    right_ = right;
+    eq_    = eq;
+}
+
+int StringCompare::native_type(grib_handle* h) const
+{
+    return GRIB_TYPE_LONG;
+}
+
+} // namespace eccodes::expression
+
+grib_expression* new_string_compare_expression(grib_context* c, grib_expression* left, grib_expression* right, int eq) {
+    return new eccodes::expression::StringCompare(c, left, right, eq);
+}
diff --git a/src/expression/grib_expression_class_string_compare.h b/src/expression/grib_expression_class_string_compare.h
new file mode 100644
index 000000000..50d1a8572
--- /dev/null
+++ b/src/expression/grib_expression_class_string_compare.h
@@ -0,0 +1,38 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class StringCompare : public Expression {
+public:
+    StringCompare(grib_context*, Expression*, Expression*, int);
+
+    void destroy(grib_context*) override;
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override;
+    int native_type(grib_handle*) const override;
+    int evaluate_long(grib_handle*, long*) const override;
+    int evaluate_double(grib_handle*, double*) const override;
+
+    const char* class_name() const override { return "string_compare"; };
+
+private:
+    Expression* left_  = nullptr;
+    Expression* right_ = nullptr;
+    int eq_ = 0;
+};
+
+}  // namespace eccodes::expression
+
+grib_expression* new_string_compare_expression(grib_context*, grib_expression*, grib_expression*, int);
diff --git a/src/expression/grib_expression_class_sub_string.cc b/src/expression/grib_expression_class_sub_string.cc
new file mode 100644
index 000000000..b37b7fa3e
--- /dev/null
+++ b/src/expression/grib_expression_class_sub_string.cc
@@ -0,0 +1,70 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression_class_sub_string.h"
+
+namespace eccodes::expression {
+
+Expression::string SubString::evaluate_string(grib_handle* h, char* buf, size_t* size, int* err) const
+{
+    *err = 0;
+    return value_;
+}
+
+void SubString::print(grib_context* c, grib_handle* f, FILE* out) const
+{
+    fprintf(out, "string('%s')", value_);
+}
+
+void SubString::destroy(grib_context* c)
+{
+    grib_context_free_persistent(c, value_);
+}
+
+void SubString::add_dependency(grib_accessor* observer)
+{
+    /* grib_expression_sub_string* e = (grib_expression_sub_string*)g; */
+}
+
+SubString::SubString(grib_context* c, const char* value, size_t start, size_t length)
+{
+    char v[1024] = {0,};
+
+    memcpy(v, value + start, length);
+    value_ = grib_context_strdup_persistent(c, v);
+}
+
+int SubString::native_type(grib_handle* h) const
+{
+    return GRIB_TYPE_STRING;
+}
+
+}  // namespace eccodes::expression
+
+grib_expression* new_sub_string_expression(grib_context* c, const char* value, size_t start, size_t length)
+{
+    /* if (start<0) start+=strlen(value);  */
+    const size_t slen = strlen(value);
+
+    if (length == 0) {
+        grib_context_log(c, GRIB_LOG_ERROR, "Invalid substring: length must be > 0");
+        return NULL;
+    }
+    if (start > slen) { /* to catch a -ve number passed to start */
+        grib_context_log(c, GRIB_LOG_ERROR, "Invalid substring: start=%lu", start);
+        return NULL;
+    }
+    if (start + length > slen) {
+        grib_context_log(c, GRIB_LOG_ERROR, "Invalid substring: start(=%lu)+length(=%lu) > length('%s'))", start, length, value);
+        return NULL;
+    }
+
+    return new eccodes::expression::SubString(c, value, start, length);
+}
diff --git a/src/expression/grib_expression_class_sub_string.h b/src/expression/grib_expression_class_sub_string.h
new file mode 100644
index 000000000..b1239f606
--- /dev/null
+++ b/src/expression/grib_expression_class_sub_string.h
@@ -0,0 +1,35 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class SubString : public Expression {
+public:
+    SubString(grib_context*, const char*, size_t, size_t);
+
+    void destroy(grib_context*) override;
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override;
+    int native_type(grib_handle*) const override;
+    string evaluate_string(grib_handle*, char*, size_t*, int*) const override;
+
+    const char* class_name() const override { return "sub_string"; };
+
+private:
+    char* value_ = nullptr;
+};
+
+}  // namespace eccodes::expression
+
+grib_expression* new_sub_string_expression(grib_context*, const char*, size_t, size_t);
diff --git a/src/expression/grib_expression_class_true.cc b/src/expression/grib_expression_class_true.cc
new file mode 100644
index 000000000..f0ee218e7
--- /dev/null
+++ b/src/expression/grib_expression_class_true.cc
@@ -0,0 +1,42 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression_class_true.h"
+
+namespace eccodes::expression {
+
+int True::evaluate_long(grib_handle* h, long* lres) const
+{
+    *lres = 1;
+    return GRIB_SUCCESS;
+}
+
+int True::evaluate_double(grib_handle* h, double* dres) const
+{
+    *dres = 1;
+    return GRIB_SUCCESS;
+}
+
+void True::print(grib_context* c, grib_handle* f, FILE* out) const
+{
+    fprintf(out, "true()");
+}
+
+int True::native_type(grib_handle* h) const
+{
+    return GRIB_TYPE_LONG;
+}
+
+}  // namespace eccodes::expression
+
+grib_expression* new_true_expression(grib_context* c) {
+    return new eccodes::expression::True();
+}
+
diff --git a/src/expression/grib_expression_class_true.h b/src/expression/grib_expression_class_true.h
new file mode 100644
index 000000000..588dfa767
--- /dev/null
+++ b/src/expression/grib_expression_class_true.h
@@ -0,0 +1,32 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class True : public Expression {
+public:
+    True() = default;
+
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override {};
+    int native_type(grib_handle*) const override;
+    int evaluate_long(grib_handle*, long*) const override;
+    int evaluate_double(grib_handle*, double*) const override;
+
+    const char* class_name() const override { return "true"; };
+};
+
+}  // namespace eccodes::expression
+
+grib_expression* new_true_expression(grib_context*);
diff --git a/src/expression/grib_expression_class_unop.cc b/src/expression/grib_expression_class_unop.cc
new file mode 100644
index 000000000..cd0026ed2
--- /dev/null
+++ b/src/expression/grib_expression_class_unop.cc
@@ -0,0 +1,70 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_expression_class_unop.h"
+
+namespace eccodes::expression {
+
+Unop::Unop(grib_context* c, Expression::UnopLongProc long_func,
+           Expression::UnopDoubleProc double_func,
+           Expression* exp) : exp_(exp), long_func_(long_func), double_func_(double_func) {}
+
+int Unop::evaluate_long(grib_handle* h, long* lres) const
+{
+    long v = 0;
+    int ret = exp_->evaluate_long(h, &v);
+    if (ret != GRIB_SUCCESS)
+        return ret;
+    *lres = long_func_(v);
+    return GRIB_SUCCESS;
+}
+
+int Unop::evaluate_double(grib_handle* h, double* dres) const
+{
+    double v = 0;
+    int ret = exp_->evaluate_double(h, &v);
+    if (ret != GRIB_SUCCESS)
+        return ret;
+    *dres = double_func_ ? double_func_(v) : long_func_(v);
+    return GRIB_SUCCESS;
+}
+
+Expression::string Unop::get_name() const
+{
+    return exp_->get_name();
+}
+
+void Unop::print(grib_context* c, grib_handle* f, FILE* out) const
+{
+    fprintf(out, "unop(");
+    exp_->print(c, f, out);
+    fprintf(out, ")");
+}
+
+void Unop::destroy(grib_context* c)
+{
+    exp_->destroy(c);
+}
+
+void Unop::add_dependency(grib_accessor* observer)
+{
+    exp_->add_dependency(observer);
+}
+
+int Unop::native_type(grib_handle* h) const
+{
+    return long_func_ ? GRIB_TYPE_LONG : GRIB_TYPE_DOUBLE;
+}
+
+}  // namespace eccodes::expression
+
+grib_expression* new_unop_expression(grib_context* c, grib_unop_long_proc long_func, grib_unop_double_proc double_func, grib_expression* exp) {
+    return new eccodes::expression::Unop(c, long_func, double_func, exp);
+}
diff --git a/src/expression/grib_expression_class_unop.h b/src/expression/grib_expression_class_unop.h
new file mode 100644
index 000000000..a16cd17a7
--- /dev/null
+++ b/src/expression/grib_expression_class_unop.h
@@ -0,0 +1,39 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#pragma once
+
+#include "grib_expression.h"
+
+namespace eccodes::expression {
+
+class Unop : public Expression {
+public:
+    Unop(grib_context*, UnopLongProc, UnopDoubleProc, Expression*);
+
+    void destroy(grib_context*) override;
+    void print(grib_context*, grib_handle*, FILE*) const override;
+    void add_dependency(grib_accessor*) override;
+    string get_name() const override;
+    int native_type(grib_handle*) const override;
+    int evaluate_long(grib_handle*, long*) const override;
+    int evaluate_double(grib_handle*, double*) const override;
+
+    const char* class_name() const override { return "unop"; };
+
+private:
+    Expression* exp_            = nullptr;
+    UnopLongProc long_func_     = nullptr;
+    UnopDoubleProc double_func_ = nullptr;
+};
+
+}  // namespace eccodes::expression
+
+grib_expression* new_unop_expression(grib_context*, grib_unop_long_proc, grib_unop_double_proc, grib_expression*);
diff --git a/src/geo/GeoIterator.cc b/src/geo/GeoIterator.cc
new file mode 100644
index 000000000..89e465fa0
--- /dev/null
+++ b/src/geo/GeoIterator.cc
@@ -0,0 +1,104 @@
+/*
+ * (C) Copyright 2024- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+
+#include "geo/GeoIterator.h"
+
+#include "eckit/exception/Exceptions.h"
+
+#include "geo/GribSpec.h"
+
+
+namespace eccodes::geo
+{
+
+
+GeoIterator::GeoIterator(grib_handle* h, unsigned long flags) :
+    spec_(new GribSpec(h)), grid_(eckit::geo::GridFactory::build(*spec_)), iter_(grid_->cbegin().release()), end_(grid_->cend().release())
+{
+    h_          = h;
+    class_name_ = "geo_iterator";
+    flags_      = flags;
+    Assert(h_ != nullptr);
+
+    CODES_CHECK(codes_get_size(h_, "values", &nv_), "");
+    Assert(nv_ > 0);
+
+    data_ = (flags_ & GRIB_GEOITERATOR_NO_VALUES) ? nullptr : static_cast<double*>(grib_context_malloc(h_->context, nv_ * sizeof(double)));
+    Assert(data_ != nullptr);
+
+    auto size = nv_;
+    CODES_CHECK(codes_get_double_array(h_, "values", data_, &size), "");
+    Assert(nv_ == size);
+}
+
+
+int GeoIterator::init(grib_handle*, grib_arguments*)
+{
+    NOTIMP;
+}
+
+
+int GeoIterator::next(double* lat, double* lon, double* val) const
+{
+    if (iter_ == end_) {
+        return 0;  // (false)
+    }
+
+    const auto p  = *iter_;
+    const auto& q = std::get<eckit::geo::PointLonLat>(p);
+
+    *lat = q.lat;
+    *lon = q.lon;
+    if (val != nullptr && data_ != nullptr) {
+        *val = data_[iter_->index()];
+    }
+
+    ++iter_;
+    return 1;  // (true)
+}
+
+
+int GeoIterator::previous(double*, double*, double*) const
+{
+    return GRIB_NOT_IMPLEMENTED;
+}
+
+
+int GeoIterator::reset()
+{
+    iter_.reset(grid_->cbegin().release());
+    return GRIB_SUCCESS;
+}
+
+
+int GeoIterator::destroy()
+{
+    if (data_ != nullptr) {
+        grib_context_free(h_->context, data_);
+    }
+    return Iterator::destroy();
+}
+
+
+bool GeoIterator::has_next() const
+{
+    return iter_ != end_;
+}
+
+
+geo_iterator::Iterator*
+GeoIterator::create() const
+{
+    return new GeoIterator{ h_, flags_ };
+}
+
+
+}  // namespace eccodes::geo
diff --git a/src/geo/GeoIterator.h b/src/geo/GeoIterator.h
new file mode 100644
index 000000000..fefc5aca5
--- /dev/null
+++ b/src/geo/GeoIterator.h
@@ -0,0 +1,51 @@
+/*
+ * (C) Copyright 2024- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+
+#pragma once
+
+#include <memory>
+
+#include "eckit/geo/Grid.h"
+
+// eccodes macros conflict with eckit
+#ifdef Assert
+    #undef Assert
+#endif
+
+#include "geo/iterator/grib_iterator.h"
+
+
+namespace eccodes::geo
+{
+
+
+class GeoIterator : public geo_iterator::Iterator
+{
+public:
+    explicit GeoIterator(grib_handle*, unsigned long flags);
+
+private:
+    std::unique_ptr<const eckit::geo::Spec> spec_;
+    std::unique_ptr<const eckit::geo::Grid> grid_;
+    mutable eckit::geo::Grid::Iterator iter_;
+    eckit::geo::Grid::Iterator end_;
+
+    int init(grib_handle*, grib_arguments*) override;
+    int next(double* lat, double* lon, double* val) const override;
+    int previous(double* lat, double* lon, double* val) const override;
+    int reset() override;
+    int destroy() override;
+    bool has_next() const override;
+    geo_iterator::Iterator* create() const override;
+};
+
+
+}  // namespace eccodes::geo
diff --git a/src/geo/GribSpec.cc b/src/geo/GribSpec.cc
new file mode 100644
index 000000000..b1bfbfbab
--- /dev/null
+++ b/src/geo/GribSpec.cc
@@ -0,0 +1,1104 @@
+/*
+ * (C) Copyright 2024- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities
+ * granted to it by virtue of its status as an intergovernmental organisation nor
+ * does it submit to any jurisdiction.
+ */
+
+
+#include "geo/GribSpec.h"
+
+#include <algorithm>
+#include <cstring>
+#include <functional>
+#include <initializer_list>
+#include <memory>
+#include <ostream>
+#include <sstream>
+#include <vector>
+
+#include "eckit/config/Resource.h"
+#include "eckit/exception/Exceptions.h"
+#include "eckit/geo/PointLonLat.h"
+#include "eckit/geo/util/mutex.h"
+#include "eckit/log/JSON.h"
+#include "eckit/types/FloatCompare.h"
+#include "eckit/types/Fraction.h"
+
+
+namespace eckit::geo::util
+{
+const std::vector<double>& gaussian_latitudes(size_t N, bool increasing);
+}
+
+
+namespace eccodes::geo
+{
+
+
+bool codes_check_error(int e, const char* call)
+{
+    if (e != CODES_SUCCESS) {
+        std::ostringstream os;
+        os << call << ": " << codes_get_error_message(e);
+        throw ::eckit::SeriousBug(os.str());
+    }
+    return true;
+}
+
+
+#define CHECK_ERROR(a, b) codes_check_error(a, b)
+#define CHECK_CALL(a)     codes_check_error(a, #a)
+
+
+namespace
+{
+
+
+using eckit::Log;
+
+
+struct Condition
+{
+    Condition() = default;
+
+    Condition(const Condition&)            = delete;
+    Condition(Condition&&)                 = delete;
+    Condition& operator=(const Condition&) = delete;
+    Condition& operator=(Condition&&)      = delete;
+
+    virtual ~Condition()                   = default;
+    virtual bool eval(codes_handle*) const = 0;
+};
+
+
+template <class T>
+struct ConditionT : Condition
+{
+    const char* key_;
+    T value_;
+    bool eval(codes_handle* /*unused*/) const override;
+
+public:
+    ConditionT(const char* key, const T& value) :
+        key_(key), value_(value) {}
+};
+
+
+template <>
+bool ConditionT<long>::eval(codes_handle* h) const
+{
+    ASSERT(h != nullptr);
+
+    long value = 0;
+    int err    = codes_get_long(h, key_, &value);
+
+    if (err == CODES_NOT_FOUND) {
+        return false;
+    }
+
+    CHECK_ERROR(err, key_);
+    return value_ == value;
+}
+
+
+template <>
+bool ConditionT<double>::eval(codes_handle* h) const
+{
+    ASSERT(h != nullptr);
+
+    double value = 0;
+    int err      = codes_get_double(h, key_, &value);
+
+    if (err == CODES_NOT_FOUND) {
+        return false;
+    }
+
+    CHECK_ERROR(err, key_);
+    return value_ == value;  // Want an epsilon?
+}
+
+
+template <>
+bool ConditionT<std::string>::eval(codes_handle* h) const
+{
+    ASSERT(h != nullptr);
+
+    char buffer[10240];
+    size_t size = sizeof(buffer);
+    int err     = codes_get_string(h, key_, buffer, &size);
+
+    if (err == CODES_NOT_FOUND) {
+        return false;
+    }
+
+    CHECK_ERROR(err, key_);
+    return value_ == buffer;
+}
+
+
+struct ConditionOR : Condition
+{
+    const std::unique_ptr<const Condition> left_;
+    const std::unique_ptr<const Condition> right_;
+    bool eval(codes_handle* h) const override { return left_->eval(h) || right_->eval(h); }
+
+    ConditionOR(const Condition* left, const Condition* right) :
+        left_(left), right_(right) {}
+};
+
+
+struct ConditionAND : Condition
+{
+    const std::unique_ptr<const Condition> left_;
+    const std::unique_ptr<const Condition> right_;
+    bool eval(codes_handle* h) const override { return left_->eval(h) && right_->eval(h); }
+
+    ConditionAND(const Condition* left, const Condition* right) :
+        left_(left), right_(right) {}
+};
+
+
+/*
+class ConditionNOT : public Condition {
+    const Condition* c_;
+    bool eval(codes_handle* h) const  override { return !c_->eval(h); }
+    ~ConditionNOT() override {
+        delete c_;
+    }
+
+public:
+    ConditionNOT(const Condition* c) : c_(c) {}
+};
+*/
+
+
+void wrongly_encoded_grib(const std::string& msg)
+{
+    static bool abortIfWronglyEncodedGRIB = eckit::Resource<bool>("$MIR_ABORT_IF_WRONGLY_ENCODED_GRIB", false);
+
+    if (abortIfWronglyEncodedGRIB) {
+        Log::error() << msg << std::endl;
+        throw eckit::UserError(msg);
+    }
+
+    Log::warning() << msg << std::endl;
+}
+
+
+template <class T>
+Condition* is(const char* key, const T& value)
+{
+    return new ConditionT<T>(key, value);
+}
+
+
+Condition* is(const char* key, const char* value)
+{
+    return new ConditionT<std::string>(key, value);
+}
+
+
+Condition* _and(const Condition* left, const Condition* right)
+{
+    return new ConditionAND(left, right);
+}
+
+
+Condition* _or(const Condition* left, const Condition* right)
+{
+    return new ConditionOR(left, right);
+}
+
+
+/*
+ Condition *_not(const Condition *c) {
+    return new ConditionNOT(c);
+}
+*/
+
+
+Condition* is_gaussian()
+{
+    const auto* key = "gridType";
+    return _or(is(key, "reduced_gg"),
+               _or(is(key, "regular_gg"),
+                   _or(is(key, "reduced_rotated_gg"),
+                       _or(is(key, "regular_rotated_gg"),
+                           _or(is(key, "rotated_gg"),
+                               _or(is(key, "reduced_stretched_gg"),
+                                   _or(is(key, "regular_stretched_gg"),
+                                       _or(is(key, "reduced_stretched_rotated_gg"),
+                                           _or(is(key, "regular_stretched_rotated_gg"),
+                                               _or(is(key, "stretched_gg"), is(key, "stretched_rotated_gg")))))))))));
+}
+
+
+const char* get_key(const std::string& name, codes_handle* h)
+{
+    struct P
+    {
+        const std::string name;
+        const char* key;
+        const std::unique_ptr<const Condition> condition;
+        P(const std::string& _name, const char* _key, const Condition* _condition = nullptr) :
+            name(_name), key(_key), condition(_condition) {}
+    };
+
+    static const std::initializer_list<P> mappings{
+        { "type", "gridType" },
+
+        { "west_east_increment", "iDirectionIncrementInDegrees_fix_for_periodic_regular_grids",
+          is("gridType", "regular_ll") },
+        { "west_east_increment", "iDirectionIncrementInDegrees" },
+        { "south_north_increment", "jDirectionIncrementInDegrees" },
+
+        { "west", "longitudeOfFirstGridPointInDegrees" },
+        { "east", "longitudeOfLastGridPointInDegrees_fix_for_global_reduced_grids", is("gridType", "reduced_gg") },
+        { "east", "longitudeOfLastGridPointInDegrees" },
+
+        { "north", "latitudeOfFirstGridPointInDegrees_fix_for_gaussian_grids",
+          _and(is("scanningMode", 0L), is_gaussian()) },
+        { "south", "latitudeOfLastGridPointInDegrees_fix_for_gaussian_grids",
+          _and(is("scanningMode", 0L), is_gaussian()) },
+        { "north", "latitudeOfLastGridPointInDegrees_fix_for_gaussian_grids",
+          _and(is("scanningMode", 1L), is_gaussian()) },
+        { "south", "latitudeOfFirstGridPointInDegrees_fix_for_gaussian_grids",
+          _and(is("scanningMode", 1L), is_gaussian()) },
+
+        { "north", "latitudeOfLastGridPointInDegrees", is("jScansPositively", 1L) },
+        { "south", "latitudeOfFirstGridPointInDegrees", is("jScansPositively", 1L) },
+        { "north", "latitudeOfFirstGridPointInDegrees", is("scanningMode", 0L) },
+        { "south", "latitudeOfLastGridPointInDegrees", is("scanningMode", 0L) },
+
+        { "north", "latitudeOfLastGridPointInDegrees", is("jScansPositively", 1L) },
+        { "south", "latitudeOfFirstGridPointInDegrees", is("jScansPositively", 1L) },
+        { "north", "latitudeOfFirstGridPointInDegrees" },
+        { "south", "latitudeOfLastGridPointInDegrees" },
+
+        { "truncation", "pentagonalResolutionParameterJ" },  // Assumes triangular truncation
+        { "accuracy", "bitsPerValue" },
+
+        { "south_pole_latitude", "latitudeOfSouthernPoleInDegrees" },
+        { "south_pole_longitude", "longitudeOfSouthernPoleInDegrees" },
+        { "south_pole_rotation_angle", "angleOfRotationInDegrees" },
+
+        { "proj", "projTargetString" },
+        { "projSource", "projSourceString" },
+
+        // This will be just called for has()
+        {
+            "gridded",
+            "Nx",
+            _or(_or(_or(is("gridType", "polar_stereographic"), is("gridType", "lambert_azimuthal_equal_area")),
+                    is("gridType", "lambert")),
+                is("gridType", "space_view")),
+        },
+        {
+            "gridded",
+            "Ni",
+            is("gridType", "triangular_grid"),
+        },
+        {
+            "gridded",
+            "numberOfGridInReference" /*just a dummy*/,
+            is("gridType", "unstructured_grid"),
+        },
+        { "gridded", "numberOfPointsAlongAMeridian" },  // Is that always true?
+        { "gridded_regular_ll", "Ni", _or(is("gridType", "regular_ll"), is("gridType", "rotated_ll")) },
+        { "gridded_named", "gridName" },
+
+        { "grid", "gridName",
+          _or(_or(_or(_or(is("gridType", "regular_gg"), is("gridType", "reduced_gg")), is("gridType", "rotated_gg")),
+                  is("gridType", "reduced_rotated_gg")),
+              is("gridType", "unstructured_grid")) },
+
+        { "spectral", "pentagonalResolutionParameterJ" },
+
+        { "uid", "uuidOfHGrid", is("gridType", "unstructured_grid") },
+
+        /// FIXME: Find something that does no clash
+        { "reduced", "numberOfParallelsBetweenAPoleAndTheEquator", is("isOctahedral", 0L) },
+        { "regular", "N", is("gridType", "regular_gg") },
+        { "octahedral", "numberOfParallelsBetweenAPoleAndTheEquator", is("isOctahedral", 1L) },
+
+        /// TODO: is that a good idea?
+        { "param", "paramId" },
+        { "statistics", "" },  // (avoid ecCodes error "statistics: Function not yet implemented")
+    };
+
+    for (const auto& m : mappings) {
+        if (name == m.name) {
+            if (!m.condition || m.condition->eval(h)) {
+                return m.key;
+            }
+        }
+    }
+
+    const auto* key = name.c_str();
+    return key;
+}
+
+
+template <typename T>
+struct ProcessingT
+{
+    using fun_t = std::function<bool(codes_handle*, T&)>;
+    fun_t fun_;
+    explicit ProcessingT(fun_t&& fun) :
+        fun_(fun) {}
+    ~ProcessingT()                     = default;
+    ProcessingT(const ProcessingT&)    = delete;
+    ProcessingT(ProcessingT&&)         = delete;
+    void operator=(const ProcessingT&) = delete;
+    void operator=(ProcessingT&&)      = delete;
+    bool eval(codes_handle* h, T& v) const { return fun_(h, v); }
+};
+
+
+ProcessingT<double>* angular_precision()
+{
+    return new ProcessingT<double>([](codes_handle* h, double& value) {
+        auto well_defined = [](codes_handle* h, const char* key) -> bool {
+            long dummy = 0;
+            int err    = 0;
+            return (codes_is_defined(h, key) != 0) && (codes_is_missing(h, key, &err) == 0) && (err == CODES_SUCCESS) &&
+                   (codes_get_long(h, key, &dummy) == CODES_SUCCESS) && (dummy != 0);
+        };
+
+        if (well_defined(h, "basicAngleOfTheInitialProductionDomain") && well_defined(h, "subdivisionsOfBasicAngle")) {
+            value = 0.;
+            return true;
+        }
+
+        long angleSubdivisions = 0;
+        CHECK_CALL(codes_get_long(h, "angleSubdivisions", &angleSubdivisions));
+
+        value = angleSubdivisions > 0 ? 1. / static_cast<double>(angleSubdivisions) : 0.;
+        return true;
+    });
+}
+
+
+ProcessingT<double>* longitudeOfLastGridPointInDegrees_fix_for_global_reduced_grids()
+{
+    return new ProcessingT<double>([](codes_handle* h, double& Lon2) {
+        Lon2 = 0;
+        CHECK_CALL(codes_get_double(h, "longitudeOfLastGridPointInDegrees", &Lon2));
+
+        if (codes_is_defined(h, "pl") != 0) {
+            double Lon1 = 0;
+            CHECK_CALL(codes_get_double(h, "longitudeOfFirstGridPointInDegrees", &Lon1));
+
+            if (eckit::types::is_approximately_equal<double>(Lon1, 0)) {
+                // get pl array maximum and sum
+                // if sum equals values size the grid must be global
+                size_t plSize = 0;
+                CHECK_CALL(codes_get_size(h, "pl", &plSize));
+                ASSERT(plSize > 0);
+
+                std::vector<long> pl(plSize, 0);
+                size_t plSizeAsRead = plSize;
+                CHECK_CALL(codes_get_long_array(h, "pl", pl.data(), &plSizeAsRead));
+                ASSERT(plSize == plSizeAsRead);
+
+                long plMax = 0;
+                long plSum = 0;
+                for (auto& p : pl) {
+                    plSum += p;
+                    if (plMax < p) {
+                        plMax = p;
+                    }
+                }
+                ASSERT(plMax > 0);
+
+                size_t valuesSize = 0;
+                CHECK_CALL(codes_get_size(h, "values", &valuesSize));
+
+                if (static_cast<size_t>(plSum) == valuesSize) {
+                    double eps = 0.;
+                    ASSERT(std::unique_ptr<ProcessingT<double>>(angular_precision())->eval(h, eps));
+
+                    eckit::Fraction Lon2_expected(360L * (plMax - 1L), plMax);
+
+                    if (!eckit::types::is_approximately_greater_or_equal<double>(Lon2, Lon2_expected, eps)) {
+                        std::ostringstream msgs;
+                        msgs.precision(32);
+                        msgs << "GribParametrisation: wrongly encoded longitudeOfLastGridPointInDegrees:"
+                             << "\n"
+                                "encoded:  "
+                             << Lon2
+                             << "\n"
+                                "expected: "
+                             << static_cast<double>(Lon2_expected) << " (" << Lon2_expected << " +- " << eps << ")";
+
+                        wrongly_encoded_grib(msgs.str());
+                    }
+
+                    Lon2 = 360.;
+                }
+            }
+        }
+
+        return true;
+    });
+};
+
+
+ProcessingT<double>* latitudeOfFirstGridPointInDegrees_fix_for_gaussian_grids()
+{
+    return new ProcessingT<double>([](codes_handle* h, double& lat) {
+        double eps = 0.;
+        ASSERT(std::unique_ptr<ProcessingT<double>>(angular_precision())->eval(h, eps));
+
+        long N = 0L;
+        CHECK_CALL(codes_get_long(h, "N", &N));
+        ASSERT(N > 0);
+
+        double& Lat1 = lat;
+        CHECK_CALL(codes_get_double(h, "latitudeOfFirstGridPointInDegrees", &Lat1));
+
+        double Lat2 = 0.;
+        CHECK_CALL(codes_get_double(h, "latitudeOfLastGridPointInDegrees", &Lat2));
+
+        const auto snap = eckit::geo::util::gaussian_latitudes(N, Lat1 < Lat2).front();
+        if (eckit::types::is_approximately_equal(Lat1, snap, eps)) {
+            lat = snap < 0. ? eckit::geo::SOUTH_POLE.lat : eckit::geo::NORTH_POLE.lat;
+        }
+
+        return true;
+    });
+}
+
+
+ProcessingT<double>* latitudeOfLastGridPointInDegrees_fix_for_gaussian_grids()
+{
+    return new ProcessingT<double>([](codes_handle* h, double& lat) {
+        double eps = 0.;
+        ASSERT(std::unique_ptr<ProcessingT<double>>(angular_precision())->eval(h, eps));
+
+        long N = 0L;
+        CHECK_CALL(codes_get_long(h, "N", &N));
+        ASSERT(N > 0);
+
+        double Lat1 = 0.;
+        CHECK_CALL(codes_get_double(h, "latitudeOfFirstGridPointInDegrees", &Lat1));
+
+        double& Lat2 = lat;
+        CHECK_CALL(codes_get_double(h, "latitudeOfLastGridPointInDegrees", &Lat2));
+
+        const auto snap = eckit::geo::util::gaussian_latitudes(N, Lat1 < Lat2).back();
+        if (eckit::types::is_approximately_equal(Lat2, snap, eps)) {
+            lat = snap < 0. ? eckit::geo::SOUTH_POLE.lat : eckit::geo::NORTH_POLE.lat;
+        }
+
+        return true;
+    });
+}
+
+
+ProcessingT<double>* iDirectionIncrementInDegrees_fix_for_periodic_regular_grids()
+{
+    return new ProcessingT<double>([](codes_handle* h, double& we) {
+        long iScansPositively = 0L;
+        CHECK_CALL(codes_get_long(h, "iScansPositively", &iScansPositively));
+        ASSERT(iScansPositively == 1L);
+
+        CHECK_CALL(codes_get_double(h, "iDirectionIncrementInDegrees", &we));
+        ASSERT(we > 0.);
+
+        double Lon1 = 0.;
+        double Lon2 = 0.;
+        long Ni     = 0;
+        CHECK_CALL(codes_get_double(h, "longitudeOfFirstGridPointInDegrees", &Lon1));
+        CHECK_CALL(codes_get_double(h, "longitudeOfLastGridPointInDegrees", &Lon2));
+        CHECK_CALL(codes_get_long(h, "Ni", &Ni));
+        ASSERT(Ni > 0);
+
+        Lon2 = eckit::geo::PointLonLat::normalise_angle_to_minimum(Lon2, Lon1);
+        ASSERT(Lon2 >= Lon1);
+
+        // angles are within +-1/2 precision, so (Lon2 - Lon1 + we) uses factor 3*1/2
+        double eps = 0.;
+        ASSERT(std::unique_ptr<ProcessingT<double>>(angular_precision())->eval(h, eps));
+        eps *= 1.5;
+
+        constexpr double GLOBE = 360;
+
+        auto Nid = static_cast<double>(Ni);
+        if (eckit::types::is_approximately_equal(Lon2 - Lon1 + we, GLOBE, eps)) {
+            we = GLOBE / Nid;
+        }
+        else if (!eckit::types::is_approximately_equal(Lon1 + (Nid - 1) * we, Lon2, eps)) {
+            // TODO refactor, not really specific to "periodic regular grids", but useful
+            std::ostringstream msgs;
+            msgs.precision(32);
+            msgs << "GribParametrisation: wrongly encoded iDirectionIncrementInDegrees:"
+                    "\n"
+                    "encoded: "
+                 << we
+                 << "\n"
+                    "Ni: "
+                 << Ni
+                 << "\n"
+                    "longitudeOfFirstGridPointInDegree: "
+                 << Lon1
+                 << "\n"
+                    "longitudeOfLastGridPointInDegrees: "
+                 << Lon2;
+
+            wrongly_encoded_grib(msgs.str());
+        }
+
+        return true;
+    });
+};
+
+
+ProcessingT<std::vector<double>>* vector_double(std::initializer_list<std::string> keys)
+{
+    const std::vector<std::string> keys_(keys);
+    return new ProcessingT<std::vector<double>>([=](codes_handle* h, std::vector<double>& values) {
+        ASSERT(keys.size());
+
+        values.assign(keys_.size(), 0);
+        size_t i = 0;
+        for (const auto& key : keys_) {
+            if (codes_is_defined(h, key.c_str()) == 0) {
+                return false;
+            }
+            CHECK_CALL(codes_get_double(h, key.c_str(), &values[i++]));
+        }
+        return true;
+    });
+}
+
+
+ProcessingT<std::string>* packing()
+{
+    return new ProcessingT<std::string>([](codes_handle* h, std::string& value) {
+        auto get = [](codes_handle* h, const char* key) -> std::string {
+            if (codes_is_defined(h, key) != 0) {
+                char buffer[64];
+                size_t size = sizeof(buffer);
+
+                CHECK_CALL(codes_get_string(h, key, buffer, &size));
+                ASSERT(size < sizeof(buffer) - 1);
+
+                if (std::strcmp(buffer, "MISSING") != 0) {
+                    return buffer;
+                }
+            }
+            return "";
+        };
+
+        auto packingType = get(h, "packingType");
+        for (const auto& prefix : std::vector<std::string>{ "grid_", "spectral_" }) {
+            if (packingType.find(prefix) == 0) {
+                value = packingType.substr(prefix.size());
+                std::replace(value.begin(), value.end(), '_', '-');
+                return true;
+            }
+        }
+
+        return false;
+    });
+}
+
+
+template <class T>
+struct ConditionedProcessingT
+{
+    const std::string name;
+    const std::unique_ptr<const T> processing;
+    const std::unique_ptr<const Condition> condition;
+    ConditionedProcessingT(const std::string& _name, const T* _processing, const Condition* _condition = nullptr) :
+        name(_name), processing(_processing), condition(_condition) {}
+};
+
+
+template <class T>
+using ProcessingList = std::initializer_list<ConditionedProcessingT<ProcessingT<T>>>;
+
+
+template <typename T>
+bool get_value(const std::string& name, codes_handle* h, T& value, const ProcessingList<T>& process)
+{
+    for (auto& p : process) {
+        if (name == p.name) {
+            if (!p.condition || p.condition->eval(h)) {
+                ASSERT(p.processing);
+                return p.processing->eval(h, value);
+            }
+        }
+    }
+    return false;
+}
+
+
+eckit::geo::util::recursive_mutex MUTEX;
+
+
+class lock_type
+{
+    eckit::geo::util::lock_guard<eckit::geo::util::recursive_mutex> lock_guard_{ MUTEX };
+};
+
+
+}  // namespace
+
+
+GribSpec::GribSpec(codes_handle* h) :
+    handle_(h)
+{
+    ASSERT(handle_ != nullptr);
+}
+
+
+bool GribSpec::has(const std::string& name) const
+{
+    lock_type lock;
+
+    if (cache_.has(name)) {
+        return true;
+    }
+
+    const auto* key = get_key(name, handle_);
+
+    ASSERT(key != nullptr);
+    if (std::strlen(key) == 0) {
+        return false;
+    }
+
+    return codes_is_defined(handle_, key) != 0;
+}
+
+
+bool GribSpec::get(const std::string& name, std::string& value) const
+{
+    lock_type lock;
+
+    if (cache_.get(name, value)) {
+        return true;
+    }
+
+    const auto* key = get_key(name, handle_);
+
+    ASSERT(key != nullptr);
+    if (std::strlen(key) == 0) {
+        return false;
+    }
+
+    char buffer[10240];
+    size_t size = sizeof(buffer);
+    int err     = codes_get_string(handle_, key, buffer, &size);
+
+    if (err == CODES_NOT_FOUND) {
+        static const ProcessingList<std::string> process{
+            { "packing", packing() },
+        };
+
+        return get_value(key, handle_, value, process);
+    }
+
+    CHECK_ERROR(err, key);
+
+    ASSERT(size < sizeof(buffer) - 1);
+
+    if (std::strcmp(buffer, "MISSING") == 0) {
+        return false;
+    }
+
+    cache_.set(name, value = buffer);
+    return true;
+}
+
+
+bool GribSpec::get(const std::string& name, bool& value) const
+{
+    lock_type lock;
+
+    if (cache_.get(name, value)) {
+        return true;
+    }
+
+    const auto* key = get_key(name, handle_);
+
+    ASSERT(key != nullptr);
+    if (std::strlen(key) == 0) {
+        return false;
+    }
+
+    // FIXME: make sure that 'temp' is not set if CODES_MISSING_LONG
+    long temp = CODES_MISSING_LONG;
+    int err   = codes_get_long(handle_, key, &temp);
+    CHECK_ERROR(err, key);
+
+    cache_.set(name, value = temp != 0);
+    return true;
+}
+
+
+bool GribSpec::get(const std::string& name, int& value) const
+{
+    if (long v = 0; get(name, v)) {
+        ASSERT(static_cast<long>(static_cast<int>(v)) == v);
+        value = static_cast<int>(v);
+        return true;
+    }
+
+    return false;
+}
+
+
+bool GribSpec::get(const std::string& name, long& value) const
+{
+    lock_type lock;
+
+    if (cache_.get(name, value)) {
+        return true;
+    }
+
+    const std::string key = get_key(name, handle_);
+    if (key.empty()) {
+        return false;
+    }
+
+    // FIXME: make sure that 'value' is not set if CODES_MISSING_LONG
+    int err = codes_get_long(handle_, key.c_str(), &value);
+    if (err == CODES_NOT_FOUND || codes_is_missing(handle_, key.c_str(), &err) != 0) {
+        return false;
+    }
+
+    CHECK_ERROR(err, key.c_str());
+
+    cache_.set(name, value);
+    return true;
+}
+
+
+bool GribSpec::get(const std::string& /*name*/, long long& /*value*/) const
+{
+    return false;
+}
+
+
+bool GribSpec::get(const std::string& /*name*/, std::size_t& /*value*/) const
+{
+    return false;
+}
+
+
+bool GribSpec::get(const std::string& name, float& value) const
+{
+    if (cache_.get(name, value)) {
+        return true;
+    }
+
+    if (double v = 0; get(name, v)) {
+        cache_.set(name, value = static_cast<float>(v));
+        return true;
+    }
+
+    return false;
+}
+
+
+bool GribSpec::get(const std::string& name, double& value) const
+{
+    lock_type lock;
+
+    if (cache_.get(name, value)) {
+        return true;
+    }
+
+    ASSERT(name != "grid");
+
+    const auto* key = get_key(name, handle_);
+
+    ASSERT(key != nullptr);
+    if (std::strlen(key) == 0) {
+        return false;
+    }
+
+    // FIXME: make sure that 'value' is not set if CODES_MISSING_DOUBLE
+    int err = codes_get_double(handle_, key, &value);
+    if (err == CODES_NOT_FOUND || codes_is_missing(handle_, key, &err) != 0) {
+        static const ProcessingList<double> process{
+            { "angular_precision", angular_precision() },
+            { "longitudeOfLastGridPointInDegrees_fix_for_global_reduced_grids",
+              longitudeOfLastGridPointInDegrees_fix_for_global_reduced_grids() },
+            { "iDirectionIncrementInDegrees_fix_for_periodic_regular_grids",
+              iDirectionIncrementInDegrees_fix_for_periodic_regular_grids() },
+            { "latitudeOfFirstGridPointInDegrees_fix_for_gaussian_grids",
+              latitudeOfFirstGridPointInDegrees_fix_for_gaussian_grids() },
+            { "latitudeOfLastGridPointInDegrees_fix_for_gaussian_grids",
+              latitudeOfLastGridPointInDegrees_fix_for_gaussian_grids() },
+        };
+
+        if (get_value(key, handle_, value, process)) {
+            cache_.set(name, value);
+            return true;
+        }
+
+        return false;
+    }
+
+    CHECK_ERROR(err, key);
+
+    cache_.set(name, value);
+    return true;
+}
+
+
+bool GribSpec::get(const std::string& /*name*/, std::vector<int>& /*value*/) const
+{
+    return false;
+}
+
+
+bool GribSpec::get(const std::string& name, std::vector<long>& value) const
+{
+    lock_type lock;
+
+    if (cache_.get(name, value)) {
+        return true;
+    }
+
+    const auto* key = get_key(name, handle_);
+
+    ASSERT(key != nullptr);
+    if (std::strlen(key) == 0) {
+        return false;
+    }
+
+    size_t count = 0;
+    int err      = codes_get_size(handle_, key, &count);
+    CHECK_ERROR(err, key);
+
+    size_t size = count;
+
+    value.resize(count);
+
+    CHECK_CALL(codes_get_long_array(handle_, key, value.data(), &size));
+    ASSERT(count == size);
+
+    ASSERT(!value.empty());
+
+    if (name == "pl") {
+        if (std::find(value.rbegin(), value.rend(), 0) != value.rend()) {
+            wrongly_encoded_grib("GribParametrisation: pl array contains zeros");
+        }
+    }
+
+    cache_.set(name, value);
+    return true;
+}
+
+
+bool GribSpec::get(const std::string& /*name*/, std::vector<long long>& /*value*/) const
+{
+    return false;
+}
+
+
+bool GribSpec::get(const std::string& /*name*/, std::vector<std::size_t>& /*value*/) const
+{
+    return false;
+}
+
+
+bool GribSpec::get(const std::string& name, std::vector<float>& value) const
+{
+    if (cache_.get(name, value)) {
+        return true;
+    }
+
+    if (std::vector<double> v; get(name, v)) {
+        value.clear();
+        value.reserve(v.size());
+        for (const auto& d : v) {
+            value.push_back(static_cast<float>(d));
+        }
+
+        cache_.set(name, value);
+        return true;
+    }
+
+    return false;
+}
+
+
+bool GribSpec::get(const std::string& name, std::vector<double>& value) const
+{
+    lock_type lock;
+
+    if (cache_.get(name, value)) {
+        return true;
+    }
+
+    const auto* key = get_key(name, handle_);
+
+    // NOTE: MARS client sets 'grid=vector' (deprecated) which needs to be compared against GRIB gridName
+    ASSERT(key != nullptr);
+    if (std::strlen(key) == 0 || std::strncmp(key, "gridName", 8) == 0) {
+        return false;
+    }
+
+    static const ProcessingList<std::vector<double>> process{
+        { "grid", vector_double({ "iDirectionIncrementInDegrees", "jDirectionIncrementInDegrees" }),
+          _or(is("gridType", "regular_ll"), is("gridType", "rotated_ll")) },
+        { "grid", vector_double({ "xDirectionGridLengthInMetres", "yDirectionGridLengthInMetres" }),
+          is("gridType", "lambert_azimuthal_equal_area") },
+        { "grid", vector_double({ "DxInMetres", "DyInMetres" }),
+          _or(is("gridType", "lambert"), is("gridType", "polar_stereographic")) },
+        { "grid", vector_double({ "DiInMetres", "DjInMetres" }), is("gridType", "mercator") },
+        { "grid", vector_double({ "dx", "dy" }), is("gridType", "space_view") },
+        { "rotation", vector_double({ "latitudeOfSouthernPoleInDegrees", "longitudeOfSouthernPoleInDegrees" }),
+          _or(_or(_or(is("gridType", "rotated_ll"), is("gridType", "rotated_gg")), is("gridType", "rotated_sh")),
+              is("gridType", "reduced_rotated_gg")) },
+    };
+
+    if (get_value(key, handle_, value, process)) {
+        cache_.set(name, value);
+        return true;
+    }
+
+    // FIXME make logic consistent for ::get(,*)
+    if (codes_is_defined(handle_, key) == 0) {
+        return false;
+    }
+
+    size_t count = 0;
+    int err = codes_get_size(handle_, key, &count);
+    CHECK_ERROR(err, key);
+
+    ASSERT(count > 0);
+    size_t size = count;
+
+    value.resize(count);
+
+    CHECK_CALL(codes_get_double_array(handle_, key, value.data(), &size));
+    ASSERT(count == size);
+
+    ASSERT(!value.empty());
+
+    cache_.set(name, value);
+    return true;
+}
+
+
+bool GribSpec::get(const std::string& /*name*/, std::vector<std::string>& /*value*/) const
+{
+    return false;
+}
+
+
+void GribSpec::json(eckit::JSON& j) const
+{
+    j.startObject();
+
+    auto* kit = codes_keys_iterator_new(
+        handle_, CODES_KEYS_ITERATOR_SKIP_DUPLICATES | CODES_KEYS_ITERATOR_SKIP_READ_ONLY, "geography");
+    ASSERT(kit != nullptr);
+
+    for (; codes_keys_iterator_next(kit) != 0;) {
+        const auto* name = codes_keys_iterator_get_name(kit);
+
+        int err         = 0;
+        bool is_missing = 0 != codes_is_missing(handle_, name, &err);
+        CHECK_ERROR(err, name);
+
+        if (is_missing) {
+            j << name << "MISSING";
+            continue;
+        }
+
+        size_t size = 0;
+        CHECK_CALL(codes_get_size(handle_, name, &size));
+
+        int type = 0;
+        CHECK_CALL(codes_get_native_type(handle_, name, &type));
+
+        if (size > 1) {
+            if (type == CODES_TYPE_LONG) {
+                std::vector<long> array(size);
+
+                auto size_read = size;
+                CHECK_CALL(codes_get_long_array(handle_, name, array.data(), &size_read));
+                ASSERT(size == size_read);
+
+                j << name;
+                j.startList();
+                for (const auto& value : array) {
+                    j << value;
+                }
+                j.endList();
+                continue;
+            }
+
+            if (type == CODES_TYPE_DOUBLE) {
+                std::vector<double> array(size);
+
+                auto size_read = size;
+                CHECK_CALL(codes_get_double_array(handle_, name, array.data(), &size_read));
+                ASSERT(size == size_read);
+
+                j << name;
+                j.startList();
+                for (const auto& value : array) {
+                    j << value;
+                }
+                j.endList();
+                continue;
+            }
+
+            (j << name).startList().endList();
+            continue;
+        }
+
+        if (type == CODES_TYPE_LONG) {
+            long value = 0;
+            CHECK_CALL(codes_get_long(handle_, name, &value));
+            j << name << value;
+            continue;
+        }
+
+        if (type == CODES_TYPE_DOUBLE) {
+            double value = 0;
+            CHECK_CALL(codes_get_double(handle_, name, &value));
+            j << name << value;
+            continue;
+        }
+
+        if (type == CODES_TYPE_STRING) {
+            char value[1024] = {0,};
+            size_t length = sizeof(value);
+            CHECK_CALL(codes_get_string(handle_, name, value, &length));
+            j << name << value;
+            continue;
+        }
+
+        j << name
+          << (type == CODES_TYPE_UNDEFINED ? "UNDEFINED"
+              : type == CODES_TYPE_BYTES   ? "BYTES"
+              : type == CODES_TYPE_SECTION ? "SECTION"
+              : type == CODES_TYPE_LABEL   ? "LABEL"
+              : type == CODES_TYPE_MISSING ? "MISSING"
+                                           : "?");
+    }
+
+    codes_keys_iterator_delete(kit);
+    j.endObject();
+}
+
+
+}  // namespace eccodes::geo
+
+
+#undef CHECK_ERROR
+#undef CHECK_CALL
diff --git a/src/geo/GribSpec.h b/src/geo/GribSpec.h
new file mode 100644
index 000000000..01e2628f2
--- /dev/null
+++ b/src/geo/GribSpec.h
@@ -0,0 +1,63 @@
+/*
+ * (C) Copyright 2024- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities
+ * granted to it by virtue of its status as an intergovernmental organisation nor
+ * does it submit to any jurisdiction.
+ */
+
+
+#pragma once
+
+#include "eccodes.h"
+
+#include <string>
+#include <vector>
+
+#include "eckit/geo/Spec.h"
+#include "eckit/geo/spec/Custom.h"
+
+
+namespace eccodes::geo
+{
+
+
+bool codes_check_error(int e, const char* call);
+
+
+class GribSpec final : public eckit::geo::Spec
+{
+public:
+    explicit GribSpec(codes_handle*);
+
+    bool has(const std::string& name) const override;
+
+    bool get(const std::string& name, std::string& value) const override;
+    bool get(const std::string& name, bool& value) const override;
+    bool get(const std::string& name, int& value) const override;
+    bool get(const std::string& name, long& value) const override;
+    bool get(const std::string& name, long long& value) const override;
+    bool get(const std::string& name, size_t& value) const override;
+    bool get(const std::string& name, float& value) const override;
+    bool get(const std::string& name, double& value) const override;
+
+    bool get(const std::string& name, std::vector<int>& value) const override;
+    bool get(const std::string& name, std::vector<long>& value) const override;
+    bool get(const std::string& name, std::vector<long long>& value) const override;
+    bool get(const std::string& name, std::vector<size_t>& value) const override;
+    bool get(const std::string& name, std::vector<float>& value) const override;
+    bool get(const std::string& name, std::vector<double>& value) const override;
+    bool get(const std::string& name, std::vector<std::string>& value) const override;
+
+private:
+    mutable eckit::geo::spec::Custom cache_;
+    codes_handle* handle_;
+
+    void json(eckit::JSON&) const final;
+};
+
+
+}  // namespace eccodes::geo
diff --git a/src/grib_gaussian_N1280.h b/src/geo/grib_gaussian_N1280.h
similarity index 100%
rename from src/grib_gaussian_N1280.h
rename to src/geo/grib_gaussian_N1280.h
diff --git a/src/grib_gaussian_N640.h b/src/geo/grib_gaussian_N640.h
similarity index 100%
rename from src/grib_gaussian_N640.h
rename to src/geo/grib_gaussian_N640.h
diff --git a/src/grib_gaussian_reduced.cc b/src/geo/grib_gaussian_reduced.cc
similarity index 100%
rename from src/grib_gaussian_reduced.cc
rename to src/geo/grib_gaussian_reduced.cc
diff --git a/src/grib_geography.cc b/src/geo/grib_geography.cc
similarity index 100%
rename from src/grib_geography.cc
rename to src/geo/grib_geography.cc
diff --git a/src/geo_iterator/grib_iterator.cc b/src/geo/iterator/grib_iterator.cc
similarity index 78%
rename from src/geo_iterator/grib_iterator.cc
rename to src/geo/iterator/grib_iterator.cc
index 56e34c251..711f840c3 100644
--- a/src/geo_iterator/grib_iterator.cc
+++ b/src/geo/iterator/grib_iterator.cc
@@ -12,6 +12,19 @@
  *   Jean Baptiste Filippi - 01.11.2005                                    *
  ***************************************************************************/
 
+#include "eccodes_config.h"
+
+#if defined(HAVE_ECKIT_GEO)
+    #include "eckit/runtime/Main.h"
+
+    #include "geo/GeoIterator.h"
+
+    // eccodes macros conflict with eckit
+    #ifdef Assert
+        #undef Assert
+    #endif
+#endif
+
 #include "grib_iterator.h"
 #include "grib_iterator_factory.h"
 #include "accessor/grib_accessor_class_iterator.h"
@@ -95,7 +108,29 @@ int grib_iterator_destroy(grib_context* c, grib_iterator* i)
 grib_iterator* grib_iterator_new(const grib_handle* ch, unsigned long flags, int* error)
 {
     grib_iterator* i = (grib_iterator*)grib_context_malloc_clear(ch->context, sizeof(grib_iterator));
-    i->iterator      = eccodes::geo_iterator::gribIteratorNew(ch, flags, error);
+
+    #if defined(HAVE_ECKIT_GEO)
+    static const auto* eckit_geo = codes_getenv("ECCODES_ECKIT_GEO");
+    if (eckit_geo != nullptr && strcmp(eckit_geo, "1") == 0) {
+        struct InitMain
+        {
+            InitMain()
+            {
+                if (!eckit::Main::ready()) {
+                    static char* argv[]{ const_cast<char*>("grib_iterator_new") };
+                    eckit::Main::initialise(1, argv);
+                }
+            }
+        } static const init_main;
+
+        i->iterator = new eccodes::geo::GeoIterator(const_cast<grib_handle*>(ch), flags);
+    }
+    else
+    #endif
+    {
+        i->iterator = eccodes::geo_iterator::gribIteratorNew(ch, flags, error);
+    }
+
     if (!i->iterator) {
         grib_context_free(ch->context, i);
         return NULL;
diff --git a/src/geo_iterator/grib_iterator.h b/src/geo/iterator/grib_iterator.h
similarity index 100%
rename from src/geo_iterator/grib_iterator.h
rename to src/geo/iterator/grib_iterator.h
diff --git a/src/geo_iterator/grib_iterator_class_gaussian.cc b/src/geo/iterator/grib_iterator_class_gaussian.cc
similarity index 93%
rename from src/geo_iterator/grib_iterator_class_gaussian.cc
rename to src/geo/iterator/grib_iterator_class_gaussian.cc
index da50560ef..50618ed2a 100644
--- a/src/geo_iterator/grib_iterator_class_gaussian.cc
+++ b/src/geo/iterator/grib_iterator_class_gaussian.cc
@@ -33,10 +33,10 @@ int Gaussian::init(grib_handle* h, grib_arguments* args)
     double start;
     long istart = 0;
 
-    const char* latofirst          = grib_arguments_get_name(h, args, carg_++);
-    const char* latoflast          = grib_arguments_get_name(h, args, carg_++);
-    const char* numtrunc           = grib_arguments_get_name(h, args, carg_++);
-    const char* s_jScansPositively = grib_arguments_get_name(h, args, carg_++);
+    const char* latofirst          = args->get_name(h, carg_++);
+    const char* latoflast          = args->get_name(h, carg_++);
+    const char* numtrunc           = args->get_name(h, carg_++);
+    const char* s_jScansPositively = args->get_name(h, carg_++);
 
     if ((ret = grib_get_double_internal(h, latofirst, &laf)))
         return ret;
diff --git a/src/geo_iterator/grib_iterator_class_gaussian.h b/src/geo/iterator/grib_iterator_class_gaussian.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_gaussian.h
rename to src/geo/iterator/grib_iterator_class_gaussian.h
diff --git a/src/geo_iterator/grib_iterator_class_gaussian_reduced.cc b/src/geo/iterator/grib_iterator_class_gaussian_reduced.cc
similarity index 96%
rename from src/geo_iterator/grib_iterator_class_gaussian_reduced.cc
rename to src/geo/iterator/grib_iterator_class_gaussian_reduced.cc
index cb06386e7..a060d48f8 100644
--- a/src/geo_iterator/grib_iterator_class_gaussian_reduced.cc
+++ b/src/geo/iterator/grib_iterator_class_gaussian_reduced.cc
@@ -239,13 +239,13 @@ int GaussianReduced::init(grib_handle* h, grib_arguments* args)
     long row_count         = 0;
     long angleSubdivisions = 0;
     const grib_context* c  = h->context;
-    const char* slat_first = grib_arguments_get_name(h, args, carg_++);
-    const char* slon_first = grib_arguments_get_name(h, args, carg_++);
-    const char* slat_last  = grib_arguments_get_name(h, args, carg_++);
-    const char* slon_last  = grib_arguments_get_name(h, args, carg_++);
-    const char* sorder     = grib_arguments_get_name(h, args, carg_++);
-    const char* spl        = grib_arguments_get_name(h, args, carg_++);
-    const char* snj        = grib_arguments_get_name(h, args, carg_++);
+    const char* slat_first = args->get_name(h, carg_++);
+    const char* slon_first = args->get_name(h, carg_++);
+    const char* slat_last  = args->get_name(h, carg_++);
+    const char* slon_last  = args->get_name(h, carg_++);
+    const char* sorder     = args->get_name(h, carg_++);
+    const char* spl        = args->get_name(h, carg_++);
+    const char* snj        = args->get_name(h, carg_++);
 
     angleOfRotation_ = 0;
     isRotated_       = 0;
diff --git a/src/geo_iterator/grib_iterator_class_gaussian_reduced.h b/src/geo/iterator/grib_iterator_class_gaussian_reduced.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_gaussian_reduced.h
rename to src/geo/iterator/grib_iterator_class_gaussian_reduced.h
diff --git a/src/geo_iterator/grib_iterator_class_gen.cc b/src/geo/iterator/grib_iterator_class_gen.cc
similarity index 93%
rename from src/geo_iterator/grib_iterator_class_gen.cc
rename to src/geo/iterator/grib_iterator_class_gen.cc
index 1e14b9e37..6efea72e9 100644
--- a/src/geo_iterator/grib_iterator_class_gen.cc
+++ b/src/geo/iterator/grib_iterator_class_gen.cc
@@ -24,10 +24,10 @@ int Gen::init(grib_handle* h, grib_arguments* args)
     // e.g., latlon, gaussian_reduced etc
     carg_ = 1; // start from 1 and not 0
 
-    const char* s_numPoints    = grib_arguments_get_name(h, args, carg_++);
+    const char* s_numPoints    = args->get_name(h, carg_++);
     // The missingValue argument is not currently used. Skip it
-    carg_++;  //const char* s_missingValue = grib_arguments_get_name(h, args, carg_++);
-    const char* s_rawData      = grib_arguments_get_name(h, args, carg_++);
+    carg_++;  //const char* s_missingValue = args->get_name(h, carg_++);
+    const char* s_rawData      = args->get_name(h, carg_++);
 
     size_t dli = 0;
     if ((err = grib_get_size(h, s_rawData, &dli)) != GRIB_SUCCESS)
diff --git a/src/geo_iterator/grib_iterator_class_gen.h b/src/geo/iterator/grib_iterator_class_gen.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_gen.h
rename to src/geo/iterator/grib_iterator_class_gen.h
diff --git a/src/geo_iterator/grib_iterator_class_healpix.cc b/src/geo/iterator/grib_iterator_class_healpix.cc
similarity index 98%
rename from src/geo_iterator/grib_iterator_class_healpix.cc
rename to src/geo/iterator/grib_iterator_class_healpix.cc
index 7b4ac56ef..b6dc2db57 100644
--- a/src/geo_iterator/grib_iterator_class_healpix.cc
+++ b/src/geo/iterator/grib_iterator_class_healpix.cc
@@ -268,8 +268,8 @@ int Healpix::init(grib_handle* h, grib_arguments* args)
     if ((err = Gen::init(h, args)) != GRIB_SUCCESS)
         return err;
 
-    const char* snside = grib_arguments_get_name(h, args, carg_++);
-    const char* sorder = grib_arguments_get_name(h, args, carg_++);
+    const char* snside = args->get_name(h, carg_++);
+    const char* sorder = args->get_name(h, carg_++);
 
     long N = 0;
     if ((err = grib_get_long_internal(h, snside, &N)) != GRIB_SUCCESS) {
diff --git a/src/geo_iterator/grib_iterator_class_healpix.h b/src/geo/iterator/grib_iterator_class_healpix.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_healpix.h
rename to src/geo/iterator/grib_iterator_class_healpix.h
diff --git a/src/geo_iterator/grib_iterator_class_lambert_azimuthal_equal_area.cc b/src/geo/iterator/grib_iterator_class_lambert_azimuthal_equal_area.cc
similarity index 93%
rename from src/geo_iterator/grib_iterator_class_lambert_azimuthal_equal_area.cc
rename to src/geo/iterator/grib_iterator_class_lambert_azimuthal_equal_area.cc
index 9db20fe81..f00bc974f 100644
--- a/src/geo_iterator/grib_iterator_class_lambert_azimuthal_equal_area.cc
+++ b/src/geo/iterator/grib_iterator_class_lambert_azimuthal_equal_area.cc
@@ -347,19 +347,19 @@ int LambertAzimuthalEqualArea::init(grib_handle* h, grib_arguments* args)
     long jScansPositively, jPointsAreConsecutive;
     double earthMajorAxisInMetres = 0, earthMinorAxisInMetres = 0;
 
-    const char* sradius                 = grib_arguments_get_name(h, args, carg_++);
-    const char* snx                     = grib_arguments_get_name(h, args, carg_++);
-    const char* sny                     = grib_arguments_get_name(h, args, carg_++);
-    const char* slatFirstInDegrees      = grib_arguments_get_name(h, args, carg_++);
-    const char* slonFirstInDegrees      = grib_arguments_get_name(h, args, carg_++);
-    const char* sstandardParallel       = grib_arguments_get_name(h, args, carg_++);
-    const char* scentralLongitude       = grib_arguments_get_name(h, args, carg_++);
-    const char* sDx                     = grib_arguments_get_name(h, args, carg_++);
-    const char* sDy                     = grib_arguments_get_name(h, args, carg_++);
-    const char* siScansNegatively       = grib_arguments_get_name(h, args, carg_++);
-    const char* sjScansPositively       = grib_arguments_get_name(h, args, carg_++);
-    const char* sjPointsAreConsecutive  = grib_arguments_get_name(h, args, carg_++);
-    const char* salternativeRowScanning = grib_arguments_get_name(h, args, carg_++);
+    const char* sradius                 = args->get_name(h, carg_++);
+    const char* snx                     = args->get_name(h, carg_++);
+    const char* sny                     = args->get_name(h, carg_++);
+    const char* slatFirstInDegrees      = args->get_name(h, carg_++);
+    const char* slonFirstInDegrees      = args->get_name(h, carg_++);
+    const char* sstandardParallel       = args->get_name(h, carg_++);
+    const char* scentralLongitude       = args->get_name(h, carg_++);
+    const char* sDx                     = args->get_name(h, carg_++);
+    const char* sDy                     = args->get_name(h, carg_++);
+    const char* siScansNegatively       = args->get_name(h, carg_++);
+    const char* sjScansPositively       = args->get_name(h, carg_++);
+    const char* sjPointsAreConsecutive  = args->get_name(h, carg_++);
+    const char* salternativeRowScanning = args->get_name(h, carg_++);
     const double d2r                    = acos(0.0) / 90.0;
 
     is_oblate = grib_is_earth_oblate(h);
diff --git a/src/geo_iterator/grib_iterator_class_lambert_azimuthal_equal_area.h b/src/geo/iterator/grib_iterator_class_lambert_azimuthal_equal_area.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_lambert_azimuthal_equal_area.h
rename to src/geo/iterator/grib_iterator_class_lambert_azimuthal_equal_area.h
diff --git a/src/geo_iterator/grib_iterator_class_lambert_conformal.cc b/src/geo/iterator/grib_iterator_class_lambert_conformal.cc
similarity index 93%
rename from src/geo_iterator/grib_iterator_class_lambert_conformal.cc
rename to src/geo/iterator/grib_iterator_class_lambert_conformal.cc
index 13162da77..aa3f79b32 100644
--- a/src/geo_iterator/grib_iterator_class_lambert_conformal.cc
+++ b/src/geo/iterator/grib_iterator_class_lambert_conformal.cc
@@ -359,22 +359,22 @@ int LambertConformal::init(grib_handle* h, grib_arguments* args)
         LaDInRadians;
     double earthMajorAxisInMetres = 0, earthMinorAxisInMetres = 0;
 
-    const char* sradius            = grib_arguments_get_name(h, args, carg_++);
-    const char* snx                = grib_arguments_get_name(h, args, carg_++);
-    const char* sny                = grib_arguments_get_name(h, args, carg_++);
-    const char* sLoVInDegrees      = grib_arguments_get_name(h, args, carg_++);
-    const char* sLaDInDegrees      = grib_arguments_get_name(h, args, carg_++);
-    const char* sLatin1InDegrees   = grib_arguments_get_name(h, args, carg_++);
-    const char* sLatin2InDegrees   = grib_arguments_get_name(h, args, carg_++);
-    const char* slatFirstInDegrees = grib_arguments_get_name(h, args, carg_++);
-    const char* slonFirstInDegrees = grib_arguments_get_name(h, args, carg_++);
+    const char* sradius            = args->get_name(h, carg_++);
+    const char* snx                = args->get_name(h, carg_++);
+    const char* sny                = args->get_name(h, carg_++);
+    const char* sLoVInDegrees      = args->get_name(h, carg_++);
+    const char* sLaDInDegrees      = args->get_name(h, carg_++);
+    const char* sLatin1InDegrees   = args->get_name(h, carg_++);
+    const char* sLatin2InDegrees   = args->get_name(h, carg_++);
+    const char* slatFirstInDegrees = args->get_name(h, carg_++);
+    const char* slonFirstInDegrees = args->get_name(h, carg_++);
     // Dx and Dy are in Metres
-    const char* sDx                     = grib_arguments_get_name(h, args, carg_++);
-    const char* sDy                     = grib_arguments_get_name(h, args, carg_++);
-    const char* siScansNegatively       = grib_arguments_get_name(h, args, carg_++);
-    const char* sjScansPositively       = grib_arguments_get_name(h, args, carg_++);
-    const char* sjPointsAreConsecutive  = grib_arguments_get_name(h, args, carg_++);
-    const char* salternativeRowScanning = grib_arguments_get_name(h, args, carg_++);
+    const char* sDx                     = args->get_name(h, carg_++);
+    const char* sDy                     = args->get_name(h, carg_++);
+    const char* siScansNegatively       = args->get_name(h, carg_++);
+    const char* sjScansPositively       = args->get_name(h, carg_++);
+    const char* sjPointsAreConsecutive  = args->get_name(h, carg_++);
+    const char* salternativeRowScanning = args->get_name(h, carg_++);
 
     if ((err = grib_get_long_internal(h, snx, &nx)) != GRIB_SUCCESS) return err;
     if ((err = grib_get_long_internal(h, sny, &ny)) != GRIB_SUCCESS) return err;
diff --git a/src/geo_iterator/grib_iterator_class_lambert_conformal.h b/src/geo/iterator/grib_iterator_class_lambert_conformal.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_lambert_conformal.h
rename to src/geo/iterator/grib_iterator_class_lambert_conformal.h
diff --git a/src/geo_iterator/grib_iterator_class_latlon.cc b/src/geo/iterator/grib_iterator_class_latlon.cc
similarity index 88%
rename from src/geo_iterator/grib_iterator_class_latlon.cc
rename to src/geo/iterator/grib_iterator_class_latlon.cc
index 603640130..93d0acb8f 100644
--- a/src/geo_iterator/grib_iterator_class_latlon.cc
+++ b/src/geo/iterator/grib_iterator_class_latlon.cc
@@ -71,14 +71,14 @@ int Latlon::init(grib_handle* h, grib_arguments* args)
     long jScansPositively;
     long lai;
 
-    const char* s_lat1            = grib_arguments_get_name(h, args, carg_++);
-    const char* s_jdir            = grib_arguments_get_name(h, args, carg_++);
-    const char* s_jScansPos       = grib_arguments_get_name(h, args, carg_++);
-    const char* s_jPtsConsec      = grib_arguments_get_name(h, args, carg_++);
-    const char* s_isRotatedGrid   = grib_arguments_get_name(h, args, carg_++);
-    const char* s_angleOfRotation = grib_arguments_get_name(h, args, carg_++);
-    const char* s_latSouthernPole = grib_arguments_get_name(h, args, carg_++);
-    const char* s_lonSouthernPole = grib_arguments_get_name(h, args, carg_++);
+    const char* s_lat1            = args->get_name(h, carg_++);
+    const char* s_jdir            = args->get_name(h, carg_++);
+    const char* s_jScansPos       = args->get_name(h, carg_++);
+    const char* s_jPtsConsec      = args->get_name(h, carg_++);
+    const char* s_isRotatedGrid   = args->get_name(h, carg_++);
+    const char* s_angleOfRotation = args->get_name(h, carg_++);
+    const char* s_latSouthernPole = args->get_name(h, carg_++);
+    const char* s_lonSouthernPole = args->get_name(h, carg_++);
 
     angleOfRotation_ = 0;
     isRotated_       = 0;
diff --git a/src/geo_iterator/grib_iterator_class_latlon.h b/src/geo/iterator/grib_iterator_class_latlon.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_latlon.h
rename to src/geo/iterator/grib_iterator_class_latlon.h
diff --git a/src/geo_iterator/grib_iterator_class_latlon_reduced.cc b/src/geo/iterator/grib_iterator_class_latlon_reduced.cc
similarity index 87%
rename from src/geo_iterator/grib_iterator_class_latlon_reduced.cc
rename to src/geo/iterator/grib_iterator_class_latlon_reduced.cc
index 784320d99..2d84a4ee3 100644
--- a/src/geo_iterator/grib_iterator_class_latlon_reduced.cc
+++ b/src/geo/iterator/grib_iterator_class_latlon_reduced.cc
@@ -50,13 +50,13 @@ int LatlonReduced::init(grib_handle* h, grib_arguments* args)
     int islocal    = 0;
     long nlons2    = 0; /* adjusted num of longitudes */
 
-    const char* latofirst   = grib_arguments_get_name(h, args, carg_++);
-    const char* longoffirst = grib_arguments_get_name(h, args, carg_++);
-    const char* latoflast   = grib_arguments_get_name(h, args, carg_++);
-    const char* longoflast  = grib_arguments_get_name(h, args, carg_++);
-    const char* nlats_name  = grib_arguments_get_name(h, args, carg_++);
-    const char* jdirec      = grib_arguments_get_name(h, args, carg_++);
-    const char* plac        = grib_arguments_get_name(h, args, carg_++);
+    const char* latofirst   = args->get_name(h, carg_++);
+    const char* longoffirst = args->get_name(h, carg_++);
+    const char* latoflast   = args->get_name(h, carg_++);
+    const char* longoflast  = args->get_name(h, carg_++);
+    const char* nlats_name  = args->get_name(h, carg_++);
+    const char* jdirec      = args->get_name(h, carg_++);
+    const char* plac        = args->get_name(h, carg_++);
 
     if ((ret = grib_get_double_internal(h, latofirst, &laf)))
         return ret;
diff --git a/src/geo_iterator/grib_iterator_class_latlon_reduced.h b/src/geo/iterator/grib_iterator_class_latlon_reduced.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_latlon_reduced.h
rename to src/geo/iterator/grib_iterator_class_latlon_reduced.h
diff --git a/src/geo_iterator/grib_iterator_class_mercator.cc b/src/geo/iterator/grib_iterator_class_mercator.cc
similarity index 89%
rename from src/geo_iterator/grib_iterator_class_mercator.cc
rename to src/geo/iterator/grib_iterator_class_mercator.cc
index 248ba7872..0a278d60e 100644
--- a/src/geo_iterator/grib_iterator_class_mercator.cc
+++ b/src/geo/iterator/grib_iterator_class_mercator.cc
@@ -174,22 +174,22 @@ int Mercator::init(grib_handle* h, grib_arguments* args)
         LaDInRadians, orientationInRadians;
     double earthMajorAxisInMetres = 0, earthMinorAxisInMetres = 0;
 
-    const char* sRadius               = grib_arguments_get_name(h, args, carg_++);
-    const char* sNi                   = grib_arguments_get_name(h, args, carg_++);
-    const char* sNj                   = grib_arguments_get_name(h, args, carg_++);
-    const char* sLatFirstInDegrees    = grib_arguments_get_name(h, args, carg_++);
-    const char* sLonFirstInDegrees    = grib_arguments_get_name(h, args, carg_++);
-    const char* sLaDInDegrees         = grib_arguments_get_name(h, args, carg_++);
-    const char* sLatLastInDegrees     = grib_arguments_get_name(h, args, carg_++);
-    const char* sLonLastInDegrees     = grib_arguments_get_name(h, args, carg_++);
-    const char* sOrientationInDegrees = grib_arguments_get_name(h, args, carg_++);
+    const char* sRadius               = args->get_name(h, carg_++);
+    const char* sNi                   = args->get_name(h, carg_++);
+    const char* sNj                   = args->get_name(h, carg_++);
+    const char* sLatFirstInDegrees    = args->get_name(h, carg_++);
+    const char* sLonFirstInDegrees    = args->get_name(h, carg_++);
+    const char* sLaDInDegrees         = args->get_name(h, carg_++);
+    const char* sLatLastInDegrees     = args->get_name(h, carg_++);
+    const char* sLonLastInDegrees     = args->get_name(h, carg_++);
+    const char* sOrientationInDegrees = args->get_name(h, carg_++);
     /* Dx and Dy are in Metres */
-    const char* sDi                     = grib_arguments_get_name(h, args, carg_++);
-    const char* sDj                     = grib_arguments_get_name(h, args, carg_++);
-    const char* siScansNegatively       = grib_arguments_get_name(h, args, carg_++);
-    const char* sjScansPositively       = grib_arguments_get_name(h, args, carg_++);
-    const char* sjPointsAreConsecutive  = grib_arguments_get_name(h, args, carg_++);
-    const char* sAlternativeRowScanning = grib_arguments_get_name(h, args, carg_++);
+    const char* sDi                     = args->get_name(h, carg_++);
+    const char* sDj                     = args->get_name(h, carg_++);
+    const char* siScansNegatively       = args->get_name(h, carg_++);
+    const char* sjScansPositively       = args->get_name(h, carg_++);
+    const char* sjPointsAreConsecutive  = args->get_name(h, carg_++);
+    const char* sAlternativeRowScanning = args->get_name(h, carg_++);
 
     if ((err = grib_get_long_internal(h, sNi, &ni)) != GRIB_SUCCESS) return err;
     if ((err = grib_get_long_internal(h, sNj, &nj)) != GRIB_SUCCESS) return err;
diff --git a/src/geo_iterator/grib_iterator_class_mercator.h b/src/geo/iterator/grib_iterator_class_mercator.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_mercator.h
rename to src/geo/iterator/grib_iterator_class_mercator.h
diff --git a/src/geo_iterator/grib_iterator_class_polar_stereographic.cc b/src/geo/iterator/grib_iterator_class_polar_stereographic.cc
similarity index 90%
rename from src/geo_iterator/grib_iterator_class_polar_stereographic.cc
rename to src/geo/iterator/grib_iterator_class_polar_stereographic.cc
index beff11bd6..2e0623ecc 100644
--- a/src/geo_iterator/grib_iterator_class_polar_stereographic.cc
+++ b/src/geo/iterator/grib_iterator_class_polar_stereographic.cc
@@ -74,20 +74,20 @@ int PolarStereographic::init(grib_handle* h, grib_arguments* args)
         0,
     };
 
-    const char* s_radius                 = grib_arguments_get_name(h, args, carg_++);
-    const char* s_nx                     = grib_arguments_get_name(h, args, carg_++);
-    const char* s_ny                     = grib_arguments_get_name(h, args, carg_++);
-    const char* s_latFirstInDegrees      = grib_arguments_get_name(h, args, carg_++);
-    const char* s_lonFirstInDegrees      = grib_arguments_get_name(h, args, carg_++);
-    const char* s_southPoleOnPlane       = grib_arguments_get_name(h, args, carg_++);
-    const char* s_centralLongitude       = grib_arguments_get_name(h, args, carg_++);
-    const char* s_centralLatitude        = grib_arguments_get_name(h, args, carg_++);
-    const char* s_Dx                     = grib_arguments_get_name(h, args, carg_++);
-    const char* s_Dy                     = grib_arguments_get_name(h, args, carg_++);
-    const char* s_iScansNegatively       = grib_arguments_get_name(h, args, carg_++);
-    const char* s_jScansPositively       = grib_arguments_get_name(h, args, carg_++);
-    const char* s_jPointsAreConsecutive  = grib_arguments_get_name(h, args, carg_++);
-    const char* s_alternativeRowScanning = grib_arguments_get_name(h, args, carg_++);
+    const char* s_radius                 = args->get_name(h, carg_++);
+    const char* s_nx                     = args->get_name(h, carg_++);
+    const char* s_ny                     = args->get_name(h, carg_++);
+    const char* s_latFirstInDegrees      = args->get_name(h, carg_++);
+    const char* s_lonFirstInDegrees      = args->get_name(h, carg_++);
+    const char* s_southPoleOnPlane       = args->get_name(h, carg_++);
+    const char* s_centralLongitude       = args->get_name(h, carg_++);
+    const char* s_centralLatitude        = args->get_name(h, carg_++);
+    const char* s_Dx                     = args->get_name(h, carg_++);
+    const char* s_Dy                     = args->get_name(h, carg_++);
+    const char* s_iScansNegatively       = args->get_name(h, carg_++);
+    const char* s_jScansPositively       = args->get_name(h, carg_++);
+    const char* s_jPointsAreConsecutive  = args->get_name(h, carg_++);
+    const char* s_alternativeRowScanning = args->get_name(h, carg_++);
 
     if (grib_is_earth_oblate(h)) {
         grib_context_log(h->context, GRIB_LOG_ERROR, "%s: Only supported for spherical earth.", ITER);
diff --git a/src/geo_iterator/grib_iterator_class_polar_stereographic.h b/src/geo/iterator/grib_iterator_class_polar_stereographic.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_polar_stereographic.h
rename to src/geo/iterator/grib_iterator_class_polar_stereographic.h
diff --git a/src/geo_iterator/grib_iterator_class_regular.cc b/src/geo/iterator/grib_iterator_class_regular.cc
similarity index 92%
rename from src/geo_iterator/grib_iterator_class_regular.cc
rename to src/geo/iterator/grib_iterator_class_regular.cc
index 11d32ff03..694b7b420 100644
--- a/src/geo_iterator/grib_iterator_class_regular.cc
+++ b/src/geo/iterator/grib_iterator_class_regular.cc
@@ -67,11 +67,11 @@ int Regular::init(grib_handle* h, grib_arguments* args)
     double idir, idir_coded, lon1, lon2;
     long loi;
 
-    const char* s_lon1      = grib_arguments_get_name(h, args, carg_++);
-    const char* s_idir      = grib_arguments_get_name(h, args, carg_++);
-    const char* s_Ni        = grib_arguments_get_name(h, args, carg_++);
-    const char* s_Nj        = grib_arguments_get_name(h, args, carg_++);
-    const char* s_iScansNeg = grib_arguments_get_name(h, args, carg_++);
+    const char* s_lon1      = args->get_name(h, carg_++);
+    const char* s_idir      = args->get_name(h, carg_++);
+    const char* s_Ni        = args->get_name(h, carg_++);
+    const char* s_Nj        = args->get_name(h, carg_++);
+    const char* s_iScansNeg = args->get_name(h, carg_++);
 
     if ((ret = grib_get_double_internal(h, s_lon1, &lon1)))
         return ret;
diff --git a/src/geo_iterator/grib_iterator_class_regular.h b/src/geo/iterator/grib_iterator_class_regular.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_regular.h
rename to src/geo/iterator/grib_iterator_class_regular.h
diff --git a/src/geo_iterator/grib_iterator_class_space_view.cc b/src/geo/iterator/grib_iterator_class_space_view.cc
similarity index 86%
rename from src/geo_iterator/grib_iterator_class_space_view.cc
rename to src/geo/iterator/grib_iterator_class_space_view.cc
index d3085dd81..8f14b9c26 100644
--- a/src/geo_iterator/grib_iterator_class_space_view.cc
+++ b/src/geo/iterator/grib_iterator_class_space_view.cc
@@ -100,27 +100,27 @@ int SpaceView::init(grib_handle* h, grib_arguments* args)
     double *s_x, *c_x; /* arrays storing sin and cos values */
     size_t array_size = (nv_ * sizeof(double));
 
-    const char* sradius                          = grib_arguments_get_name(h, args, carg_++);
-    const char* sEarthIsOblate                   = grib_arguments_get_name(h, args, carg_++);
-    const char* sMajorAxisInMetres               = grib_arguments_get_name(h, args, carg_++);
-    const char* sMinorAxisInMetres               = grib_arguments_get_name(h, args, carg_++);
-    const char* snx                              = grib_arguments_get_name(h, args, carg_++);
-    const char* sny                              = grib_arguments_get_name(h, args, carg_++);
-    const char* sLatOfSubSatellitePointInDegrees = grib_arguments_get_name(h, args, carg_++);
-    const char* sLonOfSubSatellitePointInDegrees = grib_arguments_get_name(h, args, carg_++);
-    const char* sDx                              = grib_arguments_get_name(h, args, carg_++);
-    const char* sDy                              = grib_arguments_get_name(h, args, carg_++);
-    const char* sXpInGridLengths                 = grib_arguments_get_name(h, args, carg_++);
-    const char* sYpInGridLengths                 = grib_arguments_get_name(h, args, carg_++);
-    const char* sOrientationInDegrees            = grib_arguments_get_name(h, args, carg_++);
-    const char* sNrInRadiusOfEarthScaled         = grib_arguments_get_name(h, args, carg_++);
-    const char* sXo                              = grib_arguments_get_name(h, args, carg_++);
-    const char* sYo                              = grib_arguments_get_name(h, args, carg_++);
+    const char* sradius                          = args->get_name(h, carg_++);
+    const char* sEarthIsOblate                   = args->get_name(h, carg_++);
+    const char* sMajorAxisInMetres               = args->get_name(h, carg_++);
+    const char* sMinorAxisInMetres               = args->get_name(h, carg_++);
+    const char* snx                              = args->get_name(h, carg_++);
+    const char* sny                              = args->get_name(h, carg_++);
+    const char* sLatOfSubSatellitePointInDegrees = args->get_name(h, carg_++);
+    const char* sLonOfSubSatellitePointInDegrees = args->get_name(h, carg_++);
+    const char* sDx                              = args->get_name(h, carg_++);
+    const char* sDy                              = args->get_name(h, carg_++);
+    const char* sXpInGridLengths                 = args->get_name(h, carg_++);
+    const char* sYpInGridLengths                 = args->get_name(h, carg_++);
+    const char* sOrientationInDegrees            = args->get_name(h, carg_++);
+    const char* sNrInRadiusOfEarthScaled         = args->get_name(h, carg_++);
+    const char* sXo                              = args->get_name(h, carg_++);
+    const char* sYo                              = args->get_name(h, carg_++);
 
-    const char* siScansNegatively       = grib_arguments_get_name(h, args, carg_++);
-    const char* sjScansPositively       = grib_arguments_get_name(h, args, carg_++);
-    const char* sjPointsAreConsecutive  = grib_arguments_get_name(h, args, carg_++);
-    const char* sAlternativeRowScanning = grib_arguments_get_name(h, args, carg_++);
+    const char* siScansNegatively       = args->get_name(h, carg_++);
+    const char* sjScansPositively       = args->get_name(h, carg_++);
+    const char* sjPointsAreConsecutive  = args->get_name(h, carg_++);
+    const char* sAlternativeRowScanning = args->get_name(h, carg_++);
 
     if ((ret = grib_get_long_internal(h, snx, &nx)) != GRIB_SUCCESS)
         return ret;
diff --git a/src/geo_iterator/grib_iterator_class_space_view.h b/src/geo/iterator/grib_iterator_class_space_view.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_space_view.h
rename to src/geo/iterator/grib_iterator_class_space_view.h
diff --git a/src/geo_iterator/grib_iterator_class_unstructured.cc b/src/geo/iterator/grib_iterator_class_unstructured.cc
similarity index 96%
rename from src/geo_iterator/grib_iterator_class_unstructured.cc
rename to src/geo/iterator/grib_iterator_class_unstructured.cc
index dab834c12..2531bbd8a 100644
--- a/src/geo_iterator/grib_iterator_class_unstructured.cc
+++ b/src/geo/iterator/grib_iterator_class_unstructured.cc
@@ -37,7 +37,7 @@ int Unstructured::init(grib_handle* h, grib_arguments* args)
     if ((ret = Gen::init(h, args)) != GRIB_SUCCESS)
         return ret;
 
-    const char* s_uuidOfHGrid = grib_arguments_get_name(h, args, carg_++);
+    const char* s_uuidOfHGrid = args->get_name(h, carg_++);
     char uuidOfHGrid[32] = {0,};
     auto slen = sizeof(uuidOfHGrid);
     if ((ret = grib_get_string_internal(h, s_uuidOfHGrid, uuidOfHGrid, &slen)) != GRIB_SUCCESS) {
diff --git a/src/geo_iterator/grib_iterator_class_unstructured.h b/src/geo/iterator/grib_iterator_class_unstructured.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_unstructured.h
rename to src/geo/iterator/grib_iterator_class_unstructured.h
diff --git a/src/geo_nearest/grib_nearest.cc b/src/geo/nearest/grib_nearest.cc
similarity index 100%
rename from src/geo_nearest/grib_nearest.cc
rename to src/geo/nearest/grib_nearest.cc
diff --git a/src/geo_nearest/grib_nearest.h b/src/geo/nearest/grib_nearest.h
similarity index 100%
rename from src/geo_nearest/grib_nearest.h
rename to src/geo/nearest/grib_nearest.h
diff --git a/src/geo_nearest/grib_nearest_class_gen.cc b/src/geo/nearest/grib_nearest_class_gen.cc
similarity index 92%
rename from src/geo_nearest/grib_nearest_class_gen.cc
rename to src/geo/nearest/grib_nearest_class_gen.cc
index 68a257367..9934f9083 100644
--- a/src/geo_nearest/grib_nearest_class_gen.cc
+++ b/src/geo/nearest/grib_nearest_class_gen.cc
@@ -20,8 +20,8 @@ int Gen::init(grib_handle* h, grib_arguments* args)
 
     cargs_ = 1;
 
-    values_key_ = grib_arguments_get_name(h, args, cargs_++);
-    radius_     = grib_arguments_get_name(h, args, cargs_++);
+    values_key_ = args->get_name(h, cargs_++);
+    radius_     = args->get_name(h, cargs_++);
     values_  = NULL;
 
     return ret;
diff --git a/src/geo_nearest/grib_nearest_class_gen.h b/src/geo/nearest/grib_nearest_class_gen.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_gen.h
rename to src/geo/nearest/grib_nearest_class_gen.h
diff --git a/src/geo_nearest/grib_nearest_class_healpix.cc b/src/geo/nearest/grib_nearest_class_healpix.cc
similarity index 93%
rename from src/geo_nearest/grib_nearest_class_healpix.cc
rename to src/geo/nearest/grib_nearest_class_healpix.cc
index ed49a9644..a4bb16bb0 100644
--- a/src/geo_nearest/grib_nearest_class_healpix.cc
+++ b/src/geo/nearest/grib_nearest_class_healpix.cc
@@ -21,8 +21,8 @@ int Healpix::init(grib_handle* h, grib_arguments* args)
     if ((ret = Gen::init(h, args) != GRIB_SUCCESS))
         return ret;
 
-    Ni_ = grib_arguments_get_name(h, args, cargs_++);
-    Nj_ = grib_arguments_get_name(h, args, cargs_++);
+    Ni_ = args->get_name(h, cargs_++);
+    Nj_ = args->get_name(h, cargs_++);
     i_  = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
     j_  = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
 
diff --git a/src/geo_nearest/grib_nearest_class_healpix.h b/src/geo/nearest/grib_nearest_class_healpix.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_healpix.h
rename to src/geo/nearest/grib_nearest_class_healpix.h
diff --git a/src/geo_nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc b/src/geo/nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc
similarity index 94%
rename from src/geo_nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc
rename to src/geo/nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc
index eb701ee75..85498a112 100644
--- a/src/geo_nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc
+++ b/src/geo/nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc
@@ -21,8 +21,8 @@ int LambertAzimuthalEqualArea::init(grib_handle* h, grib_arguments* args)
     if ((ret = Gen::init(h, args) != GRIB_SUCCESS))
         return ret;
 
-    Ni_ = grib_arguments_get_name(h, args, cargs_++);
-    Nj_ = grib_arguments_get_name(h, args, cargs_++);
+    Ni_ = args->get_name(h, cargs_++);
+    Nj_ = args->get_name(h, cargs_++);
     i_  = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
     j_  = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
 
diff --git a/src/geo_nearest/grib_nearest_class_lambert_azimuthal_equal_area.h b/src/geo/nearest/grib_nearest_class_lambert_azimuthal_equal_area.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_lambert_azimuthal_equal_area.h
rename to src/geo/nearest/grib_nearest_class_lambert_azimuthal_equal_area.h
diff --git a/src/geo_nearest/grib_nearest_class_lambert_conformal.cc b/src/geo/nearest/grib_nearest_class_lambert_conformal.cc
similarity index 93%
rename from src/geo_nearest/grib_nearest_class_lambert_conformal.cc
rename to src/geo/nearest/grib_nearest_class_lambert_conformal.cc
index a61756e54..ab7b3a487 100644
--- a/src/geo_nearest/grib_nearest_class_lambert_conformal.cc
+++ b/src/geo/nearest/grib_nearest_class_lambert_conformal.cc
@@ -21,8 +21,8 @@ int LambertConformal::init(grib_handle* h, grib_arguments* args)
     if ((ret = Gen::init(h, args) != GRIB_SUCCESS))
         return ret;
 
-    Ni_ = grib_arguments_get_name(h, args, cargs_++);
-    Nj_ = grib_arguments_get_name(h, args, cargs_++);
+    Ni_ = args->get_name(h, cargs_++);
+    Nj_ = args->get_name(h, cargs_++);
     i_  = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
     j_  = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
 
diff --git a/src/geo_nearest/grib_nearest_class_lambert_conformal.h b/src/geo/nearest/grib_nearest_class_lambert_conformal.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_lambert_conformal.h
rename to src/geo/nearest/grib_nearest_class_lambert_conformal.h
diff --git a/src/geo_nearest/grib_nearest_class_latlon_reduced.cc b/src/geo/nearest/grib_nearest_class_latlon_reduced.cc
similarity index 96%
rename from src/geo_nearest/grib_nearest_class_latlon_reduced.cc
rename to src/geo/nearest/grib_nearest_class_latlon_reduced.cc
index d7e54da11..dbeae09ef 100644
--- a/src/geo_nearest/grib_nearest_class_latlon_reduced.cc
+++ b/src/geo/nearest/grib_nearest_class_latlon_reduced.cc
@@ -21,10 +21,10 @@ int LatlonReduced::init(grib_handle* h, grib_arguments* args)
     if ((ret = Gen::init(h, args) != GRIB_SUCCESS))
         return ret;
 
-    Nj_       = grib_arguments_get_name(h, args, cargs_++);
-    pl_       = grib_arguments_get_name(h, args, cargs_++);
-    lonFirst_ = grib_arguments_get_name(h, args, cargs_++);
-    lonLast_  = grib_arguments_get_name(h, args, cargs_++);
+    Nj_       = args->get_name(h, cargs_++);
+    pl_       = args->get_name(h, cargs_++);
+    lonFirst_ = args->get_name(h, cargs_++);
+    lonLast_  = args->get_name(h, cargs_++);
     j_        = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
     if (!j_)
         return GRIB_OUT_OF_MEMORY;
@@ -227,9 +227,7 @@ int LatlonReduced::find_global(grib_handle* h,
         if (!distances_)
             return GRIB_OUT_OF_MEMORY;
 
-        //void grib_binary_search(const double xx[], const size_t n, double x, size_t* ju, size_t* jl)
-        grib_binary_search(lats_, ilat - 1, inlat,
-                           &(j_[0]), &(j_[1]));
+        grib_binary_search(lats_, ilat - 1, inlat, &(j_[0]), &(j_[1]));
 
         nlon = 0;
         for (jj = 0; jj < j_[0]; jj++)
diff --git a/src/geo_nearest/grib_nearest_class_latlon_reduced.h b/src/geo/nearest/grib_nearest_class_latlon_reduced.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_latlon_reduced.h
rename to src/geo/nearest/grib_nearest_class_latlon_reduced.h
diff --git a/src/geo_nearest/grib_nearest_class_mercator.cc b/src/geo/nearest/grib_nearest_class_mercator.cc
similarity index 93%
rename from src/geo_nearest/grib_nearest_class_mercator.cc
rename to src/geo/nearest/grib_nearest_class_mercator.cc
index e8d1935f7..81e584ffb 100644
--- a/src/geo_nearest/grib_nearest_class_mercator.cc
+++ b/src/geo/nearest/grib_nearest_class_mercator.cc
@@ -21,8 +21,8 @@ int Mercator::init(grib_handle* h, grib_arguments* args)
     if ((ret = Gen::init(h, args) != GRIB_SUCCESS))
         return ret;
 
-    Ni_ = grib_arguments_get_name(h, args, cargs_++);
-    Nj_ = grib_arguments_get_name(h, args, cargs_++);
+    Ni_ = args->get_name(h, cargs_++);
+    Nj_ = args->get_name(h, cargs_++);
     i_  = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
     j_  = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
 
@@ -36,14 +36,12 @@ int Mercator::find(grib_handle* h,
 {
     return grib_nearest_find_generic(
         h, inlat, inlon, flags, /* inputs */
-
         values_key_,  /* outputs to set the 'self' object */
         &(lats_),
         &(lats_count_),
         &(lons_),
         &(lons_count_),
         &(distances_),
-
         outlats, outlons,  /* outputs of the find function */
         values, distances, indexes, len);
 }
diff --git a/src/geo_nearest/grib_nearest_class_mercator.h b/src/geo/nearest/grib_nearest_class_mercator.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_mercator.h
rename to src/geo/nearest/grib_nearest_class_mercator.h
diff --git a/src/geo_nearest/grib_nearest_class_polar_stereographic.cc b/src/geo/nearest/grib_nearest_class_polar_stereographic.cc
similarity index 93%
rename from src/geo_nearest/grib_nearest_class_polar_stereographic.cc
rename to src/geo/nearest/grib_nearest_class_polar_stereographic.cc
index ed223f285..d2f4a8ce1 100644
--- a/src/geo_nearest/grib_nearest_class_polar_stereographic.cc
+++ b/src/geo/nearest/grib_nearest_class_polar_stereographic.cc
@@ -21,8 +21,8 @@ int PolarStereographic::init(grib_handle* h, grib_arguments* args)
     if ((ret = Gen::init(h, args) != GRIB_SUCCESS))
         return ret;
 
-    Ni_ = grib_arguments_get_name(h, args, cargs_++);
-    Nj_ = grib_arguments_get_name(h, args, cargs_++);
+    Ni_ = args->get_name(h, cargs_++);
+    Nj_ = args->get_name(h, cargs_++);
     i_  = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
     j_  = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
 
@@ -36,14 +36,12 @@ int PolarStereographic::find(grib_handle* h,
 {
     return grib_nearest_find_generic(
         h, inlat, inlon, flags, /* inputs */
-
         values_key_,   /* outputs to set the 'self' object */
         &(lats_),
         &(lats_count_),
         &(lons_),
         &(lons_count_),
         &(distances_),
-
         outlats, outlons,  /* outputs of the find function */
         values, distances, indexes, len);
 }
diff --git a/src/geo_nearest/grib_nearest_class_polar_stereographic.h b/src/geo/nearest/grib_nearest_class_polar_stereographic.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_polar_stereographic.h
rename to src/geo/nearest/grib_nearest_class_polar_stereographic.h
diff --git a/src/geo_nearest/grib_nearest_class_reduced.cc b/src/geo/nearest/grib_nearest_class_reduced.cc
similarity index 89%
rename from src/geo_nearest/grib_nearest_class_reduced.cc
rename to src/geo/nearest/grib_nearest_class_reduced.cc
index 60a40fb15..c96de6b12 100644
--- a/src/geo_nearest/grib_nearest_class_reduced.cc
+++ b/src/geo/nearest/grib_nearest_class_reduced.cc
@@ -23,8 +23,8 @@ int Reduced::init(grib_handle* h, grib_arguments* args)
     if ((ret = Gen::init(h, args) != GRIB_SUCCESS))
         return ret;
 
-    Nj_      = grib_arguments_get_name(h, args, cargs_++);
-    pl_      = grib_arguments_get_name(h, args, cargs_++);
+    Nj_      = args->get_name(h, cargs_++);
+    pl_      = args->get_name(h, cargs_++);
     j_       = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
     legacy_  = -1;
     rotated_ = -1;
@@ -59,29 +59,29 @@ typedef void (*get_reduced_row_proc)(long pl, double lon_first, double lon_last,
 
 static int is_legacy(grib_handle* h, int* legacy)
 {
-    int err = 0;
+    int err   = 0;
     long lVal = 0;
-    *legacy = 0; // false by default
-    err = grib_get_long(h, "legacyGaussSubarea", &lVal);
+    *legacy   = 0;  // false by default
+    err       = grib_get_long(h, "legacyGaussSubarea", &lVal);
     if (err) return err;
     *legacy = (int)lVal;
     return GRIB_SUCCESS;
 }
 static int is_rotated(grib_handle* h, int* rotated)
 {
-    int err = 0;
+    int err   = 0;
     long lVal = 0;
-    *rotated = 0; // false by default
-    err = grib_get_long(h, "isRotatedGrid", &lVal);
+    *rotated  = 0;  // false by default
+    err       = grib_get_long(h, "isRotatedGrid", &lVal);
     if (err) return err;
     *rotated = (int)lVal;
     return GRIB_SUCCESS;
 }
 
 int Reduced::find(grib_handle* h,
-                double inlat, double inlon, unsigned long flags,
-                double* outlats, double* outlons, double* values,
-                double* distances, int* indexes, size_t* len)
+                  double inlat, double inlon, unsigned long flags,
+                  double* outlats, double* outlons, double* values,
+                  double* distances, int* indexes, size_t* len)
 {
     int err = 0;
 
@@ -91,16 +91,15 @@ int Reduced::find(grib_handle* h,
     }
 
     if (global_ && rotated_ == 0) {
-        err = find_global( h,
-                inlat, inlon, flags,
-                outlats, outlons, values,
-                distances, indexes, len);
+        err = find_global(h,
+                          inlat, inlon, flags,
+                          outlats, outlons, values,
+                          distances, indexes, len);
     }
-    else
-    {
+    else {
         /* ECC-762, ECC-1432: Use brute force generic algorithm
          * for reduced grid subareas. Review in the future
-        */
+         */
         int lons_count = 0; /*dummy*/
 
         err = grib_nearest_find_generic(
@@ -119,12 +118,12 @@ int Reduced::find(grib_handle* h,
 
 /* Old implementation in src/deprecated/grib_nearest_class_reduced.old */
 int Reduced::find_global(grib_handle* h,
-                double inlat, double inlon, unsigned long flags,
-                double* outlats, double* outlons, double* values,
-                double* distances, int* indexes, size_t* len)
+                         double inlat, double inlon, unsigned long flags,
+                         double* outlats, double* outlons, double* values,
+                         double* distances, int* indexes, size_t* len)
 {
     int err = 0, kk = 0, ii = 0;
-    size_t jj = 0;
+    size_t jj           = 0;
     long* pla           = NULL;
     long* pl            = NULL;
     size_t nvalues      = 0;
@@ -153,8 +152,8 @@ int Reduced::find_global(grib_handle* h,
      * This is for performance: if the grid has not changed, we only do this once
      * and reuse for other messages */
     if (!h_ || (flags & GRIB_NEAREST_SAME_GRID) == 0) {
-        double olat  = 1.e10;
-        long n       = 0;
+        double olat = 1.e10;
+        long n      = 0;
 
         ilat = 0;
         ilon = 0;
@@ -187,7 +186,7 @@ int Reduced::find_global(grib_handle* h,
         while (grib_iterator_next(iter, &lat, &lon, NULL)) {
             if (ilat < lats_count_ && olat != lat) {
                 lats_[ilat++] = lat;
-                olat               = lat;
+                olat          = lat;
             }
             while (lon > 360)
                 lon -= 360;
@@ -288,8 +287,8 @@ int Reduced::find_global(grib_handle* h,
         if (lons[nplm1] > lons[0]) {
             if (inlon < lons[0] || inlon > lons[nplm1]) {
                 if (lons[nplm1] - lons[0] - 360 <= lons[nplm1] - lons[nplm1 - 1]) {
-                    k_[0]         = 0;
-                    k_[1]         = nplm1;
+                    k_[0]              = 0;
+                    k_[1]              = nplm1;
                     nearest_lons_found = 1;
                 }
                 else
@@ -299,8 +298,8 @@ int Reduced::find_global(grib_handle* h,
         else {
             if (inlon > lons[0] || inlon < lons[nplm1]) {
                 if (lons[0] - lons[nplm1] - 360 <= lons[0] - lons[1]) {
-                    k_[0]         = 0;
-                    k_[1]         = nplm1;
+                    k_[0]              = 0;
+                    k_[1]              = nplm1;
                     nearest_lons_found = 1;
                 }
                 else
@@ -352,8 +351,8 @@ int Reduced::find_global(grib_handle* h,
             if (inlon < lons[0] || inlon > lons[nplm1]) {
                 if (lons[nplm1] - lons[0] - 360 <=
                     lons[nplm1] - lons[nplm1 - 1]) {
-                    k_[2]         = 0;
-                    k_[3]         = nplm1;
+                    k_[2]              = 0;
+                    k_[3]              = nplm1;
                     nearest_lons_found = 1;
                 }
                 else
@@ -364,8 +363,8 @@ int Reduced::find_global(grib_handle* h,
             if (inlon > lons[0] || inlon < lons[nplm1]) {
                 if (lons[0] - lons[nplm1] - 360 <=
                     lons[0] - lons[1]) {
-                    k_[2]         = 0;
-                    k_[3]         = nplm1;
+                    k_[2]              = 0;
+                    k_[3]              = nplm1;
                     nearest_lons_found = 1;
                 }
                 else
@@ -395,7 +394,7 @@ int Reduced::find_global(grib_handle* h,
         for (jj = 0; jj < 2; jj++) {
             for (ii = 0; ii < 2; ii++) {
                 distances_[kk] = geographic_distance_spherical(radiusInKm, inlon, inlat,
-                                                                    lons_[k_[kk]], lats_[j_[jj]]);
+                                                               lons_[k_[kk]], lats_[j_[jj]]);
                 kk++;
             }
         }
@@ -423,7 +422,8 @@ int Reduced::find_global(grib_handle* h,
                 /* Current interface uses an 'int' for 'indexes' which is 32bits! We should change this to a 64bit type */
                 grib_context_log(h->context, GRIB_LOG_ERROR, "grib_nearest_reduced: Unable to compute index. Value too large");
                 return GRIB_OUT_OF_RANGE;
-            } else {
+            }
+            else {
                 indexes[kk] = (int)k_[kk];
             }
             kk++;
diff --git a/src/geo_nearest/grib_nearest_class_reduced.h b/src/geo/nearest/grib_nearest_class_reduced.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_reduced.h
rename to src/geo/nearest/grib_nearest_class_reduced.h
diff --git a/src/geo_nearest/grib_nearest_class_regular.cc b/src/geo/nearest/grib_nearest_class_regular.cc
similarity index 98%
rename from src/geo_nearest/grib_nearest_class_regular.cc
rename to src/geo/nearest/grib_nearest_class_regular.cc
index 9dac4b0cc..1884b347d 100644
--- a/src/geo_nearest/grib_nearest_class_regular.cc
+++ b/src/geo/nearest/grib_nearest_class_regular.cc
@@ -23,8 +23,8 @@ int Regular::init(grib_handle* h, grib_arguments* args)
     if ((ret = Gen::init(h, args) != GRIB_SUCCESS))
         return ret;
 
-    Ni_ = grib_arguments_get_name(h, args, cargs_++);
-    Nj_ = grib_arguments_get_name(h, args, cargs_++);
+    Ni_ = args->get_name(h, cargs_++);
+    Nj_ = args->get_name(h, cargs_++);
     i_  = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
     j_  = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
     return ret;
diff --git a/src/geo_nearest/grib_nearest_class_regular.h b/src/geo/nearest/grib_nearest_class_regular.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_regular.h
rename to src/geo/nearest/grib_nearest_class_regular.h
diff --git a/src/geo_nearest/grib_nearest_class_space_view.cc b/src/geo/nearest/grib_nearest_class_space_view.cc
similarity index 93%
rename from src/geo_nearest/grib_nearest_class_space_view.cc
rename to src/geo/nearest/grib_nearest_class_space_view.cc
index fdad5fba6..22207087e 100644
--- a/src/geo_nearest/grib_nearest_class_space_view.cc
+++ b/src/geo/nearest/grib_nearest_class_space_view.cc
@@ -21,8 +21,8 @@ int SpaceView::init(grib_handle* h, grib_arguments* args)
     if ((ret = Gen::init(h, args) != GRIB_SUCCESS))
         return ret;
 
-    Ni_ = grib_arguments_get_name(h, args, cargs_++);
-    Nj_ = grib_arguments_get_name(h, args, cargs_++);
+    Ni_ = args->get_name(h, cargs_++);
+    Nj_ = args->get_name(h, cargs_++);
     i_  = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
     j_  = (size_t*)grib_context_malloc(h->context, 2 * sizeof(size_t));
 
diff --git a/src/geo_nearest/grib_nearest_class_space_view.h b/src/geo/nearest/grib_nearest_class_space_view.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_space_view.h
rename to src/geo/nearest/grib_nearest_class_space_view.h
diff --git a/src/grib_accessor_class.cc b/src/grib_accessor_class.cc
index 762489961..98d247ff4 100644
--- a/src/grib_accessor_class.cc
+++ b/src/grib_accessor_class.cc
@@ -11,11 +11,7 @@
 
 #include "grib_api_internal.h"
 #include "grib_accessor_classes_hash.cc"
-#include <iostream>
-/*     grib level     */
-
-
-/* This file is generated by ./make_class.pl */
+//#include <iostream>
 #include "accessor/grib_accessor.h"
 
 #if GRIB_PTHREADS
diff --git a/src/grib_accessor_class.h b/src/grib_accessor_class.h
index aafc22d97..542946a38 100644
--- a/src/grib_accessor_class.h
+++ b/src/grib_accessor_class.h
@@ -131,6 +131,7 @@ extern grib_accessor* grib_accessor_mars_step;
 extern grib_accessor* grib_accessor_md5;
 extern grib_accessor* grib_accessor_message;
 extern grib_accessor* grib_accessor_message_copy;
+extern grib_accessor* grib_accessor_message_is_valid;
 extern grib_accessor* grib_accessor_multdouble;
 extern grib_accessor* grib_accessor_nearest;
 extern grib_accessor* grib_accessor_non_alpha;
diff --git a/src/grib_accessor_classes_hash.cc b/src/grib_accessor_classes_hash.cc
index a97859d89..b9ae6baec 100644
--- a/src/grib_accessor_classes_hash.cc
+++ b/src/grib_accessor_classes_hash.cc
@@ -37,7 +37,7 @@
 #line 6 "accessor_class_list.gperf"
 struct accessor_class_hash { const char *name; grib_accessor **cclass;};
 
-#define TOTAL_KEYWORDS 205
+#define TOTAL_KEYWORDS 206
 #define MIN_WORD_LENGTH 1
 #define MAX_WORD_LENGTH 44
 #define MIN_HASH_VALUE 1
@@ -118,20 +118,20 @@ static const struct accessor_class_hash classes[] =
 #line 9 "accessor_class_list.gperf"
     {" "},
     {""}, {""}, {""}, {""},
-#line 178 "accessor_class_list.gperf"
+#line 179 "accessor_class_list.gperf"
     {"size", &grib_accessor_size},
 #line 12 "accessor_class_list.gperf"
     {"ascii", &grib_accessor_ascii},
-#line 175 "accessor_class_list.gperf"
+#line 176 "accessor_class_list.gperf"
     {"signed", &grib_accessor_signed},
-#line 155 "accessor_class_list.gperf"
+#line 156 "accessor_class_list.gperf"
     {"pad", &grib_accessor_pad},
-#line 181 "accessor_class_list.gperf"
+#line 182 "accessor_class_list.gperf"
     {"spd", &grib_accessor_spd},
 #line 75 "accessor_class_list.gperf"
     {"dirty", &grib_accessor_dirty},
     {""}, {""},
-#line 176 "accessor_class_list.gperf"
+#line 177 "accessor_class_list.gperf"
     {"signed_bits", &grib_accessor_signed_bits},
     {""},
 #line 66 "accessor_class_list.gperf"
@@ -141,7 +141,7 @@ static const struct accessor_class_hash classes[] =
     {"data_simple_packing", &grib_accessor_data_simple_packing},
 #line 68 "accessor_class_list.gperf"
     {"data_secondary_bitmap", &grib_accessor_data_secondary_bitmap},
-#line 169 "accessor_class_list.gperf"
+#line 170 "accessor_class_list.gperf"
     {"section", &grib_accessor_section},
 #line 43 "accessor_class_list.gperf"
     {"data_apply_bitmap", &grib_accessor_data_apply_bitmap},
@@ -155,34 +155,34 @@ static const struct accessor_class_hash classes[] =
     {"data_jpeg2000_packing", &grib_accessor_data_jpeg2000_packing},
 #line 65 "accessor_class_list.gperf"
     {"data_png_packing", &grib_accessor_data_png_packing},
-#line 171 "accessor_class_list.gperf"
-    {"section_padding", &grib_accessor_section_padding},
 #line 172 "accessor_class_list.gperf"
+    {"section_padding", &grib_accessor_section_padding},
+#line 173 "accessor_class_list.gperf"
     {"section_pointer", &grib_accessor_section_pointer},
 #line 44 "accessor_class_list.gperf"
     {"data_apply_boustrophedonic", &grib_accessor_data_apply_boustrophedonic},
     {""}, {""}, {""}, {""}, {""},
-#line 156 "accessor_class_list.gperf"
+#line 157 "accessor_class_list.gperf"
     {"padding", &grib_accessor_padding},
 #line 45 "accessor_class_list.gperf"
     {"data_apply_boustrophedonic_bitmap", &grib_accessor_data_apply_boustrophedonic_bitmap},
 #line 110 "accessor_class_list.gperf"
     {"gds_is_present", &grib_accessor_gds_is_present},
-#line 168 "accessor_class_list.gperf"
+#line 169 "accessor_class_list.gperf"
     {"second_order_bits_per_value", &grib_accessor_second_order_bits_per_value},
-#line 170 "accessor_class_list.gperf"
+#line 171 "accessor_class_list.gperf"
     {"section_length", &grib_accessor_section_length},
 #line 112 "accessor_class_list.gperf"
     {"getenv", &grib_accessor_getenv},
 #line 57 "accessor_class_list.gperf"
     {"data_g22order_packing", &grib_accessor_data_g22order_packing},
-#line 190 "accessor_class_list.gperf"
+#line 191 "accessor_class_list.gperf"
     {"time", &grib_accessor_time},
     {""},
 #line 61 "accessor_class_list.gperf"
     {"data_g2shsimple_packing", &grib_accessor_data_g2shsimple_packing},
     {""},
-#line 154 "accessor_class_list.gperf"
+#line 155 "accessor_class_list.gperf"
     {"packing_type", &grib_accessor_packing_type},
 #line 62 "accessor_class_list.gperf"
     {"data_g2simple_packing", &grib_accessor_data_g2simple_packing},
@@ -196,15 +196,15 @@ static const struct accessor_class_hash classes[] =
     {"g2end_step", &grib_accessor_g2end_step},
 #line 98 "accessor_class_list.gperf"
     {"g2_eps", &grib_accessor_g2_eps},
-#line 141 "accessor_class_list.gperf"
+#line 142 "accessor_class_list.gperf"
     {"nearest", &grib_accessor_nearest},
-#line 157 "accessor_class_list.gperf"
+#line 158 "accessor_class_list.gperf"
     {"padto", &grib_accessor_padto},
     {""}, {""}, {""},
 #line 107 "accessor_class_list.gperf"
     {"g2lon", &grib_accessor_g2lon},
     {""}, {""},
-#line 187 "accessor_class_list.gperf"
+#line 188 "accessor_class_list.gperf"
     {"step_in_units", &grib_accessor_step_in_units},
 #line 63 "accessor_class_list.gperf"
     {"data_g2simple_packing_with_preprocessing", &grib_accessor_data_g2simple_packing_with_preprocessing},
@@ -215,13 +215,13 @@ static const struct accessor_class_hash classes[] =
     {"bit", &grib_accessor_bit},
 #line 15 "accessor_class_list.gperf"
     {"bits", &grib_accessor_bits},
-#line 188 "accessor_class_list.gperf"
+#line 189 "accessor_class_list.gperf"
     {"sum", &grib_accessor_sum},
 #line 14 "accessor_class_list.gperf"
     {"bitmap", &grib_accessor_bitmap},
-#line 202 "accessor_class_list.gperf"
+#line 203 "accessor_class_list.gperf"
     {"uint8", &grib_accessor_uint8},
-#line 142 "accessor_class_list.gperf"
+#line 143 "accessor_class_list.gperf"
     {"non_alpha", &grib_accessor_non_alpha},
     {""},
 #line 29 "accessor_class_list.gperf"
@@ -239,14 +239,14 @@ static const struct accessor_class_hash classes[] =
     {""},
 #line 48 "accessor_class_list.gperf"
     {"data_dummy_field", &grib_accessor_data_dummy_field},
-#line 200 "accessor_class_list.gperf"
+#line 201 "accessor_class_list.gperf"
     {"uint64", &grib_accessor_uint64},
-#line 198 "accessor_class_list.gperf"
+#line 199 "accessor_class_list.gperf"
     {"uint32", &grib_accessor_uint32},
     {""},
-#line 166 "accessor_class_list.gperf"
+#line 167 "accessor_class_list.gperf"
     {"scale", &grib_accessor_scale},
-#line 184 "accessor_class_list.gperf"
+#line 185 "accessor_class_list.gperf"
     {"statistics", &grib_accessor_statistics},
 #line 102 "accessor_class_list.gperf"
     {"g2date", &grib_accessor_g2date},
@@ -261,41 +261,41 @@ static const struct accessor_class_hash classes[] =
     {""},
 #line 121 "accessor_class_list.gperf"
     {"iterator", &grib_accessor_iterator},
-#line 177 "accessor_class_list.gperf"
+#line 178 "accessor_class_list.gperf"
     {"simple_packing_error", &grib_accessor_simple_packing_error},
-#line 185 "accessor_class_list.gperf"
+#line 186 "accessor_class_list.gperf"
     {"statistics_spectral", &grib_accessor_statistics_spectral},
     {""},
 #line 46 "accessor_class_list.gperf"
     {"data_ccsds_packing", &grib_accessor_data_ccsds_packing},
     {""}, {""},
-#line 144 "accessor_class_list.gperf"
+#line 145 "accessor_class_list.gperf"
     {"number_of_points", &grib_accessor_number_of_points},
 #line 96 "accessor_class_list.gperf"
     {"g2_aerosol", &grib_accessor_g2_aerosol},
     {""}, {""}, {""}, {""},
-#line 173 "accessor_class_list.gperf"
+#line 174 "accessor_class_list.gperf"
     {"select_step_template", &grib_accessor_select_step_template},
-#line 192 "accessor_class_list.gperf"
+#line 193 "accessor_class_list.gperf"
     {"to_integer", &grib_accessor_to_integer},
 #line 113 "accessor_class_list.gperf"
     {"global_gaussian", &grib_accessor_global_gaussian},
-#line 145 "accessor_class_list.gperf"
+#line 146 "accessor_class_list.gperf"
     {"number_of_points_gaussian", &grib_accessor_number_of_points_gaussian},
-#line 205 "accessor_class_list.gperf"
+#line 206 "accessor_class_list.gperf"
     {"unsigned", &grib_accessor_unsigned},
     {""}, {""},
-#line 174 "accessor_class_list.gperf"
+#line 175 "accessor_class_list.gperf"
     {"sexagesimal2decimal", &grib_accessor_sexagesimal2decimal},
     {""},
 #line 78 "accessor_class_list.gperf"
     {"element", &grib_accessor_element},
-#line 206 "accessor_class_list.gperf"
+#line 207 "accessor_class_list.gperf"
     {"unsigned_bits", &grib_accessor_unsigned_bits},
 #line 126 "accessor_class_list.gperf"
     {"latitudes", &grib_accessor_latitudes},
     {""},
-#line 203 "accessor_class_list.gperf"
+#line 204 "accessor_class_list.gperf"
     {"unexpanded_descriptors", &grib_accessor_unexpanded_descriptors},
     {""}, {""},
 #line 131 "accessor_class_list.gperf"
@@ -304,35 +304,35 @@ static const struct accessor_class_hash classes[] =
     {"divdouble", &grib_accessor_divdouble},
 #line 77 "accessor_class_list.gperf"
     {"double", &grib_accessor_double},
-#line 186 "accessor_class_list.gperf"
+#line 187 "accessor_class_list.gperf"
     {"step_human_readable", &grib_accessor_step_human_readable},
-#line 162 "accessor_class_list.gperf"
+#line 163 "accessor_class_list.gperf"
     {"raw", &grib_accessor_raw},
 #line 99 "accessor_class_list.gperf"
     {"g2_mars_labeling", &grib_accessor_g2_mars_labeling},
     {""}, {""}, {""}, {""}, {""}, {""},
-#line 193 "accessor_class_list.gperf"
+#line 194 "accessor_class_list.gperf"
     {"to_string", &grib_accessor_to_string},
     {""},
-#line 201 "accessor_class_list.gperf"
+#line 202 "accessor_class_list.gperf"
     {"uint64_little_endian", &grib_accessor_uint64_little_endian},
-#line 199 "accessor_class_list.gperf"
+#line 200 "accessor_class_list.gperf"
     {"uint32_little_endian", &grib_accessor_uint32_little_endian},
     {""},
 #line 105 "accessor_class_list.gperf"
     {"g2latlon", &grib_accessor_g2latlon},
-#line 159 "accessor_class_list.gperf"
+#line 160 "accessor_class_list.gperf"
     {"padtomultiple", &grib_accessor_padtomultiple},
 #line 17 "accessor_class_list.gperf"
     {"blob", &grib_accessor_blob},
-#line 163 "accessor_class_list.gperf"
+#line 164 "accessor_class_list.gperf"
     {"rdbtime_guess_date", &grib_accessor_rdbtime_guess_date},
     {""}, {""}, {""},
 #line 118 "accessor_class_list.gperf"
     {"ibmfloat", &grib_accessor_ibmfloat},
 #line 125 "accessor_class_list.gperf"
     {"label", &grib_accessor_label},
-#line 160 "accessor_class_list.gperf"
+#line 161 "accessor_class_list.gperf"
     {"position", &grib_accessor_position},
 #line 19 "accessor_class_list.gperf"
     {"bufr_data_array", &grib_accessor_bufr_data_array},
@@ -351,48 +351,48 @@ static const struct accessor_class_hash classes[] =
     {""}, {""}, {""}, {""},
 #line 109 "accessor_class_list.gperf"
     {"gaussian_grid_name", &grib_accessor_gaussian_grid_name},
-#line 196 "accessor_class_list.gperf"
+#line 197 "accessor_class_list.gperf"
     {"trim", &grib_accessor_trim},
     {""}, {""}, {""}, {""}, {""},
-#line 194 "accessor_class_list.gperf"
+#line 195 "accessor_class_list.gperf"
     {"transient", &grib_accessor_transient},
     {""}, {""},
 #line 38 "accessor_class_list.gperf"
     {"concept", &grib_accessor_concept},
     {""},
-#line 165 "accessor_class_list.gperf"
+#line 166 "accessor_class_list.gperf"
     {"round", &grib_accessor_round},
     {""},
-#line 195 "accessor_class_list.gperf"
+#line 196 "accessor_class_list.gperf"
     {"transient_darray", &grib_accessor_transient_darray},
     {""},
 #line 18 "accessor_class_list.gperf"
     {"budgdate", &grib_accessor_budgdate},
     {""}, {""},
-#line 143 "accessor_class_list.gperf"
+#line 144 "accessor_class_list.gperf"
     {"number_of_coded_values", &grib_accessor_number_of_coded_values},
     {""}, {""}, {""},
-#line 182 "accessor_class_list.gperf"
+#line 183 "accessor_class_list.gperf"
     {"spectral_truncation", &grib_accessor_spectral_truncation},
 #line 39 "accessor_class_list.gperf"
     {"constant", &grib_accessor_constant},
-#line 209 "accessor_class_list.gperf"
+#line 210 "accessor_class_list.gperf"
     {"values", &grib_accessor_values},
     {""}, {""},
-#line 149 "accessor_class_list.gperf"
+#line 150 "accessor_class_list.gperf"
     {"octet_number", &grib_accessor_octet_number},
 #line 134 "accessor_class_list.gperf"
     {"lookup", &grib_accessor_lookup},
-#line 183 "accessor_class_list.gperf"
+#line 184 "accessor_class_list.gperf"
     {"sprintf", &grib_accessor_sprintf},
     {""}, {""}, {""},
 #line 133 "accessor_class_list.gperf"
     {"longitudes", &grib_accessor_longitudes},
     {""}, {""}, {""},
-#line 161 "accessor_class_list.gperf"
+#line 162 "accessor_class_list.gperf"
     {"proj_string", &grib_accessor_proj_string},
     {""},
-#line 189 "accessor_class_list.gperf"
+#line 190 "accessor_class_list.gperf"
     {"suppressed", &grib_accessor_suppressed},
 #line 55 "accessor_class_list.gperf"
     {"data_g1shsimple_packing", &grib_accessor_data_g1shsimple_packing},
@@ -401,7 +401,7 @@ static const struct accessor_class_hash classes[] =
     {"data_g1simple_packing", &grib_accessor_data_g1simple_packing},
 #line 49 "accessor_class_list.gperf"
     {"data_g1complex_packing", &grib_accessor_data_g1complex_packing},
-#line 191 "accessor_class_list.gperf"
+#line 192 "accessor_class_list.gperf"
     {"to_double", &grib_accessor_to_double},
     {""}, {""}, {""},
 #line 27 "accessor_class_list.gperf"
@@ -423,23 +423,26 @@ static const struct accessor_class_hash classes[] =
     {"g2bitmap_present", &grib_accessor_g2bitmap_present},
 #line 135 "accessor_class_list.gperf"
     {"mars_param", &grib_accessor_mars_param},
-#line 212 "accessor_class_list.gperf"
+#line 213 "accessor_class_list.gperf"
     {"when", &grib_accessor_when},
 #line 119 "accessor_class_list.gperf"
     {"ieeefloat", &grib_accessor_ieeefloat},
-#line 150 "accessor_class_list.gperf"
+#line 151 "accessor_class_list.gperf"
     {"offset_file", &grib_accessor_offset_file},
-    {""}, {""}, {""}, {""},
+    {""}, {""},
+#line 140 "accessor_class_list.gperf"
+    {"message_is_valid", &grib_accessor_message_is_valid},
+    {""},
 #line 139 "accessor_class_list.gperf"
     {"message_copy", &grib_accessor_message_copy},
     {""}, {""},
-#line 207 "accessor_class_list.gperf"
-    {"validity_date", &grib_accessor_validity_date},
 #line 208 "accessor_class_list.gperf"
+    {"validity_date", &grib_accessor_validity_date},
+#line 209 "accessor_class_list.gperf"
     {"validity_time", &grib_accessor_validity_time},
 #line 21 "accessor_class_list.gperf"
     {"bufr_elements_table", &grib_accessor_bufr_elements_table},
-#line 211 "accessor_class_list.gperf"
+#line 212 "accessor_class_list.gperf"
     {"vector", &grib_accessor_vector},
     {""},
 #line 94 "accessor_class_list.gperf"
@@ -452,7 +455,7 @@ static const struct accessor_class_hash classes[] =
 #line 35 "accessor_class_list.gperf"
     {"codetable", &grib_accessor_codetable},
     {""}, {""},
-#line 158 "accessor_class_list.gperf"
+#line 159 "accessor_class_list.gperf"
     {"padtoeven", &grib_accessor_padtoeven},
 #line 71 "accessor_class_list.gperf"
     {"data_shsimple_packing", &grib_accessor_data_shsimple_packing},
@@ -468,17 +471,17 @@ static const struct accessor_class_hash classes[] =
 #line 132 "accessor_class_list.gperf"
     {"long_vector", &grib_accessor_long_vector},
     {""}, {""},
-#line 197 "accessor_class_list.gperf"
+#line 198 "accessor_class_list.gperf"
     {"uint16", &grib_accessor_uint16},
     {""},
 #line 127 "accessor_class_list.gperf"
     {"latlon_increment", &grib_accessor_latlon_increment},
     {""},
-#line 213 "accessor_class_list.gperf"
+#line 214 "accessor_class_list.gperf"
     {"cf_var_name", &grib_accessor_cf_var_name},
 #line 136 "accessor_class_list.gperf"
     {"mars_step", &grib_accessor_mars_step},
-#line 210 "accessor_class_list.gperf"
+#line 211 "accessor_class_list.gperf"
     {"variable", &grib_accessor_variable},
 #line 52 "accessor_class_list.gperf"
     {"data_g1second_order_general_packing", &grib_accessor_data_g1second_order_general_packing},
@@ -496,13 +499,13 @@ static const struct accessor_class_hash classes[] =
     {""},
 #line 51 "accessor_class_list.gperf"
     {"data_g1second_order_general_extended_packing", &grib_accessor_data_g1second_order_general_extended_packing},
-#line 153 "accessor_class_list.gperf"
+#line 154 "accessor_class_list.gperf"
     {"pack_bufr_values", &grib_accessor_pack_bufr_values},
     {""}, {""}, {""}, {""},
-#line 167 "accessor_class_list.gperf"
+#line 168 "accessor_class_list.gperf"
     {"scale_values", &grib_accessor_scale_values},
     {""},
-#line 146 "accessor_class_list.gperf"
+#line 147 "accessor_class_list.gperf"
     {"number_of_values", &grib_accessor_number_of_values},
     {""}, {""}, {""}, {""}, {""},
 #line 24 "accessor_class_list.gperf"
@@ -524,18 +527,18 @@ static const struct accessor_class_hash classes[] =
 #line 23 "accessor_class_list.gperf"
     {"bufr_extract_datetime_subsets", &grib_accessor_bufr_extract_datetime_subsets},
     {""},
-#line 147 "accessor_class_list.gperf"
+#line 148 "accessor_class_list.gperf"
     {"number_of_values_data_raw_packing", &grib_accessor_number_of_values_data_raw_packing},
-#line 151 "accessor_class_list.gperf"
+#line 152 "accessor_class_list.gperf"
     {"offset_values", &grib_accessor_offset_values},
 #line 79 "accessor_class_list.gperf"
     {"evaluate", &grib_accessor_evaluate},
     {""}, {""}, {""},
 #line 73 "accessor_class_list.gperf"
     {"decimal_precision", &grib_accessor_decimal_precision},
-#line 179 "accessor_class_list.gperf"
+#line 180 "accessor_class_list.gperf"
     {"smart_table", &grib_accessor_smart_table},
-#line 204 "accessor_class_list.gperf"
+#line 205 "accessor_class_list.gperf"
     {"unpack_bufr_values", &grib_accessor_unpack_bufr_values},
 #line 117 "accessor_class_list.gperf"
     {"headers_only", &grib_accessor_headers_only},
@@ -546,7 +549,7 @@ static const struct accessor_class_hash classes[] =
 #line 120 "accessor_class_list.gperf"
     {"ifs_param", &grib_accessor_ifs_param},
     {""},
-#line 180 "accessor_class_list.gperf"
+#line 181 "accessor_class_list.gperf"
     {"smart_table_column", &grib_accessor_smart_table_column},
     {""}, {""}, {""}, {""},
 #line 128 "accessor_class_list.gperf"
@@ -572,16 +575,16 @@ static const struct accessor_class_hash classes[] =
     {"hash_array", &grib_accessor_hash_array},
 #line 30 "accessor_class_list.gperf"
     {"change_alternative_row_scanning", &grib_accessor_change_alternative_row_scanning},
-#line 152 "accessor_class_list.gperf"
+#line 153 "accessor_class_list.gperf"
     {"optimal_step_units", &grib_accessor_optimal_step_units},
     {""}, {""}, {""},
-#line 140 "accessor_class_list.gperf"
+#line 141 "accessor_class_list.gperf"
     {"multdouble", &grib_accessor_multdouble},
     {""},
 #line 31 "accessor_class_list.gperf"
     {"change_scanning_direction", &grib_accessor_change_scanning_direction},
     {""}, {""}, {""}, {""}, {""}, {""},
-#line 148 "accessor_class_list.gperf"
+#line 149 "accessor_class_list.gperf"
     {"octahedral_gaussian", &grib_accessor_octahedral_gaussian},
     {""},
 #line 124 "accessor_class_list.gperf"
@@ -610,7 +613,7 @@ static const struct accessor_class_hash classes[] =
     {"check_internal_version", &grib_accessor_check_internal_version},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""},
-#line 164 "accessor_class_list.gperf"
+#line 165 "accessor_class_list.gperf"
     {"reference_value_error", &grib_accessor_reference_value_error},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -646,20 +649,19 @@ static const struct accessor_class_hash classes[] =
     {"g1forecastmonth", &grib_accessor_g1forecastmonth}
   };
 
-const struct accessor_class_hash *
-grib_accessor_hash (const char *str, size_t len)
+static const struct accessor_class_hash* grib_accessor_hash (const char *str, size_t len)
 {
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    unsigned int key = grib_accessor_classes_get_id(str, len);
+
+#ifdef DEBUG
     {
-      unsigned int key = grib_accessor_classes_get_id (str, len);
-
-      if (key <= MAX_HASH_VALUE)
-        {
-          const char *s = classes[key].name;
-
-          if (*str == *s && !strcmp (str + 1, s + 1))
-            return &classes[key];
-        }
+        const char *s;
+        Assert( len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH );
+        Assert( key <= MAX_HASH_VALUE );
+        s = classes[key].name;
+        Assert( *str == *s && strcmp(str + 1, s + 1)==0 );
     }
-  return 0;
+#endif 
+
+    return &classes[key];
 }
diff --git a/src/grib_accessor_factory.h b/src/grib_accessor_factory.h
index a345e7391..dd98663e4 100644
--- a/src/grib_accessor_factory.h
+++ b/src/grib_accessor_factory.h
@@ -129,6 +129,7 @@
 { "md5", &grib_accessor_md5, },
 { "message", &grib_accessor_message, },
 { "message_copy", &grib_accessor_message_copy, },
+{ "message_is_valid", &grib_accessor_message_is_valid, },
 { "multdouble", &grib_accessor_multdouble, },
 { "nearest", &grib_accessor_nearest, },
 { "non_alpha", &grib_accessor_non_alpha, },
diff --git a/src/grib_accessor_factory_hash_list b/src/grib_accessor_factory_hash_list
index 3a64fd150..b7ca2ca80 100644
--- a/src/grib_accessor_factory_hash_list
+++ b/src/grib_accessor_factory_hash_list
@@ -130,6 +130,7 @@ mars_step, &grib_accessor_mars_step
 md5, &grib_accessor_md5
 message, &grib_accessor_message
 message_copy, &grib_accessor_message_copy
+message_is_valid, &grib_accessor_message_is_valid
 multdouble, &grib_accessor_multdouble
 nearest, &grib_accessor_nearest
 non_alpha, &grib_accessor_non_alpha
diff --git a/src/grib_api.h b/src/grib_api.h
index 4c633043f..7af58113b 100644
--- a/src/grib_api.h
+++ b/src/grib_api.h
@@ -1174,38 +1174,6 @@ void grib_context_set_samples_path(grib_context* c, const char* path);
 void grib_context_set_debug(grib_context* c, int mode);
 void grib_context_set_data_quality_checks(grib_context* c, int val);
 
-/**
- *  Sets memory procedures of the context
- *
- * @param c           : the context to be modified
- * @param griballoc   : the memory allocation procedure to be set @see grib_malloc_proc
- * @param gribfree    : the memory freeing procedure to be set @see grib_free_proc
- */
-void grib_context_set_memory_proc(grib_context* c, grib_malloc_proc griballoc,
-                                  grib_free_proc gribfree,
-                                  grib_realloc_proc gribrealloc);
-
-/**
- *  Sets memory procedures of the context for persistent data
- *
- * @param c           : the context to be modified
- * @param griballoc   : the memory allocation procedure to be set @see grib_malloc_proc
- * @param gribfree    : the memory freeing procedure to be set @see grib_free_proc
- */
-void grib_context_set_persistent_memory_proc(grib_context* c, grib_malloc_proc griballoc,
-                                             grib_free_proc gribfree);
-
-/**
- *  Sets memory procedures of the context for large buffers
- *
- * @param c           : the context to be modified
- * @param griballoc   : the memory allocation procedure to be set @see grib_malloc_proc
- * @param gribfree    : the memory freeing procedure to be set @see grib_free_proc
- */
-void grib_context_set_buffer_memory_proc(grib_context* c, grib_malloc_proc griballoc,
-                                         grib_free_proc gribfree,
-                                         grib_realloc_proc gribrealloc);
-
 /**
  *  Sets the context printing procedure used for user interaction
  *
diff --git a/src/grib_api_internal.h b/src/grib_api_internal.h
index 5a1f05f03..29aee16d8 100644
--- a/src/grib_api_internal.h
+++ b/src/grib_api_internal.h
@@ -22,41 +22,41 @@ extern "C" {
 
 /* cmake config header */
 #ifdef HAVE_ECCODES_CONFIG_H
- #include "eccodes_config.h"
+    #include "eccodes_config.h"
 #endif
 
 /* autoconf config header */
 #ifdef HAVE_CONFIG_H
- #include "config.h"
- #ifdef _LARGE_FILES
-  #undef _LARGE_FILE_API
- #endif
+    #include "config.h"
+    #ifdef _LARGE_FILES
+        #undef _LARGE_FILE_API
+    #endif
 #endif
 
 #ifndef GRIB_INLINE
- #define GRIB_INLINE
+    #define GRIB_INLINE
 #endif
 
 /* See ECC-670 */
 #if IS_BIG_ENDIAN
- #if GRIB_MEM_ALIGN
-  #define FAST_BIG_ENDIAN 1
- #else
-  #define FAST_BIG_ENDIAN 0
- #endif
+    #if GRIB_MEM_ALIGN
+        #define FAST_BIG_ENDIAN 1
+    #else
+        #define FAST_BIG_ENDIAN 0
+    #endif
 #endif
 
 #if IEEE_BE
- #define IEEE
+    #define IEEE
 #else
- #if IEEE_LE
-  #define IEEE
- #endif
+    #if IEEE_LE
+        #define IEEE
+    #endif
 #endif
 
 #if defined(_WIN32) && defined(_MSC_VER)
-  #define _CRT_SECURE_NO_WARNINGS
-  #define _CRT_NONSTDC_NO_DEPRECATE
+    #define _CRT_SECURE_NO_WARNINGS
+    #define _CRT_NONSTDC_NO_DEPRECATE
 #endif
 
 #include <stdio.h>
@@ -66,44 +66,44 @@ extern "C" {
 #include "eccodes_windef.h"
 
 #ifndef ECCODES_ON_WINDOWS
- #include <dirent.h>
- #include <unistd.h>
- #include <inttypes.h>
+    #include <dirent.h>
+    #include <unistd.h>
+    #include <inttypes.h>
 #else
- #define strtok_r strtok_s
- #include <direct.h>
- #include <io.h>
+    #define strtok_r strtok_s
+    #include <direct.h>
+    #include <io.h>
 
- /* Replace C99/Unix rint() for Windows Visual C++ (only before VC++ 2013 versions) */
- #if defined _MSC_VER && _MSC_VER < 1800
-  double rint(double x);
- #endif
+    /* Replace C99/Unix rint() for Windows Visual C++ (only before VC++ 2013 versions) */
+    #if defined _MSC_VER && _MSC_VER < 1800
+double rint(double x);
+    #endif
 
- #ifndef S_ISREG
-  #define S_ISREG(mode) (mode & S_IFREG)
- #endif
+    #ifndef S_ISREG
+        #define S_ISREG(mode) (mode & S_IFREG)
+    #endif
 
- #ifndef S_ISDIR
-  #define S_ISDIR(mode) (mode & S_IFDIR)
- #endif
+    #ifndef S_ISDIR
+        #define S_ISDIR(mode) (mode & S_IFDIR)
+    #endif
 
- #ifndef M_PI
-  #define M_PI 3.14159265358979323846
- #endif
+    #ifndef M_PI
+        #define M_PI 3.14159265358979323846
+    #endif
 
- #define R_OK 04 /* Needed for Windows */
+    #define R_OK 04 /* Needed for Windows */
 
- #ifndef F_OK
-  #define F_OK 0
- #endif
+    #ifndef F_OK
+        #define F_OK 0
+    #endif
 
- #define mkdir(dirname, mode) _mkdir(dirname)
+    #define mkdir(dirname, mode) _mkdir(dirname)
 
- #ifdef _MSC_VER
-  #define access(path, mode) _access(path, mode)
-  #define chmod(path, mode) _chmod(path, mode)
-  #define strdup(str) _strdup(str)
- #endif
+    #ifdef _MSC_VER
+        #define access(path, mode) _access(path, mode)
+        #define chmod(path, mode)  _chmod(path, mode)
+        #define strdup(str)        _strdup(str)
+    #endif
 
 #endif /* ifndef ECCODES_ON_WINDOWS */
 
@@ -115,9 +115,9 @@ extern "C" {
 
 
 #ifdef HAVE_STRING_H
- #include <string.h>
+    #include <string.h>
 #else
- #include <strings.h>
+    #include <strings.h>
 #endif
 
 /*
@@ -127,43 +127,43 @@ extern int pthread_mutexattr_settype(pthread_mutexattr_t* attr, int type);
 */
 
 #if GRIB_PTHREADS
-#include <pthread.h>
-#define GRIB_MUTEX_INIT_ONCE(a, b) pthread_once(a, b);
-#define GRIB_MUTEX_LOCK(a) pthread_mutex_lock(a);
-#define GRIB_MUTEX_UNLOCK(a) pthread_mutex_unlock(a);
+    #include <pthread.h>
+    #define GRIB_MUTEX_INIT_ONCE(a, b) pthread_once(a, b);
+    #define GRIB_MUTEX_LOCK(a)         pthread_mutex_lock(a);
+    #define GRIB_MUTEX_UNLOCK(a)       pthread_mutex_unlock(a);
 /*
  #define GRIB_MUTEX_LOCK(a) {pthread_mutex_lock(a); printf("MUTEX LOCK %p %s line %d\n",(void*)a,__FILE__,__LINE__);}
  #define GRIB_MUTEX_UNLOCK(a) {pthread_mutex_unlock(a);printf("MUTEX UNLOCK %p %s line %d\n",(void*)a,__FILE__,__LINE__);}
  */
 #elif GRIB_OMP_THREADS
-#include <omp.h>
-#ifdef _MSC_VER
-#define GRIB_OMP_CRITICAL(a) __pragma(omp critical(a))
+    #include <omp.h>
+    #ifdef _MSC_VER
+        #define GRIB_OMP_CRITICAL(a) __pragma(omp critical(a))
+    #else
+        #define GRIB_OMP_STR(a)      #a
+        #define GRIB_OMP_XSTR(a)     GRIB_OMP_STR(a)
+        #define GRIB_OMP_CRITICAL(a) _Pragma(GRIB_OMP_XSTR(omp critical(a)))
+    #endif
+    #define GRIB_MUTEX_INIT_ONCE(a, b) (*(b))();
+    #define GRIB_MUTEX_LOCK(a)         omp_set_nest_lock(a);
+    #define GRIB_MUTEX_UNLOCK(a)       omp_unset_nest_lock(a);
 #else
-#define GRIB_OMP_STR(a) #a
-#define GRIB_OMP_XSTR(a) GRIB_OMP_STR(a)
-#define GRIB_OMP_CRITICAL(a) _Pragma(GRIB_OMP_XSTR(omp critical(a)))
-#endif
-#define GRIB_MUTEX_INIT_ONCE(a, b) (*(b))();
-#define GRIB_MUTEX_LOCK(a) omp_set_nest_lock(a);
-#define GRIB_MUTEX_UNLOCK(a) omp_unset_nest_lock(a);
-#else
-#define GRIB_MUTEX_INIT_ONCE(a, b)
-#define GRIB_MUTEX_LOCK(a)
-#define GRIB_MUTEX_UNLOCK(a)
+    #define GRIB_MUTEX_INIT_ONCE(a, b)
+    #define GRIB_MUTEX_LOCK(a)
+    #define GRIB_MUTEX_UNLOCK(a)
 #endif
 
 #if GRIB_LINUX_PTHREADS
-/* Note: in newer pthreads PTHREAD_MUTEX_RECURSIVE and PTHREAD_MUTEX_RECURSIVE_NP are enums */
-#if !defined(PTHREAD_MUTEX_RECURSIVE)
-#define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
-#endif
+    /* Note: in newer pthreads PTHREAD_MUTEX_RECURSIVE and PTHREAD_MUTEX_RECURSIVE_NP are enums */
+    #if !defined(PTHREAD_MUTEX_RECURSIVE)
+        #define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
+    #endif
 #endif
 
 
 #ifndef HAVE_FSEEKO
-#define fseeko fseek
-#define ftello ftell
+    #define fseeko fseek
+    #define ftello ftell
 #endif
 
 #define Assert(a)                                                 \
@@ -172,17 +172,17 @@ extern int pthread_mutexattr_settype(pthread_mutexattr_t* attr, int type);
     } while (0)
 
 #ifdef DEBUG
-#define DEBUG_ASSERT(a) Assert(a)
-#define DEBUG_ASSERT_ACCESS(array, index, size)                                                                             \
-    do {                                                                                                                  \
-        if (!((index) >= 0 && (index) < (size))) {                                                                        \
-            printf("ARRAY ACCESS ERROR: array=%s idx=%ld size=%ld @ %s +%d \n", #array, index, size, __FILE__, __LINE__); \
-            abort();                                                                                                      \
-        }                                                                                                                 \
-    } while (0)
+    #define DEBUG_ASSERT(a) Assert(a)
+    #define DEBUG_ASSERT_ACCESS(array, index, size)                                                                           \
+        do {                                                                                                                  \
+            if (!((index) >= 0 && (index) < (size))) {                                                                        \
+                printf("ARRAY ACCESS ERROR: array=%s idx=%ld size=%ld @ %s +%d \n", #array, index, size, __FILE__, __LINE__); \
+                abort();                                                                                                      \
+            }                                                                                                                 \
+        } while (0)
 #else
-#define DEBUG_ASSERT(a)
-#define DEBUG_ASSERT_ACCESS(array, index, size)
+    #define DEBUG_ASSERT(a)
+    #define DEBUG_ASSERT_ACCESS(array, index, size)
 #endif
 
 /* Return true if two strings are equal */
@@ -192,11 +192,11 @@ extern int pthread_mutexattr_settype(pthread_mutexattr_t* attr, int type);
 
 #include "grib_api.h"
 
-#define MAX_ACCESSOR_ATTRIBUTES 20
+#define MAX_ACCESSOR_ATTRIBUTES     20
 #define MAX_FILE_HANDLES_WITH_MULTI 10
-#define ACCESSORS_ARRAY_SIZE 5000
-#define MAX_NUM_CONCEPTS 2000
-#define MAX_NUM_HASH_ARRAY 2000
+#define ACCESSORS_ARRAY_SIZE        5000
+#define MAX_NUM_CONCEPTS            2000
+#define MAX_NUM_HASH_ARRAY          2000
 
 #define CODES_NAMESPACE   10
 #define MAX_NAMESPACE_LEN 64
@@ -212,8 +212,8 @@ extern int pthread_mutexattr_settype(pthread_mutexattr_t* attr, int type);
 
 #define GRIB_HASH_ARRAY_TYPE_UNKNOWN 0
 #define GRIB_HASH_ARRAY_TYPE_INTEGER 1
-#define GRIB_HASH_ARRAY_TYPE_DOUBLE 2
-#define GRIB_HASH_ARRAY_TYPE_STRING 3
+#define GRIB_HASH_ARRAY_TYPE_DOUBLE  2
+#define GRIB_HASH_ARRAY_TYPE_STRING  3
 
 #define CODES_GRIB  1
 #define CODES_BUFR  2
@@ -233,8 +233,14 @@ extern int pthread_mutexattr_settype(pthread_mutexattr_t* attr, int type);
 
 extern const int max_nbits;
 
-typedef struct grib_expression grib_expression;
-typedef struct grib_arguments grib_arguments;
+// typedef struct grib_expression grib_expression;
+//
+namespace eccodes {
+class Expression;
+class Arguments;
+}  // namespace eccodes
+using grib_expression = eccodes::Expression;
+using grib_arguments  = eccodes::Arguments;
 
 typedef struct grib_action_file grib_action_file;
 typedef struct grib_action_file_list grib_action_file_list;
@@ -252,8 +258,9 @@ namespace eccodes::geo_iterator {
 class Iterator;
 }
 
-typedef struct grib_iterator {
-  eccodes::geo_iterator::Iterator* iterator;
+typedef struct grib_iterator
+{
+    eccodes::geo_iterator::Iterator* iterator;
 } grib_iterator;
 
 typedef struct grib_dumper grib_dumper;
@@ -316,11 +323,11 @@ struct grib_loader
 };
 
 /**
-*  An action
-*  Structure supporting the creation of accessor, resulting of a statement during a definition file parsing
-*
-*  @see  grib_action_class
-*/
+ *  An action
+ *  Structure supporting the creation of accessor, resulting of a statement during a definition file parsing
+ *
+ *  @see  grib_action_class
+ */
 struct grib_action
 {
     char* name;                /**  name of the definition statement */
@@ -350,11 +357,11 @@ typedef grib_action* (*action_reparse_proc)(grib_action* a, grib_accessor*, int*
 typedef int (*action_execute_proc)(grib_action* a, grib_handle*);
 
 /**
-*  An action_class
-*  Structure supporting the specific behaviour of an action
-*
-*  @see  grib_action
-*/
+ *  An action_class
+ *  Structure supporting the specific behaviour of an action
+ *
+ *  @see  grib_action
+ */
 struct grib_action_class
 {
     grib_action_class** super; /** < link to a more general behaviour */
@@ -377,9 +384,9 @@ struct grib_action_class
 };
 
 /**
-*  A buffer
-*  Structure containing the data of a message
-*/
+ *  A buffer
+ *  Structure containing the data of a message
+ */
 struct grib_buffer
 {
     int property;        /** < property parameter of buffer */
@@ -392,10 +399,10 @@ struct grib_buffer
 };
 
 /**
-*  An accessor
-*  Structure supporting each single data unit and allowing its access
-*  @see  grib_accessor_class
-*/
+ *  An accessor
+ *  Structure supporting each single data unit and allowing its access
+ *  @see  grib_accessor_class
+ */
 
 #define MAX_ACCESSOR_NAMES 20
 
@@ -411,31 +418,31 @@ struct grib_virtual_value
     int type;
 };
 
-#define GRIB_ACCESSOR_FLAG_READ_ONLY        (1 << 1)
-#define GRIB_ACCESSOR_FLAG_DUMP             (1 << 2)
-#define GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC (1 << 3)
-#define GRIB_ACCESSOR_FLAG_CAN_BE_MISSING   (1 << 4)
-#define GRIB_ACCESSOR_FLAG_HIDDEN           (1 << 5)
-#define GRIB_ACCESSOR_FLAG_CONSTRAINT       (1 << 6)
-#define GRIB_ACCESSOR_FLAG_BUFR_DATA        (1 << 7)
-#define GRIB_ACCESSOR_FLAG_NO_COPY          (1 << 8)
-#define GRIB_ACCESSOR_FLAG_COPY_OK          (1 << 9)
-#define GRIB_ACCESSOR_FLAG_FUNCTION         (1 << 10)
-#define GRIB_ACCESSOR_FLAG_DATA             (1 << 11)
-#define GRIB_ACCESSOR_FLAG_NO_FAIL          (1 << 12)
-#define GRIB_ACCESSOR_FLAG_TRANSIENT        (1 << 13)
-#define GRIB_ACCESSOR_FLAG_STRING_TYPE      (1 << 14)
-#define GRIB_ACCESSOR_FLAG_LONG_TYPE        (1 << 15)
-#define GRIB_ACCESSOR_FLAG_DOUBLE_TYPE      (1 << 16)
-#define GRIB_ACCESSOR_FLAG_LOWERCASE        (1 << 17)
-#define GRIB_ACCESSOR_FLAG_BUFR_COORD       (1 << 18)
+#define GRIB_ACCESSOR_FLAG_READ_ONLY                (1 << 1)
+#define GRIB_ACCESSOR_FLAG_DUMP                     (1 << 2)
+#define GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC         (1 << 3)
+#define GRIB_ACCESSOR_FLAG_CAN_BE_MISSING           (1 << 4)
+#define GRIB_ACCESSOR_FLAG_HIDDEN                   (1 << 5)
+#define GRIB_ACCESSOR_FLAG_CONSTRAINT               (1 << 6)
+#define GRIB_ACCESSOR_FLAG_BUFR_DATA                (1 << 7)
+#define GRIB_ACCESSOR_FLAG_NO_COPY                  (1 << 8)
+#define GRIB_ACCESSOR_FLAG_COPY_OK                  (1 << 9)
+#define GRIB_ACCESSOR_FLAG_FUNCTION                 (1 << 10)
+#define GRIB_ACCESSOR_FLAG_DATA                     (1 << 11)
+#define GRIB_ACCESSOR_FLAG_NO_FAIL                  (1 << 12)
+#define GRIB_ACCESSOR_FLAG_TRANSIENT                (1 << 13)
+#define GRIB_ACCESSOR_FLAG_STRING_TYPE              (1 << 14)
+#define GRIB_ACCESSOR_FLAG_LONG_TYPE                (1 << 15)
+#define GRIB_ACCESSOR_FLAG_DOUBLE_TYPE              (1 << 16)
+#define GRIB_ACCESSOR_FLAG_LOWERCASE                (1 << 17)
+#define GRIB_ACCESSOR_FLAG_BUFR_COORD               (1 << 18)
 #define GRIB_ACCESSOR_FLAG_COPY_IF_CHANGING_EDITION (1 << 19)
 
 /**
-*  A section accessor
-*  Structure supporting hierarchical naming of the accessors
-*  @see  grib_accessor
-*/
+ *  A section accessor
+ *  Structure supporting hierarchical naming of the accessors
+ *  @see  grib_accessor
+ */
 struct grib_section
 {
     grib_accessor* owner;
@@ -451,8 +458,9 @@ namespace eccodes::geo_nearest {
 class Nearest;
 }
 
-typedef struct grib_nearest {
-  eccodes::geo_nearest::Nearest* nearest;
+typedef struct grib_nearest
+{
+    eccodes::geo_nearest::Nearest* nearest;
 } grib_nearest;
 
 /* --------------- */
@@ -583,15 +591,15 @@ struct grib_viarray
 };
 
 /* types of BUFR descriptors used in bufr_descriptor->type*/
-#define BUFR_DESCRIPTOR_TYPE_UNKNOWN 0
-#define BUFR_DESCRIPTOR_TYPE_STRING 1
-#define BUFR_DESCRIPTOR_TYPE_DOUBLE 2
-#define BUFR_DESCRIPTOR_TYPE_LONG 3
-#define BUFR_DESCRIPTOR_TYPE_TABLE 4
-#define BUFR_DESCRIPTOR_TYPE_FLAG 5
+#define BUFR_DESCRIPTOR_TYPE_UNKNOWN     0
+#define BUFR_DESCRIPTOR_TYPE_STRING      1
+#define BUFR_DESCRIPTOR_TYPE_DOUBLE      2
+#define BUFR_DESCRIPTOR_TYPE_LONG        3
+#define BUFR_DESCRIPTOR_TYPE_TABLE       4
+#define BUFR_DESCRIPTOR_TYPE_FLAG        5
 #define BUFR_DESCRIPTOR_TYPE_REPLICATION 6
-#define BUFR_DESCRIPTOR_TYPE_OPERATOR 7
-#define BUFR_DESCRIPTOR_TYPE_SEQUENCE 8
+#define BUFR_DESCRIPTOR_TYPE_OPERATOR    7
+#define BUFR_DESCRIPTOR_TYPE_SEQUENCE    8
 
 struct bufr_descriptor
 {
@@ -603,7 +611,7 @@ struct bufr_descriptor
     int type;
     /*char* name;   Not needed: All usage commented out. See ECC-489 */
     char shortName[128];
-    char units[128];
+    char units[64];
     long scale;
     double factor;
     long reference;
@@ -649,7 +657,7 @@ struct codes_condition
 
 void codes_assertion_failed(const char* message, const char* file, int line);
 
-#define MAX_SET_VALUES 10
+#define MAX_SET_VALUES     10
 #define MAX_ACCESSOR_CACHE 100
 
 struct grib_handle
@@ -826,53 +834,54 @@ struct grib_context
 
 /* expression*/
 
-typedef int (*expression_evaluate_long_proc)(grib_expression*, grib_handle*, long*);
-typedef int (*expression_evaluate_double_proc)(grib_expression*, grib_handle*, double*);
-typedef const char* (*expression_evaluate_string_proc)(grib_expression*, grib_handle*, char*, size_t*, int*);
-typedef const char* (*expression_get_name_proc)(grib_expression*);
+// typedef int (*expression_evaluate_long_proc)(grib_expression*, grib_handle*, long*);
+// typedef int (*expression_evaluate_double_proc)(grib_expression*, grib_handle*, double*);
+// typedef const char* (*expression_evaluate_string_proc)(grib_expression*, grib_handle*, char*, size_t*, int*);
+// typedef const char* (*expression_get_name_proc)(grib_expression*);
 
-typedef void (*expression_print_proc)(grib_context*, grib_expression*, grib_handle*, FILE*);
-typedef void (*expression_add_dependency_proc)(grib_expression* e, grib_accessor* observer);
+// typedef void (*expression_print_proc)(grib_context*, grib_expression*, grib_handle*, FILE*);
+// typedef void (*expression_add_dependency_proc)(grib_expression* e, grib_accessor* observer);
 
-typedef struct grib_expression_class grib_expression_class;
+// typedef struct grib_expression_class grib_expression_class;
 
-typedef void (*expression_class_init_proc)(grib_expression_class* e);
-typedef void (*expression_init_proc)(grib_expression* e);
-typedef void (*expression_destroy_proc)(grib_context*, grib_expression* e);
+// typedef void (*expression_class_init_proc)(grib_expression_class* e);
+// typedef void (*expression_init_proc)(grib_expression* e);
+// typedef void (*expression_destroy_proc)(grib_context*, grib_expression* e);
 
-typedef int (*expression_native_type_proc)(grib_expression*, grib_handle*);
-
-struct grib_expression
-{
-    grib_expression_class* cclass;
-};
-
-struct grib_expression_class
-{
-    grib_expression_class** super;
-    const char* name;
-    size_t size;
-    int inited;
-    expression_init_proc            init;
-    expression_destroy_proc         destroy;
-    expression_print_proc           print;
-    expression_add_dependency_proc  add_dependency;
-    expression_native_type_proc     native_type;
-    expression_get_name_proc        get_name;
-    expression_evaluate_long_proc   evaluate_long;
-    expression_evaluate_double_proc evaluate_double;
-    expression_evaluate_string_proc evaluate_string;
-};
-
-struct grib_arguments
-{
-    struct grib_arguments* next;
-    grib_expression* expression;
-};
+// typedef int (*expression_native_type_proc)(grib_expression*, grib_handle*);
 
 
-long grib_expression_evaluate(grib_handle*, grib_expression*);
-void grib_expression_free(grib_context*, grib_expression*);
+// struct grib_expression
+//{
+//     grib_expression_class* cclass;
+// };
+
+// struct grib_expression_class
+//{
+//     grib_expression_class** super;
+//     const char* name;
+//     size_t size;
+//     int inited;
+//     expression_init_proc            init;
+//     expression_destroy_proc         destroy;
+//     expression_print_proc           print;
+//     expression_add_dependency_proc  add_dependency;
+//     expression_native_type_proc     native_type;
+//     expression_get_name_proc        get_name;
+//     expression_evaluate_long_proc   evaluate_long;
+//     expression_evaluate_double_proc evaluate_double;
+//     expression_evaluate_string_proc evaluate_string;
+// };
+
+// struct grib_arguments
+//{
+//     struct grib_arguments* next;
+//     grib_expression* expression;
+// };
+
+
+// long grib_expression_evaluate(grib_handle*, grib_expression*);
+// void grib_expression_free(grib_context*, grib_expression*);
 
 grib_arguments* grib_arguments_new(grib_context*, grib_expression*, grib_arguments*);
 void grib_arguments_free(grib_context*, grib_arguments*);
@@ -1223,10 +1232,12 @@ typedef struct j2k_encode_helper
 #include "eccodes_prototypes.h"
 #ifdef __cplusplus
 }
-#include "accessor/grib_accessor.h"
-#include "accessor/grib_accessors_list.h"
-#include "geo_iterator/grib_iterator.h"
-#include "geo_nearest/grib_nearest.h"
+    #include "accessor/grib_accessor.h"
+    #include "accessor/grib_accessors_list.h"
+    #include "geo/iterator/grib_iterator.h"
+    #include "geo/nearest/grib_nearest.h"
+    #include "expression/grib_expression.h"
+    #include "expression/grib_arguments.h"
 #endif
 
 #endif
diff --git a/src/grib_bits_any_endian.cc b/src/grib_bits_any_endian.cc
index 50a7cd9af..3b7327c28 100644
--- a/src/grib_bits_any_endian.cc
+++ b/src/grib_bits_any_endian.cc
@@ -385,23 +385,19 @@ size_t grib_decode_size_t(const unsigned char* p, long* bitp, long nbits)
 
 int grib_encode_unsigned_longb(unsigned char* p, unsigned long val, long* bitp, long nb)
 {
-    long i = 0;
-
     if (nb > max_nbits) {
         fprintf(stderr, "Number of bits (%ld) exceeds maximum number of bits (%d)\n", nb, max_nbits);
         Assert(0);
         return GRIB_INTERNAL_ERROR;
     }
-#ifdef DEBUG
-    {
-        unsigned long maxV = codes_power<double>(nb, 2);
-        if (val > maxV) {
-            fprintf(stderr, "grib_encode_unsigned_longb: Value=%lu, but number of bits=%ld!\n", val, nb);
-            Assert(0);
-        }
+
+    const unsigned long maxV = codes_power<double>(nb, 2) - 1;
+    if (val > maxV) {
+        fprintf(stderr, "ECCODES WARNING :  %s: Trying to encode value of %lu but the maximum allowable value is %lu (number of bits=%ld)\n",
+                __func__, val, maxV, nb);
     }
-#endif
-    for (i = nb - 1; i >= 0; i--) {
+
+    for (long i = nb - 1; i >= 0; i--) {
         if (test(val, i))
             grib_set_bit_on(p, bitp);
         else
@@ -415,22 +411,18 @@ int grib_encode_unsigned_longb(unsigned char* p, unsigned long val, long* bitp,
  */
 int grib_encode_size_tb(unsigned char* p, size_t val, long* bitp, long nb)
 {
-    long i = 0;
-
     if (nb > max_nbits_size_t) {
         fprintf(stderr, "Number of bits (%ld) exceeds maximum number of bits (%d)\n", nb, max_nbits_size_t);
         Assert(0);
     }
-#ifdef DEBUG
-    {
-        size_t maxV = codes_power<double>(nb, 2);
-        if (val > maxV) {
-            fprintf(stderr, "grib_encode_size_tb: Value=%lu, but number of bits=%ld!\n", val, nb);
-            Assert(0);
-        }
+
+    const size_t maxV = codes_power<double>(nb, 2) - 1;
+    if (val > maxV) {
+        fprintf(stderr, "ECCODES WARNING :  %s: Trying to encode value of %zu but the maximum allowable value is %zu (number of bits=%ld)\n",
+                __func__, val, maxV, nb);
     }
-#endif
-    for (i = nb - 1; i >= 0; i--) {
+
+    for (long i = nb - 1; i >= 0; i--) {
         if (test(val, i))
             grib_set_bit_on(p, bitp);
         else
diff --git a/src/grib_concept.cc b/src/grib_concept.cc
index bcadeb1b5..424a043e4 100644
--- a/src/grib_concept.cc
+++ b/src/grib_concept.cc
@@ -41,7 +41,7 @@ grib_concept_condition* grib_concept_condition_new(grib_context* c, const char*
 
 void grib_concept_condition_delete(grib_context* c, grib_concept_condition* v)
 {
-    grib_expression_free(c, v->expression);
+    v->expression->destroy(c);
     grib_context_free_persistent(c, v->name);
     grib_context_free_persistent(c, v);
 }
diff --git a/src/grib_context.cc b/src/grib_context.cc
index 17adcc312..1b9a98d11 100644
--- a/src/grib_context.cc
+++ b/src/grib_context.cc
@@ -547,6 +547,7 @@ grib_context* grib_context_get_default()
 #endif
 
         if (default_grib_context.debug) {
+            fprintf(stderr, "ECCODES DEBUG ecCodes Version:  %s\n", ECCODES_VERSION_STR);
             fprintf(stderr, "ECCODES DEBUG Definitions path: %s\n", default_grib_context.grib_definition_files_path);
             fprintf(stderr, "ECCODES DEBUG Samples path:     %s\n", default_grib_context.grib_samples_path);
         }
@@ -1025,29 +1026,6 @@ void* grib_context_buffer_malloc_clear(const grib_context* c, size_t size)
     return p;
 }
 
-void grib_context_set_memory_proc(grib_context* c, grib_malloc_proc m, grib_free_proc f, grib_realloc_proc r)
-{
-    fprintf(stderr, "ECCODES WARNING :  The %s function is deprecated and will be removed in a future release.\n", __func__);
-    c->free_mem    = f;
-    c->alloc_mem   = m;
-    c->realloc_mem = r;
-}
-
-void grib_context_set_persistent_memory_proc(grib_context* c, grib_malloc_proc m, grib_free_proc f)
-{
-    fprintf(stderr, "ECCODES WARNING :  The %s function is deprecated and will be removed in a future release.\n", __func__);
-    c->free_persistent_mem  = f;
-    c->alloc_persistent_mem = m;
-}
-
-void grib_context_set_buffer_memory_proc(grib_context* c, grib_malloc_proc m, grib_free_proc f, grib_realloc_proc r)
-{
-    fprintf(stderr, "ECCODES WARNING :  The %s function is deprecated and will be removed in a future release.\n", __func__);
-    c->free_buffer_mem    = f;
-    c->alloc_buffer_mem   = m;
-    c->realloc_buffer_mem = r;
-}
-
 void grib_context_set_data_accessing_proc(grib_context* c, grib_data_read_proc read, grib_data_write_proc write, grib_data_tell_proc tell)
 {
     c->read  = read;
diff --git a/src/grib_dependency.cc b/src/grib_dependency.cc
index 268ffa315..309c7677b 100644
--- a/src/grib_dependency.cc
+++ b/src/grib_dependency.cc
@@ -178,13 +178,13 @@ void grib_dependency_remove_observer(grib_accessor* observer)
 
 void grib_dependency_observe_expression(grib_accessor* observer, grib_expression* e)
 {
-    grib_expression_add_dependency(e, observer);
+    e->add_dependency(observer);
 }
 
 void grib_dependency_observe_arguments(grib_accessor* observer, grib_arguments* a)
 {
     while (a) {
-        grib_dependency_observe_expression(observer, a->expression);
-        a = a->next;
+        grib_dependency_observe_expression(observer, a->expression_);
+        a = a->next_;
     }
 }
diff --git a/src/grib_dumper_class_debug.cc b/src/grib_dumper_class_debug.cc
index 3bfd48217..40574e4f2 100644
--- a/src/grib_dumper_class_debug.cc
+++ b/src/grib_dumper_class_debug.cc
@@ -109,14 +109,14 @@ static void default_long_value(grib_dumper* d, grib_accessor* a, long actualValu
         return;
 
     grib_handle* h = grib_handle_of_accessor(a);
-    grib_expression* expression = grib_arguments_get_expression(h, act->default_value, 0);
+    grib_expression* expression = act->default_value->get_expression(h, 0);
     if (!expression)
         return;
 
-    const int type = grib_expression_native_type(h, expression);
+    const int type = expression->native_type(h);
     if (type == GRIB_TYPE_LONG) {
         long defaultValue = 0;
-        if (grib_expression_evaluate_long(h, expression, &defaultValue) == GRIB_SUCCESS && defaultValue != actualValue) {
+        if (expression->evaluate_long(h, &defaultValue) == GRIB_SUCCESS && defaultValue != actualValue) {
             if (defaultValue == GRIB_MISSING_LONG)
                 fprintf(self->dumper.out, " (default=MISSING)");
             else
diff --git a/src/grib_expression.cc b/src/grib_expression.cc
deleted file mode 100644
index 314e5ad8d..000000000
--- a/src/grib_expression.cc
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-int grib_expression_native_type(grib_handle* h, grib_expression* g)
-{
-    grib_expression_class* c = g->cclass;
-    while (c) {
-        if (c->native_type)
-            return c->native_type(g, h);
-        c = c->super ? *(c->super) : NULL;
-    }
-    if (g->cclass)
-        grib_context_log(h->context, GRIB_LOG_FATAL, "%s: No native_type() in %s", __func__, g->cclass->name);
-    return 0;
-}
-
-int grib_expression_evaluate_long(grib_handle* h, grib_expression* g, long* result)
-{
-    grib_expression_class* c = g->cclass;
-    while (c) {
-        if (c->evaluate_long)
-            return c->evaluate_long(g, h, result);
-        c = c->super ? *(c->super) : NULL;
-    }
-    return GRIB_INVALID_TYPE;
-}
-
-int grib_expression_evaluate_double(grib_handle* h, grib_expression* g, double* result)
-{
-    grib_expression_class* c = g->cclass;
-    while (c) {
-        if (c->evaluate_double)
-            return c->evaluate_double(g, h, result);
-        c = c->super ? *(c->super) : NULL;
-    }
-    return GRIB_INVALID_TYPE;
-}
-
-const char* grib_expression_evaluate_string(grib_handle* h, grib_expression* g, char* buf, size_t* size, int* err)
-{
-    grib_expression_class* c = g->cclass;
-    while (c) {
-        if (c->evaluate_string)
-            return c->evaluate_string(g, h, buf, size, err);
-        c = c->super ? *(c->super) : NULL;
-    }
-    if (g->cclass)
-        grib_context_log(h->context, GRIB_LOG_ERROR, "%s: No evaluate_string() in %s", __func__, g->cclass->name);
-    *err = GRIB_INVALID_TYPE;
-
-    return 0;
-}
-
-const char* grib_expression_get_name(grib_expression* g)
-{
-    grib_expression_class* c = g->cclass;
-    while (c) {
-        if (c->get_name)
-            return c->get_name(g);
-        c = c->super ? *(c->super) : NULL;
-    }
-    if (g->cclass) {
-        grib_context_log(grib_context_get_default(), GRIB_LOG_FATAL, "%s: No get_name() in %s", __func__, g->cclass->name);
-    }
-    return 0;
-}
-
-void grib_expression_print(grib_context* ctx, grib_expression* g, grib_handle* f, FILE* out)
-{
-    grib_expression_class* c = g->cclass;
-    while (c) {
-        if (c->print) {
-            c->print(ctx, g, f, out);
-            return;
-        }
-        c = c->super ? *(c->super) : NULL;
-    }
-}
-
-void grib_expression_free(grib_context* ctx, grib_expression* g)
-{
-    if (g) {
-        grib_expression_class* c = g->cclass;
-        while (c) {
-            if (c->destroy)
-                c->destroy(ctx, g);
-            c = c->super ? *(c->super) : NULL;
-        }
-        grib_context_free_persistent(ctx, g);
-    }
-}
-
-void grib_expression_add_dependency(grib_expression* e, grib_accessor* observer)
-{
-    grib_expression_class* c = e->cclass;
-    while (c) {
-        if (c->add_dependency) {
-            c->add_dependency(e, observer);
-            return;
-        }
-        c = c->super ? *(c->super) : NULL;
-    }
-}
-
-// int grib_expression_set_value(grib_handle* h, grib_expression* g, grib_values* v)
-// {
-//     char buffer[1024];
-//     int ret     = 0;
-//     size_t size = sizeof(buffer);
-//     switch (v->type = grib_expression_native_type(h, g)) {
-//         case GRIB_TYPE_LONG:
-//             return grib_expression_evaluate_long(h, g, &v->long_value);
-//             break;
-//         case GRIB_TYPE_DOUBLE:
-//             return grib_expression_evaluate_double(h, g, &v->double_value);
-//             break;
-//         case GRIB_TYPE_STRING:
-//             v->string_value = grib_expression_evaluate_string(h, g, buffer, &size, &ret);
-//             if (ret != GRIB_SUCCESS) {
-//                 grib_context_log(h->context, GRIB_LOG_ERROR,
-//                                  "grib_expression_set_value: unable to evaluate %s as string",
-//                                  grib_expression_get_name(g));
-//                 return ret;
-//             }
-//             Assert(v->string_value != buffer);
-//             Assert(v->string_value);
-//             break;
-//         default:
-//             Assert(!"grib_expression_set_value");
-//             break;
-//     }
-//     return 0;
-// }
-
-/*----------------------------------------*/
-grib_arguments* grib_arguments_new(grib_context* c, grib_expression* g, grib_arguments* n)
-{
-    grib_arguments* l = (grib_arguments*)grib_context_malloc_clear_persistent(c, sizeof(grib_arguments));
-    l->expression     = g;
-    l->next           = n;
-    return l;
-}
-
-void grib_arguments_free(grib_context* c, grib_arguments* g)
-{
-    if (g) {
-        grib_arguments_free(c, g->next);
-        grib_expression_free(c, g->expression);
-        grib_context_free_persistent(c, g);
-    }
-}
-
-void grib_arguments_print(grib_context* c, grib_arguments* g, grib_handle* f)
-{
-    if (g) {
-        if (g->expression)
-            grib_expression_print(c, g->expression, f, stdout);
-        if (g->next) {
-            printf(",");
-            grib_arguments_print(c, g->next, f);
-        }
-    }
-}
-
-const char* grib_arguments_get_name(grib_handle* h, grib_arguments* args, int n)
-{
-    grib_expression* e = NULL;
-    while (args && n-- > 0) {
-        args = args->next;
-    }
-
-    if (!args)
-        return NULL;
-
-    e = args->expression;
-    return e ? grib_expression_get_name(e) : NULL;
-}
-
-const char* grib_arguments_get_string(grib_handle* h, grib_arguments* args, int n)
-{
-    grib_expression* e = NULL;
-    int ret            = 0;
-    while (args && n-- > 0) {
-        args = args->next;
-    }
-
-    if (!args)
-        return NULL;
-
-    e = args->expression;
-    return grib_expression_evaluate_string(h, e, NULL, NULL, &ret);
-}
-
-long grib_arguments_get_long(grib_handle* h, grib_arguments* args, int n)
-{
-    int ret            = 0;
-    long lres          = 0;
-    grib_expression* e = NULL;
-    while (args && n-- > 0) {
-        args = args->next;
-    }
-
-    if (!args)
-        return 0;
-
-    e   = args->expression;
-    ret = grib_expression_evaluate_long(h, e, &lres);
-    (void)ret;
-    return lres;
-}
-
-double grib_arguments_get_double(grib_handle* h, grib_arguments* args, int n)
-{
-    int ret     = 0;
-    double dres = 0.0;
-
-    grib_expression* e = NULL;
-    while (args && n-- > 0) {
-        args = args->next;
-    }
-
-    if (!args)
-        return 0;
-
-    e   = args->expression;
-    ret = grib_expression_evaluate_double(h, e, &dres);
-    (void)ret;
-    return dres;
-}
-
-grib_expression* grib_arguments_get_expression(grib_handle* h, grib_arguments* args, int n)
-{
-    while (args && n-- > 0) {
-        args = args->next;
-    }
-
-    if (!args)
-        return 0;
-
-    return args->expression;
-}
-
-int grib_arguments_get_count(grib_arguments* args)
-{
-    int n = 0;
-    while (args) {
-        args = args->next;
-        n++;
-    }
-    return n;
-}
diff --git a/src/grib_expression_class.h b/src/grib_expression_class.h
deleted file mode 100644
index 8660a7864..000000000
--- a/src/grib_expression_class.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* This file is automatically generated by ./make_class.pl, do not edit */
-extern grib_expression_class* grib_expression_class_accessor;
-extern grib_expression_class* grib_expression_class_binop;
-extern grib_expression_class* grib_expression_class_double;
-extern grib_expression_class* grib_expression_class_functor;
-extern grib_expression_class* grib_expression_class_is_in_dict;
-extern grib_expression_class* grib_expression_class_is_in_list;
-extern grib_expression_class* grib_expression_class_is_integer;
-extern grib_expression_class* grib_expression_class_length;
-extern grib_expression_class* grib_expression_class_logical_and;
-extern grib_expression_class* grib_expression_class_logical_or;
-extern grib_expression_class* grib_expression_class_long;
-extern grib_expression_class* grib_expression_class_string;
-extern grib_expression_class* grib_expression_class_string_compare;
-extern grib_expression_class* grib_expression_class_sub_string;
-extern grib_expression_class* grib_expression_class_true;
-extern grib_expression_class* grib_expression_class_unop;
diff --git a/src/grib_expression_class_accessor.cc b/src/grib_expression_class_accessor.cc
deleted file mode 100644
index 71bc70526..000000000
--- a/src/grib_expression_class_accessor.cc
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = destroy
-   IMPLEMENTS = native_type
-   IMPLEMENTS = get_name
-   IMPLEMENTS = evaluate_long
-   IMPLEMENTS = evaluate_double
-   IMPLEMENTS = evaluate_string
-   IMPLEMENTS = print
-   IMPLEMENTS = add_dependency
-   MEMBERS    = char *name
-   MEMBERS    = long start
-   MEMBERS    = size_t length
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static string  get_name(grib_expression* e);
-static int     native_type(grib_expression*,grib_handle*);
-static int     evaluate_long(grib_expression*,grib_handle*,long*);
-static int     evaluate_double(grib_expression*,grib_handle*,double*);
-static string  evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
-
-typedef struct grib_expression_accessor{
-  grib_expression base;
-    /* Members defined in accessor */
-    char *name;
-    long start;
-    size_t length;
-} grib_expression_accessor;
-
-
-static grib_expression_class _grib_expression_class_accessor = {
-    0,                      /* super */
-    "accessor",                      /* name  */
-    sizeof(grib_expression_accessor),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    &get_name,
-    &evaluate_long,
-    &evaluate_double,
-    &evaluate_string,
-};
-
-grib_expression_class* grib_expression_class_accessor = &_grib_expression_class_accessor;
-
-/* END_CLASS_IMP */
-
-static const char* get_name(grib_expression* g)
-{
-    const grib_expression_accessor* e = (grib_expression_accessor*)g;
-    return e->name;
-}
-
-static int evaluate_long(grib_expression* g, grib_handle* h, long* result)
-{
-    const grib_expression_accessor* e = (grib_expression_accessor*)g;
-    return grib_get_long_internal(h, e->name, result);
-}
-
-static int evaluate_double(grib_expression* g, grib_handle* h, double* result)
-{
-    const grib_expression_accessor* e = (grib_expression_accessor*)g;
-    return grib_get_double_internal(h, e->name, result);
-}
-
-static string evaluate_string(grib_expression* g, grib_handle* h, char* buf, size_t* size, int* err)
-{
-    const grib_expression_accessor* e = (grib_expression_accessor*)g;
-    char mybuf[1024]            = {0,};
-    long start = e->start;
-    if (e->length > sizeof(mybuf)) {
-        *err = GRIB_INVALID_ARGUMENT;
-        return NULL;
-    }
-
-    Assert(buf);
-    if ((*err = grib_get_string_internal(h, e->name, mybuf, size)) != GRIB_SUCCESS)
-        return NULL;
-
-    if (e->start < 0)
-        start += *size;
-
-    if (e->length != 0) {
-        if (start >= 0)
-            memcpy(buf, mybuf + start, e->length);
-        buf[e->length] = 0;
-    }
-    else {
-        memcpy(buf, mybuf, *size);
-        if (*size == 1024)
-            *size = *size - 1; /* ECC-336 */
-        buf[*size] = 0;
-    }
-    return buf;
-}
-
-static void print(grib_context* c, grib_expression* g, grib_handle* hand, FILE* out)
-{
-    const grib_expression_accessor* e = (grib_expression_accessor*)g;
-    int err = 0;
-    fprintf(out, "access('%s", e->name);
-    if (hand) {
-        const int ntype = native_type(g, hand);
-        if (ntype == GRIB_TYPE_STRING) {
-            char buf[256] = {0,};
-            size_t len = sizeof(buf);
-            err = grib_get_string(hand, e->name, buf, &len);
-            if (!err) fprintf(out, "=%s", buf);
-        }
-        else if (ntype == GRIB_TYPE_LONG) {
-            long lVal = 0;
-            err = grib_get_long(hand, e->name, &lVal);
-            if (!err) fprintf(out, "=%ld", lVal);
-        }
-    }
-    fprintf(out, "')");
-}
-
-static void destroy(grib_context* c, grib_expression* g)
-{
-    grib_expression_accessor* e = (grib_expression_accessor*)g;
-    grib_context_free_persistent(c, e->name);
-}
-
-static void add_dependency(grib_expression* g, grib_accessor* observer)
-{
-    const grib_expression_accessor* e = (grib_expression_accessor*)g;
-    grib_accessor* observed = grib_find_accessor(grib_handle_of_accessor(observer), e->name);
-
-    if (!observed) {
-        /* grib_context_log(observer->context, GRIB_LOG_ERROR, */
-        /* "Error in accessor_add_dependency: cannot find [%s]", e->name); */
-        /* Assert(observed); */
-        return;
-    }
-
-    grib_dependency_add(observer, observed);
-}
-
-grib_expression* new_accessor_expression(grib_context* c, const char* name, long start, size_t length)
-{
-    grib_expression_accessor* e = (grib_expression_accessor*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_accessor));
-    e->base.cclass              = grib_expression_class_accessor;
-    e->name                     = grib_context_strdup_persistent(c, name);
-    e->start                    = start;
-    e->length                   = length;
-    return (grib_expression*)e;
-}
-
-static int native_type(grib_expression* g, grib_handle* h)
-{
-    grib_expression_accessor* e = (grib_expression_accessor*)g;
-    int type = 0;
-    int err;
-    if ((err = grib_get_native_type(h, e->name, &type)) != GRIB_SUCCESS) {
-        grib_context_log(h->context, GRIB_LOG_ERROR,
-                         "Error in evaluating the type of '%s': %s", e->name, grib_get_error_message(err));
-    }
-    return type;
-}
diff --git a/src/grib_expression_class_binop.cc b/src/grib_expression_class_binop.cc
deleted file mode 100644
index 60547ec2f..000000000
--- a/src/grib_expression_class_binop.cc
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = destroy
-   IMPLEMENTS = native_type
-   IMPLEMENTS = evaluate_long
-   IMPLEMENTS = evaluate_double
-   IMPLEMENTS = print
-   IMPLEMENTS = add_dependency
-   MEMBERS    = grib_expression *left
-   MEMBERS = grib_expression *right
-   MEMBERS = grib_binop_long_proc    long_func
-   MEMBERS = grib_binop_double_proc  double_func
-   MEMBERS = grib_binop_string_proc  string_func
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static int     native_type(grib_expression*,grib_handle*);
-static int     evaluate_long(grib_expression*,grib_handle*,long*);
-static int     evaluate_double(grib_expression*,grib_handle*,double*);
-
-typedef struct grib_expression_binop{
-  grib_expression base;
-    /* Members defined in binop */
-    grib_expression *left;
-    grib_expression *right;
-    grib_binop_long_proc    long_func;
-    grib_binop_double_proc  double_func;
-    grib_binop_string_proc  string_func;
-} grib_expression_binop;
-
-
-static grib_expression_class _grib_expression_class_binop = {
-    0,                      /* super */
-    "binop",                      /* name  */
-    sizeof(grib_expression_binop),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    0,
-    &evaluate_long,
-    &evaluate_double,
-    0,
-};
-
-grib_expression_class* grib_expression_class_binop = &_grib_expression_class_binop;
-
-/* END_CLASS_IMP */
-
-static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
-{
-    long v1 = 0;
-    long v2 = 0;
-    grib_expression_binop* e = (grib_expression_binop*)g;
-
-//     {
-//         int typeLeft, typeRight;
-//         const char* nameLeft;
-//         const char* nameRight;
-//         typeLeft = grib_expression_native_type(h, e->left);
-//         typeRight = grib_expression_native_type(h, e->right);
-//         nameLeft = grib_expression_get_name(e->left);
-//         nameRight= grib_expression_get_name(e->right);
-//         printf("eval_long nameLeft=%s (type=%d), nameRight=%s (type=%d)\n",nameLeft,typeLeft, nameRight,typeRight);
-//         grib_expression_print(h->context, g, h);
-//         printf("\n");
-//     }
-
-    int ret = grib_expression_evaluate_long(h, e->left, &v1);
-    if (ret != GRIB_SUCCESS)
-        return ret;
-
-    ret = grib_expression_evaluate_long(h, e->right, &v2);
-    if (ret != GRIB_SUCCESS)
-        return ret;
-
-    *lres = e->long_func(v1, v2);
-    return GRIB_SUCCESS;
-}
-
-static int evaluate_double(grib_expression* g, grib_handle* h, double* dres)
-{
-    double v1 = 0.0;
-    double v2 = 0.0;
-    grib_expression_binop* e = (grib_expression_binop*)g;
-
-//     {
-//         int typeLeft, typeRight;
-//         const char* nameLeft;
-//         const char* nameRight;
-//         typeLeft = grib_expression_native_type(h, e->left);
-//         typeRight = grib_expression_native_type(h, e->right);
-//         nameLeft = grib_expression_get_name(e->left);
-//         nameRight= grib_expression_get_name(e->right);
-//         printf("eval_dbl nameLeft=%s (type=%d), nameRight=%s (type=%d)\n",nameLeft,typeLeft, nameRight,typeRight);
-//         grib_expression_print(h->context, g, h);
-//         printf("\n");
-//     }
-
-    int ret = grib_expression_evaluate_double(h, e->left, &v1);
-    if (ret != GRIB_SUCCESS)
-        return ret;
-
-    ret = grib_expression_evaluate_double(h, e->right, &v2);
-    if (ret != GRIB_SUCCESS)
-        return ret;
-
-    *dres = e->double_func ? e->double_func(v1, v2) : e->long_func(v1, v2);
-
-    return GRIB_SUCCESS;
-}
-
-static void print(grib_context* c, grib_expression* g, grib_handle* f, FILE* out)
-{
-    grib_expression_binop* e = (grib_expression_binop*)g;
-
-    // Cover a subset of the most commonly used functions
-    // TODO(masn): Can be done in a much better way!
-    //             e.g., the yacc parser passing in the functions name
-    if (e->long_func && e->long_func == grib_op_eq) {
-        fprintf(out, "equals(");
-    } else if (e->long_func && e->long_func == grib_op_ne) {
-        fprintf(out, "not_equals(");
-    } else if (e->long_func && e->long_func == grib_op_lt) {
-        fprintf(out, "less_than(");
-    } else if (e->long_func && e->long_func == grib_op_gt) {
-        fprintf(out, "greater_than(");
-    } else {
-        fprintf(out, "binop(");
-    }
-    grib_expression_print(c, e->left, f, out);
-    fprintf(out, ",");
-    grib_expression_print(c, e->right, f, out);
-    fprintf(out, ")");
-}
-
-static void destroy(grib_context* c, grib_expression* g)
-{
-    grib_expression_binop* e = (grib_expression_binop*)g;
-    grib_expression_free(c, e->left);
-    grib_expression_free(c, e->right);
-}
-
-static void add_dependency(grib_expression* g, grib_accessor* observer)
-{
-    grib_expression_binop* e = (grib_expression_binop*)g;
-    grib_dependency_observe_expression(observer, e->left);
-    grib_dependency_observe_expression(observer, e->right);
-}
-
-grib_expression* new_binop_expression(grib_context* c,
-                                      grib_binop_long_proc long_func,
-                                      grib_binop_double_proc double_func,
-                                      grib_expression* left, grib_expression* right)
-{
-    grib_expression_binop* e = (grib_expression_binop*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_binop));
-    e->base.cclass           = grib_expression_class_binop;
-    e->left                  = left;
-    e->right                 = right;
-    e->long_func             = long_func;
-    e->double_func           = double_func;
-    return (grib_expression*)e;
-}
-
-static int native_type(grib_expression* g, grib_handle* h)
-{
-    grib_expression_binop* e = (grib_expression_binop*)g;
-    /* See GRIB-394 : The type of this binary expression will be double if any of its operands are double */
-    if (grib_expression_native_type(h, e->left) == GRIB_TYPE_DOUBLE ||
-        grib_expression_native_type(h, e->right) == GRIB_TYPE_DOUBLE) {
-        return GRIB_TYPE_DOUBLE;
-    }
-    return e->long_func ? GRIB_TYPE_LONG : GRIB_TYPE_DOUBLE;
-}
diff --git a/src/grib_expression_class_double.cc b/src/grib_expression_class_double.cc
deleted file mode 100644
index 14e38e973..000000000
--- a/src/grib_expression_class_double.cc
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = destroy
-   IMPLEMENTS = native_type
-   IMPLEMENTS = evaluate_long
-   IMPLEMENTS = evaluate_double
-   IMPLEMENTS = print
-   IMPLEMENTS = add_dependency
-   MEMBERS    = double value
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static int     native_type(grib_expression*,grib_handle*);
-static int     evaluate_long(grib_expression*,grib_handle*,long*);
-static int     evaluate_double(grib_expression*,grib_handle*,double*);
-
-typedef struct grib_expression_double{
-  grib_expression base;
-    /* Members defined in double */
-    double value;
-} grib_expression_double;
-
-
-static grib_expression_class _grib_expression_class_double = {
-    0,                      /* super */
-    "double",                      /* name  */
-    sizeof(grib_expression_double),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    0,
-    &evaluate_long,
-    &evaluate_double,
-    0,
-};
-
-grib_expression_class* grib_expression_class_double = &_grib_expression_class_double;
-
-/* END_CLASS_IMP */
-
-static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
-{
-    const grib_expression_double* e = (grib_expression_double*)g;
-    *lres = e->value;
-    return GRIB_SUCCESS;
-}
-
-static int evaluate_double(grib_expression* g, grib_handle* h, double* dres)
-{
-    const grib_expression_double* e = (grib_expression_double*)g;
-    *dres = e->value;
-    return GRIB_SUCCESS;
-}
-
-static void print(grib_context* c, grib_expression* g, grib_handle* f, FILE* out)
-{
-    const grib_expression_double* e = (grib_expression_double*)g;
-    fprintf(out, "double(%g)", e->value);
-}
-
-static void destroy(grib_context* c, grib_expression* g)
-{
-    /* grib_expression_double* e = (grib_expression_double*)g; */
-}
-
-static void add_dependency(grib_expression* g, grib_accessor* observer)
-{
-    /* grib_expression_double* e = (grib_expression_double*)g; */
-}
-
-grib_expression* new_double_expression(grib_context* c, double value)
-{
-    grib_expression_double* e = (grib_expression_double*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_double));
-    e->base.cclass = grib_expression_class_double;
-    e->value = value;
-    return (grib_expression*)e;
-}
-
-static int native_type(grib_expression* g, grib_handle* h)
-{
-    return GRIB_TYPE_DOUBLE;
-}
diff --git a/src/grib_expression_class_is_in_dict.cc b/src/grib_expression_class_is_in_dict.cc
deleted file mode 100644
index 8d86c24bf..000000000
--- a/src/grib_expression_class_is_in_dict.cc
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = native_type
-   IMPLEMENTS = add_dependency
-   IMPLEMENTS = get_name
-   IMPLEMENTS = evaluate_long
-   IMPLEMENTS = evaluate_double
-   IMPLEMENTS = evaluate_string
-   IMPLEMENTS = print
-   MEMBERS    = const char *key
-   MEMBERS    = const char *dictionary
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static string  get_name(grib_expression* e);
-static int     native_type(grib_expression*,grib_handle*);
-static int     evaluate_long(grib_expression*,grib_handle*,long*);
-static int     evaluate_double(grib_expression*,grib_handle*,double*);
-static string  evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
-
-typedef struct grib_expression_is_in_dict{
-  grib_expression base;
-    /* Members defined in is_in_dict */
-    const char *key;
-    const char *dictionary;
-} grib_expression_is_in_dict;
-
-
-static grib_expression_class _grib_expression_class_is_in_dict = {
-    0,                      /* super */
-    "is_in_dict",                      /* name  */
-    sizeof(grib_expression_is_in_dict),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    0,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    &get_name,
-    &evaluate_long,
-    &evaluate_double,
-    &evaluate_string,
-};
-
-grib_expression_class* grib_expression_class_is_in_dict = &_grib_expression_class_is_in_dict;
-
-/* END_CLASS_IMP */
-
-
-static grib_trie* load_dictionary(grib_context* c, grib_expression* e, int* err)
-{
-    grib_expression_is_in_dict* self = (grib_expression_is_in_dict*)e;
-
-    char* filename  = NULL;
-    char line[1024] = {0,};
-    char key[1024] = {0,};
-    char* list = 0;
-    grib_trie* dictionary = NULL;
-    FILE* f = NULL;
-    int i = 0;
-
-    *err = GRIB_SUCCESS;
-
-    filename = grib_context_full_defs_path(c, self->dictionary);
-    if (!filename) {
-        grib_context_log(c, GRIB_LOG_ERROR, "unable to find def file %s", self->dictionary);
-        *err = GRIB_FILE_NOT_FOUND;
-        return NULL;
-    }
-    else {
-        grib_context_log(c, GRIB_LOG_DEBUG, "is_in_dict: found def file %s", filename);
-    }
-    dictionary = (grib_trie*)grib_trie_get(c->lists, filename);
-    if (dictionary) {
-        grib_context_log(c, GRIB_LOG_DEBUG, "using dictionary %s from cache", self->dictionary);
-        return dictionary;
-    }
-    else {
-        grib_context_log(c, GRIB_LOG_DEBUG, "using dictionary %s from file %s", self->dictionary, filename);
-    }
-
-    f = codes_fopen(filename, "r");
-    if (!f) {
-        *err = GRIB_IO_PROBLEM;
-        return NULL;
-    }
-
-    dictionary = grib_trie_new(c);
-
-    while (fgets(line, sizeof(line) - 1, f)) {
-        i = 0;
-        while (line[i] != '|' && line[i] != 0) {
-            key[i] = line[i];
-            i++;
-        }
-        key[i] = 0;
-        list   = (char*)grib_context_malloc_clear(c, strlen(line) + 1);
-        memcpy(list, line, strlen(line));
-        grib_trie_insert(dictionary, key, list);
-    }
-
-    grib_trie_insert(c->lists, filename, dictionary);
-
-    fclose(f);
-
-    return dictionary;
-}
-
-static const char* get_name(grib_expression* g)
-{
-    const grib_expression_is_in_dict* e = (grib_expression_is_in_dict*)g;
-    return e->key;
-}
-
-static int evaluate_long(grib_expression* g, grib_handle* h, long* result)
-{
-    const grib_expression_is_in_dict* e = (grib_expression_is_in_dict*)g;
-    int err = 0;
-    char mybuf[1024] = {0,};
-    size_t size = 1024;
-
-    grib_trie* dict = load_dictionary(h->context, g, &err);
-
-    if ((err = grib_get_string_internal(h, e->key, mybuf, &size)) != GRIB_SUCCESS)
-        return err;
-
-    if (grib_trie_get(dict, mybuf))
-        *result = 1;
-    else
-        *result = 0;
-
-    return err;
-}
-
-static int evaluate_double(grib_expression* g, grib_handle* h, double* result)
-{
-    return GRIB_NOT_IMPLEMENTED;
-
-    // grib_expression_is_in_dict* e = (grib_expression_is_in_dict*)g;
-    // int err                       = 0;
-    // char mybuf[1024]              = {0,};
-    // size_t size = 1024;
-    // grib_trie* list = load_dictionary(h->context, g, &err);
-    // if ((err = grib_get_string_internal(h, e->key, mybuf, &size)) != GRIB_SUCCESS)
-    //     return err;
-    // if (grib_trie_get(list, mybuf))
-    //     *result = 1;
-    // else
-    //     *result = 0;
-    // return err;
-}
-
-static string evaluate_string(grib_expression* g, grib_handle* h, char* buf, size_t* size, int* err)
-{
-    *err = GRIB_NOT_IMPLEMENTED;
-    return NULL;
-
-    // grib_expression_is_in_dict* e = (grib_expression_is_in_dict*)g;
-    // char mybuf[1024]              = {0,};
-    // size_t sizebuf = 1024;
-    // long result;
-    // grib_trie* list = load_dictionary(h->context, g, err);
-    // if ((*err = grib_get_string_internal(h, e->key, mybuf, &sizebuf)) != GRIB_SUCCESS)
-    //     return NULL;
-    // if (grib_trie_get(list, mybuf))
-    //     result = 1;
-    // else
-    //     result = 0;
-    // snprintf(buf, 32, "%ld", result);
-    // *size = strlen(buf);
-    // return buf;
-}
-
-static void print(grib_context* c, grib_expression* g, grib_handle* f, FILE* out)
-{
-    const grib_expression_is_in_dict* e = (grib_expression_is_in_dict*)g;
-    fprintf(out, "access('%s", e->key);
-    if (f) {
-        long s = 0;
-        grib_get_long(f, e->key, &s);
-        fprintf(out, "=%ld", s);
-    }
-    fprintf(out, "')");
-}
-
-grib_expression* new_is_in_dict_expression(grib_context* c, const char* name, const char* list)
-{
-    grib_expression_is_in_dict* e = (grib_expression_is_in_dict*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_is_in_dict));
-    e->base.cclass                = grib_expression_class_is_in_dict;
-    e->key                        = grib_context_strdup_persistent(c, name);
-    e->dictionary                 = grib_context_strdup_persistent(c, list);
-    return (grib_expression*)e;
-}
-
-static int native_type(grib_expression* g, grib_handle* h)
-{
-    return GRIB_TYPE_LONG;
-}
-
-static void add_dependency(grib_expression* g, grib_accessor* observer)
-{
-    const grib_expression_is_in_dict* e = (grib_expression_is_in_dict*)g;
-    grib_accessor* observed = grib_find_accessor(grib_handle_of_accessor(observer), e->key);
-
-    if (!observed) {
-        /* grib_context_log(observer->context, GRIB_LOG_ERROR, */
-        /* "Error in accessor_add_dependency: cannot find [%s]", e->name); */
-        /* Assert(observed); */
-        return;
-    }
-
-    grib_dependency_add(observer, observed);
-}
diff --git a/src/grib_expression_class_is_in_list.cc b/src/grib_expression_class_is_in_list.cc
deleted file mode 100644
index 953481ad0..000000000
--- a/src/grib_expression_class_is_in_list.cc
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = destroy
-   IMPLEMENTS = native_type
-   IMPLEMENTS = get_name
-   IMPLEMENTS = evaluate_long
-   IMPLEMENTS = evaluate_double
-   IMPLEMENTS = evaluate_string
-   IMPLEMENTS = print
-   IMPLEMENTS = add_dependency
-   MEMBERS    = const char *name
-   MEMBERS    = const char *list
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static string  get_name(grib_expression* e);
-static int     native_type(grib_expression*,grib_handle*);
-static int     evaluate_long(grib_expression*,grib_handle*,long*);
-static int     evaluate_double(grib_expression*,grib_handle*,double*);
-static string  evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
-
-typedef struct grib_expression_is_in_list{
-  grib_expression base;
-    /* Members defined in is_in_list */
-    const char *name;
-    const char *list;
-} grib_expression_is_in_list;
-
-
-static grib_expression_class _grib_expression_class_is_in_list = {
-    0,                      /* super */
-    "is_in_list",                      /* name  */
-    sizeof(grib_expression_is_in_list),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    &get_name,
-    &evaluate_long,
-    &evaluate_double,
-    &evaluate_string,
-};
-
-grib_expression_class* grib_expression_class_is_in_list = &_grib_expression_class_is_in_list;
-
-/* END_CLASS_IMP */
-
-
-static grib_trie* load_list(grib_context* c, grib_expression* e, int* err)
-{
-    grib_expression_is_in_list* self = (grib_expression_is_in_list*)e;
-
-    char* filename  = NULL;
-    char line[1024] = {0,};
-    grib_trie* list = NULL;
-    FILE* f         = NULL;
-
-    *err = GRIB_SUCCESS;
-
-    filename = grib_context_full_defs_path(c, self->list);
-    if (!filename) {
-        grib_context_log(c, GRIB_LOG_ERROR, "unable to find def file %s", self->list);
-        *err = GRIB_FILE_NOT_FOUND;
-        return NULL;
-    }
-    else {
-        grib_context_log(c, GRIB_LOG_DEBUG, "is_in_list: found def file %s", filename);
-    }
-    list = (grib_trie*)grib_trie_get(c->lists, filename);
-    if (list) {
-        grib_context_log(c, GRIB_LOG_DEBUG, "using list %s from cache", self->list);
-        return list;
-    }
-    else {
-        grib_context_log(c, GRIB_LOG_DEBUG, "using list %s from file %s", self->list, filename);
-    }
-
-    f = codes_fopen(filename, "r");
-    if (!f) {
-        *err = GRIB_IO_PROBLEM;
-        return NULL;
-    }
-
-    list = grib_trie_new(c);
-
-    while (fgets(line, sizeof(line) - 1, f)) {
-        unsigned char* p = (unsigned char*)line;
-        while (*p != 0) {
-            if (*p < 33) {
-                *p = 0;
-                break;
-            }
-            p++;
-        }
-        grib_trie_insert(list, line, line);
-    }
-
-    grib_trie_insert(c->lists, filename, list);
-
-    fclose(f);
-
-    return list;
-}
-
-static const char* get_name(grib_expression* g)
-{
-    const grib_expression_is_in_list* e = (grib_expression_is_in_list*)g;
-    return e->name;
-}
-
-static int evaluate_long(grib_expression* g, grib_handle* h, long* result)
-{
-    const grib_expression_is_in_list* e = (grib_expression_is_in_list*)g;
-    int err = 0;
-    char mybuf[1024] = {0,};
-    size_t size = 1024;
-
-    grib_trie* list = load_list(h->context, g, &err);
-
-    if ((err = grib_get_string_internal(h, e->name, mybuf, &size)) != GRIB_SUCCESS)
-        return err;
-
-    if (grib_trie_get(list, mybuf))
-        *result = 1;
-    else
-        *result = 0;
-
-    return err;
-}
-
-static int evaluate_double(grib_expression* g, grib_handle* h, double* result)
-{
-    return GRIB_NOT_IMPLEMENTED;
-    // grib_expression_is_in_list* e = (grib_expression_is_in_list*)g;
-    // int err                       = 0;
-    // char mybuf[1024]              = {0,};
-    // size_t size = 1024;
-    // grib_trie* list = load_list(h->context, g, &err);
-    // if ((err = grib_get_string_internal(h, e->name, mybuf, &size)) != GRIB_SUCCESS)
-    //     return err;
-    // if (grib_trie_get(list, mybuf))
-    //     *result = 1;
-    // else
-    //     *result = 0;
-    // return err;
-}
-
-static string evaluate_string(grib_expression* g, grib_handle* h, char* buf, size_t* size, int* err)
-{
-    const grib_expression_is_in_list* e = (grib_expression_is_in_list*)g;
-    char mybuf[1024] = {0,};
-    size_t sizebuf = 1024;
-    long result;
-
-    grib_trie* list = load_list(h->context, g, err);
-
-    if ((*err = grib_get_string_internal(h, e->name, mybuf, &sizebuf)) != GRIB_SUCCESS)
-        return NULL;
-
-    if (grib_trie_get(list, mybuf))
-        result = 1;
-    else
-        result = 0;
-
-    snprintf(buf, 32, "%ld", result);
-    *size = strlen(buf);
-    return buf;
-}
-
-static void print(grib_context* c, grib_expression* g, grib_handle* f, FILE* out)
-{
-    const grib_expression_is_in_list* e = (grib_expression_is_in_list*)g;
-    fprintf(out, "access('%s", e->name);
-    if (f) {
-        long s = 0;
-        grib_get_long(f, e->name, &s);
-        fprintf(out, "=%ld", s);
-    }
-    fprintf(out, "')");
-}
-
-static void destroy(grib_context* c, grib_expression* g)
-{
-}
-
-static void add_dependency(grib_expression* g, grib_accessor* observer)
-{
-    const grib_expression_is_in_list* e = (grib_expression_is_in_list*)g;
-    grib_accessor* observed = grib_find_accessor(grib_handle_of_accessor(observer), e->name);
-
-    if (!observed) {
-        /* grib_context_log(observer->context, GRIB_LOG_ERROR, */
-        /* "Error in accessor_add_dependency: cannot find [%s]", e->name); */
-        /* Assert(observed); */
-        return;
-    }
-
-    grib_dependency_add(observer, observed);
-}
-
-grib_expression* new_is_in_list_expression(grib_context* c, const char* name, const char* list)
-{
-    grib_expression_is_in_list* e = (grib_expression_is_in_list*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_is_in_list));
-    e->base.cclass                = grib_expression_class_is_in_list;
-    e->name                       = grib_context_strdup_persistent(c, name);
-    e->list                       = grib_context_strdup_persistent(c, list);
-    return (grib_expression*)e;
-}
-
-static int native_type(grib_expression* g, grib_handle* h)
-{
-    grib_expression_is_in_list* e = (grib_expression_is_in_list*)g;
-    int type = 0;
-    int err;
-    if ((err = grib_get_native_type(h, e->name, &type)) != GRIB_SUCCESS)
-        grib_context_log(h->context, GRIB_LOG_ERROR,
-                         "Error in native_type %s : %s", e->name, grib_get_error_message(err));
-    return type;
-}
diff --git a/src/grib_expression_class_is_integer.cc b/src/grib_expression_class_is_integer.cc
deleted file mode 100644
index d88756974..000000000
--- a/src/grib_expression_class_is_integer.cc
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = destroy
-   IMPLEMENTS = native_type
-   IMPLEMENTS = get_name
-   IMPLEMENTS = evaluate_long
-   IMPLEMENTS = evaluate_double
-   IMPLEMENTS = evaluate_string
-   IMPLEMENTS = print
-   IMPLEMENTS = add_dependency
-   MEMBERS    = char *name
-   MEMBERS    = size_t start
-   MEMBERS    = size_t length
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static string  get_name(grib_expression* e);
-static int     native_type(grib_expression*,grib_handle*);
-static int     evaluate_long(grib_expression*,grib_handle*,long*);
-static int     evaluate_double(grib_expression*,grib_handle*,double*);
-static string  evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
-
-typedef struct grib_expression_is_integer{
-  grib_expression base;
-    /* Members defined in is_integer */
-    char *name;
-    size_t start;
-    size_t length;
-} grib_expression_is_integer;
-
-
-static grib_expression_class _grib_expression_class_is_integer = {
-    0,                      /* super */
-    "is_integer",                      /* name  */
-    sizeof(grib_expression_is_integer),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    &get_name,
-    &evaluate_long,
-    &evaluate_double,
-    &evaluate_string,
-};
-
-grib_expression_class* grib_expression_class_is_integer = &_grib_expression_class_is_integer;
-
-/* END_CLASS_IMP */
-
-static const char* get_name(grib_expression* g)
-{
-    const grib_expression_is_integer* e = (grib_expression_is_integer*)g;
-    return e->name;
-}
-
-static int evaluate_long(grib_expression* g, grib_handle* h, long* result)
-{
-    grib_expression_is_integer* e = (grib_expression_is_integer*)g;
-    int err = 0;
-    char mybuf[1024] = {0,};
-    size_t size = 1024;
-    char* p     = 0;
-    char* start = 0;
-
-    if ((err = grib_get_string_internal(h, e->name, mybuf, &size)) != GRIB_SUCCESS)
-        return err;
-
-    start = mybuf + e->start;
-
-    if (e->length > 0)
-        start[e->length] = 0;
-
-    strtol(start, &p, 10);
-
-    if (*p != 0)
-        *result = 0;
-    else
-        *result = 1;
-
-    return err;
-}
-
-static int evaluate_double(grib_expression* g, grib_handle* h, double* result)
-{
-    int err = 0;
-    long lresult = 0;
-
-    err = evaluate_long(g, h, &lresult);
-    *result = lresult;
-    return err;
-}
-
-static string evaluate_string(grib_expression* g, grib_handle* h, char* buf, size_t* size, int* err)
-{
-    long lresult   = 0;
-    double dresult = 0.0;
-
-    switch (grib_expression_native_type(h, g)) {
-        case GRIB_TYPE_LONG:
-            *err = evaluate_long(g, h, &lresult);
-            snprintf(buf, 32, "%ld", lresult);
-            break;
-        case GRIB_TYPE_DOUBLE:
-            *err = evaluate_double(g, h, &dresult);
-            snprintf(buf, 32, "%g", dresult);
-            break;
-    }
-    return buf;
-}
-
-static void print(grib_context* c, grib_expression* g, grib_handle* f, FILE* out)
-{
-    // grib_expression_is_integer* e = (grib_expression_is_integer*)g;
-    // printf("access('%s", e->name);
-    // if (f) {
-    //     long s = 0;
-    //     grib_get_long(f, e->name, &s);
-    //     printf("=%ld", s);
-    // }
-    // printf("')");
-}
-
-static void destroy(grib_context* c, grib_expression* g)
-{
-    grib_expression_is_integer* e = (grib_expression_is_integer*)g;
-    grib_context_free_persistent(c, e->name);
-}
-
-
-static void add_dependency(grib_expression* g, grib_accessor* observer)
-{
-    const grib_expression_is_integer* e = (grib_expression_is_integer*)g;
-    grib_accessor* observed       = grib_find_accessor(grib_handle_of_accessor(observer), e->name);
-
-    if (!observed) {
-        /* grib_context_log(observer->context, GRIB_LOG_ERROR, */
-        /* "Error in accessor_add_dependency: cannot find [%s]", e->name); */
-        /* Assert(observed); */
-        return;
-    }
-
-    grib_dependency_add(observer, observed);
-}
-
-grib_expression* new_is_integer_expression(grib_context* c, const char* name, int start, int length)
-{
-    grib_expression_is_integer* e = (grib_expression_is_integer*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_is_integer));
-    e->base.cclass                = grib_expression_class_is_integer;
-    e->name                       = grib_context_strdup_persistent(c, name);
-    e->start                      = start;
-    e->length                     = length;
-    return (grib_expression*)e;
-}
-
-static int native_type(grib_expression* g, grib_handle* h)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/grib_expression_class_length.cc b/src/grib_expression_class_length.cc
deleted file mode 100644
index e2c0d3202..000000000
--- a/src/grib_expression_class_length.cc
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = destroy
-   IMPLEMENTS = native_type
-   IMPLEMENTS = get_name
-   IMPLEMENTS = evaluate_long
-   IMPLEMENTS = evaluate_double
-   IMPLEMENTS = evaluate_string
-   IMPLEMENTS = print
-   IMPLEMENTS = add_dependency
-   MEMBERS    = char *name
-   MEMBERS    = size_t start
-   MEMBERS    = size_t length
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static string  get_name(grib_expression* e);
-static int     native_type(grib_expression*,grib_handle*);
-static int     evaluate_long(grib_expression*,grib_handle*,long*);
-static int     evaluate_double(grib_expression*,grib_handle*,double*);
-static string  evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
-
-typedef struct grib_expression_length{
-  grib_expression base;
-    /* Members defined in length */
-    char *name;
-    size_t start;
-    size_t length;
-} grib_expression_length;
-
-
-static grib_expression_class _grib_expression_class_length = {
-    0,                      /* super */
-    "length",                      /* name  */
-    sizeof(grib_expression_length),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    &get_name,
-    &evaluate_long,
-    &evaluate_double,
-    &evaluate_string,
-};
-
-grib_expression_class* grib_expression_class_length = &_grib_expression_class_length;
-
-/* END_CLASS_IMP */
-
-static const char* get_name(grib_expression* g)
-{
-    const grib_expression_length* e = (grib_expression_length*)g;
-    return e->name;
-}
-
-static int evaluate_long(grib_expression* g, grib_handle* h, long* result)
-{
-    const grib_expression_length* e = (grib_expression_length*)g;
-    int err = 0;
-    char mybuf[1024] = {0,};
-    size_t size = 1024;
-    if ((err = grib_get_string_internal(h, e->name, mybuf, &size)) != GRIB_SUCCESS)
-        return err;
-
-    *result = strlen(mybuf);
-    return err;
-}
-
-static int evaluate_double(grib_expression* g, grib_handle* h, double* result)
-{
-    const grib_expression_length* e = (grib_expression_length*)g;
-    char mybuf[1024] = {0,};
-    size_t size = 1024;
-    int err = 0;
-    if ((err = grib_get_string_internal(h, e->name, mybuf, &size)) != GRIB_SUCCESS)
-        return err;
-
-    *result = strlen(mybuf);
-    return err;
-}
-
-static string evaluate_string(grib_expression* g, grib_handle* h, char* buf, size_t* size, int* err)
-{
-    const grib_expression_length* e = (grib_expression_length*)g;
-    char mybuf[1024] = {0,};
-    Assert(buf);
-    if ((*err = grib_get_string_internal(h, e->name, mybuf, size)) != GRIB_SUCCESS)
-        return NULL;
-
-    snprintf(buf, 32, "%ld", (long)strlen(mybuf));
-    return buf;
-}
-
-static void print(grib_context* c, grib_expression* g, grib_handle* f, FILE* out)
-{
-    const grib_expression_length* e = (grib_expression_length*)g;
-    fprintf(out, "access('%s", e->name);
-    if (f) {
-        long s = 0;
-        grib_get_long(f, e->name, &s);
-        fprintf(out, "=%ld", s);
-    }
-    fprintf(out, "')");
-}
-
-static void destroy(grib_context* c, grib_expression* g)
-{
-    grib_expression_length* e = (grib_expression_length*)g;
-    grib_context_free_persistent(c, e->name);
-}
-
-static void add_dependency(grib_expression* g, grib_accessor* observer)
-{
-    const grib_expression_length* e = (grib_expression_length*)g;
-    grib_accessor* observed = grib_find_accessor(grib_handle_of_accessor(observer), e->name);
-
-    if (!observed) {
-        /* grib_context_log(observer->context, GRIB_LOG_ERROR, */
-        /* "Error in accessor_add_dependency: cannot find [%s]", e->name); */
-        /* Assert(observed); */
-        return;
-    }
-
-    grib_dependency_add(observer, observed);
-}
-
-grib_expression* new_length_expression(grib_context* c, const char* name)
-{
-    grib_expression_length* e = (grib_expression_length*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_length));
-    e->base.cclass = grib_expression_class_length;
-    e->name = grib_context_strdup_persistent(c, name);
-    return (grib_expression*)e;
-}
-
-static int native_type(grib_expression* g, grib_handle* h)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/grib_expression_class_logical_and.cc b/src/grib_expression_class_logical_and.cc
deleted file mode 100644
index 419383373..000000000
--- a/src/grib_expression_class_logical_and.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = destroy
-   IMPLEMENTS = native_type
-   IMPLEMENTS = evaluate_long
-   IMPLEMENTS = evaluate_double
-   IMPLEMENTS = print
-   IMPLEMENTS = add_dependency
-   MEMBERS    = grib_expression *left
-   MEMBERS = grib_expression *right
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static int     native_type(grib_expression*,grib_handle*);
-static int     evaluate_long(grib_expression*,grib_handle*,long*);
-static int     evaluate_double(grib_expression*,grib_handle*,double*);
-
-typedef struct grib_expression_logical_and{
-  grib_expression base;
-    /* Members defined in logical_and */
-    grib_expression *left;
-    grib_expression *right;
-} grib_expression_logical_and;
-
-
-static grib_expression_class _grib_expression_class_logical_and = {
-    0,                      /* super */
-    "logical_and",                      /* name  */
-    sizeof(grib_expression_logical_and),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    0,
-    &evaluate_long,
-    &evaluate_double,
-    0,
-};
-
-grib_expression_class* grib_expression_class_logical_and = &_grib_expression_class_logical_and;
-
-/* END_CLASS_IMP */
-
-static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
-{
-    long v1    = 0;
-    long v2    = 0;
-    double dv1 = 0;
-    double dv2 = 0;
-    int ret;
-    grib_expression_logical_and* e = (grib_expression_logical_and*)g;
-
-    switch (grib_expression_native_type(h, e->left)) {
-        case GRIB_TYPE_LONG:
-            ret = grib_expression_evaluate_long(h, e->left, &v1);
-            if (ret != GRIB_SUCCESS)
-                return ret;
-            if (v1 == 0) {
-                *lres = 0;
-                return ret;
-            }
-            break;
-        case GRIB_TYPE_DOUBLE:
-            ret = grib_expression_evaluate_double(h, e->left, &dv1);
-            if (ret != GRIB_SUCCESS)
-                return ret;
-            if (dv1 == 0) {
-                *lres = 0;
-                return ret;
-            }
-            break;
-        default:
-            return GRIB_INVALID_TYPE;
-    }
-
-    switch (grib_expression_native_type(h, e->right)) {
-        case GRIB_TYPE_LONG:
-            ret = grib_expression_evaluate_long(h, e->right, &v2);
-            if (ret != GRIB_SUCCESS)
-                return ret;
-            *lres = v2 ? 1 : 0;
-            break;
-        case GRIB_TYPE_DOUBLE:
-            ret = grib_expression_evaluate_double(h, e->right, &dv2);
-            if (ret != GRIB_SUCCESS)
-                return ret;
-            *lres = dv2 ? 1 : 0;
-            break;
-        default:
-            return GRIB_INVALID_TYPE;
-    }
-
-    return GRIB_SUCCESS;
-}
-
-static int evaluate_double(grib_expression* g, grib_handle* h, double* dres)
-{
-    long lres = 0;
-    int ret = evaluate_long(g, h, &lres);
-    *dres = (double)lres;
-    return ret;
-}
-
-static void print(grib_context* c, grib_expression* g, grib_handle* f, FILE* out)
-{
-    grib_expression_logical_and* e = (grib_expression_logical_and*)g;
-    fprintf(out, "(");
-    grib_expression_print(c, e->left, f, out);
-    fprintf(out, " && ");
-    grib_expression_print(c, e->right, f, out);
-    fprintf(out, ")");
-}
-
-static void destroy(grib_context* c, grib_expression* g)
-{
-    grib_expression_logical_and* e = (grib_expression_logical_and*)g;
-    grib_expression_free(c, e->left);
-    grib_expression_free(c, e->right);
-}
-
-static void add_dependency(grib_expression* g, grib_accessor* observer)
-{
-    grib_expression_logical_and* e = (grib_expression_logical_and*)g;
-    grib_dependency_observe_expression(observer, e->left);
-    grib_dependency_observe_expression(observer, e->right);
-}
-
-grib_expression* new_logical_and_expression(grib_context* c, grib_expression* left, grib_expression* right)
-{
-    grib_expression_logical_and* e = (grib_expression_logical_and*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_logical_and));
-    e->base.cclass                 = grib_expression_class_logical_and;
-    e->left                        = left;
-    e->right                       = right;
-    return (grib_expression*)e;
-}
-
-static int native_type(grib_expression* g, grib_handle* h)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/grib_expression_class_logical_or.cc b/src/grib_expression_class_logical_or.cc
deleted file mode 100644
index 88867f35f..000000000
--- a/src/grib_expression_class_logical_or.cc
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = destroy
-   IMPLEMENTS = native_type
-   IMPLEMENTS = evaluate_long
-   IMPLEMENTS = evaluate_double
-   IMPLEMENTS = print
-   IMPLEMENTS = add_dependency
-   MEMBERS    = grib_expression *left
-   MEMBERS = grib_expression *right
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static int     native_type(grib_expression*,grib_handle*);
-static int     evaluate_long(grib_expression*,grib_handle*,long*);
-static int     evaluate_double(grib_expression*,grib_handle*,double*);
-
-typedef struct grib_expression_logical_or{
-  grib_expression base;
-    /* Members defined in logical_or */
-    grib_expression *left;
-    grib_expression *right;
-} grib_expression_logical_or;
-
-
-static grib_expression_class _grib_expression_class_logical_or = {
-    0,                      /* super */
-    "logical_or",                      /* name  */
-    sizeof(grib_expression_logical_or),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    0,
-    &evaluate_long,
-    &evaluate_double,
-    0,
-};
-
-grib_expression_class* grib_expression_class_logical_or = &_grib_expression_class_logical_or;
-
-/* END_CLASS_IMP */
-
-static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
-{
-    long v1    = 0;
-    long v2    = 0;
-    double dv1 = 0;
-    double dv2 = 0;
-    int ret;
-    grib_expression_logical_or* e = (grib_expression_logical_or*)g;
-
-
-    switch (grib_expression_native_type(h, e->left)) {
-        case GRIB_TYPE_LONG:
-            ret = grib_expression_evaluate_long(h, e->left, &v1);
-            if (ret != GRIB_SUCCESS)
-                return ret;
-            if (v1 != 0) {
-                *lres = 1;
-                return ret;
-            }
-            break;
-        case GRIB_TYPE_DOUBLE:
-            ret = grib_expression_evaluate_double(h, e->left, &dv1);
-            if (ret != GRIB_SUCCESS)
-                return ret;
-            if (dv1 != 0) {
-                *lres = 1;
-                return ret;
-            }
-            break;
-        default:
-            return GRIB_INVALID_TYPE;
-    }
-
-    switch (grib_expression_native_type(h, e->right)) {
-        case GRIB_TYPE_LONG:
-            ret = grib_expression_evaluate_long(h, e->right, &v2);
-            if (ret != GRIB_SUCCESS)
-                return ret;
-            *lres = v2 ? 1 : 0;
-            break;
-        case GRIB_TYPE_DOUBLE:
-            ret = grib_expression_evaluate_double(h, e->right, &dv2);
-            if (ret != GRIB_SUCCESS)
-                return ret;
-            *lres = dv2 ? 1 : 0;
-            break;
-        default:
-            return GRIB_INVALID_TYPE;
-    }
-
-    return GRIB_SUCCESS;
-}
-
-static int evaluate_double(grib_expression* g, grib_handle* h, double* dres)
-{
-    long lres = 0;
-    int ret = evaluate_long(g, h, &lres);
-    *dres = (double)lres;
-    return ret;
-}
-
-static void print(grib_context* c, grib_expression* g, grib_handle* f, FILE* out)
-{
-    grib_expression_logical_or* e = (grib_expression_logical_or*)g;
-    fprintf(out, "(");
-    grib_expression_print(c, e->left, f, out);
-    fprintf(out, " || ");
-    grib_expression_print(c, e->right, f, out);
-    fprintf(out, ")");
-}
-
-static void destroy(grib_context* c, grib_expression* g)
-{
-    grib_expression_logical_or* e = (grib_expression_logical_or*)g;
-    grib_expression_free(c, e->left);
-    grib_expression_free(c, e->right);
-}
-
-static void add_dependency(grib_expression* g, grib_accessor* observer)
-{
-    grib_expression_logical_or* e = (grib_expression_logical_or*)g;
-    grib_dependency_observe_expression(observer, e->left);
-    grib_dependency_observe_expression(observer, e->right);
-}
-
-grib_expression* new_logical_or_expression(grib_context* c, grib_expression* left, grib_expression* right)
-{
-    grib_expression_logical_or* e = (grib_expression_logical_or*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_logical_or));
-    e->base.cclass                = grib_expression_class_logical_or;
-    e->left                       = left;
-    e->right                      = right;
-    return (grib_expression*)e;
-}
-
-static int native_type(grib_expression* g, grib_handle* h)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/grib_expression_class_long.cc b/src/grib_expression_class_long.cc
deleted file mode 100644
index 946e6456d..000000000
--- a/src/grib_expression_class_long.cc
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = native_type;pack_missing
-   IMPLEMENTS = destroy
-   IMPLEMENTS = evaluate_long
-   IMPLEMENTS = evaluate_double
-   IMPLEMENTS = print
-   IMPLEMENTS = add_dependency
-   MEMBERS    = long value
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static int     native_type(grib_expression*,grib_handle*);
-static int     evaluate_long(grib_expression*,grib_handle*,long*);
-static int     evaluate_double(grib_expression*,grib_handle*,double*);
-
-typedef struct grib_expression_long{
-  grib_expression base;
-    /* Members defined in long */
-    long value;
-} grib_expression_long;
-
-
-static grib_expression_class _grib_expression_class_long = {
-    0,                      /* super */
-    "long",                      /* name  */
-    sizeof(grib_expression_long),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    0,
-    &evaluate_long,
-    &evaluate_double,
-    0,
-};
-
-grib_expression_class* grib_expression_class_long = &_grib_expression_class_long;
-
-/* END_CLASS_IMP */
-
-static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
-{
-    const grib_expression_long* e = (grib_expression_long*)g;
-    *lres = e->value;
-    return GRIB_SUCCESS;
-}
-
-static int evaluate_double(grib_expression* g, grib_handle* h, double* dres)
-{
-    const grib_expression_long* e = (grib_expression_long*)g;
-    *dres = e->value;
-    return GRIB_SUCCESS;
-}
-
-static void print(grib_context* c, grib_expression* g, grib_handle* f, FILE* out)
-{
-    const grib_expression_long* e = (grib_expression_long*)g;
-    fprintf(out, "long(%ld)", e->value);
-}
-
-static void destroy(grib_context* c, grib_expression* g)
-{
-    /* grib_expression_long* e = (grib_expression_long*)g; */
-}
-
-static void add_dependency(grib_expression* g, grib_accessor* observer)
-{
-    /* grib_expression_long* e = (grib_expression_long*)g; */
-}
-
-grib_expression* new_long_expression(grib_context* c, long value)
-{
-    grib_expression_long* e = (grib_expression_long*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_long));
-    e->base.cclass = grib_expression_class_long;
-    e->value = value;
-    return (grib_expression*)e;
-}
-
-static int native_type(grib_expression* g, grib_handle* h)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/grib_expression_class_string.cc b/src/grib_expression_class_string.cc
deleted file mode 100644
index a085ed69e..000000000
--- a/src/grib_expression_class_string.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = native_type
-   IMPLEMENTS = destroy
-   IMPLEMENTS = evaluate_string
-   IMPLEMENTS = print
-   IMPLEMENTS = add_dependency
-   MEMBERS    = char* value
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static int     native_type(grib_expression*,grib_handle*);
-static string  evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
-
-typedef struct grib_expression_string{
-  grib_expression base;
-    /* Members defined in string */
-    char* value;
-} grib_expression_string;
-
-
-static grib_expression_class _grib_expression_class_string = {
-    0,                      /* super */
-    "string",                      /* name  */
-    sizeof(grib_expression_string),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    0,
-    0,
-    0,
-    &evaluate_string,
-};
-
-grib_expression_class* grib_expression_class_string = &_grib_expression_class_string;
-
-/* END_CLASS_IMP */
-
-static const char* evaluate_string(grib_expression* g, grib_handle* h, char* buf, size_t* size, int* err)
-{
-    const grib_expression_string* e = (grib_expression_string*)g;
-    *err = 0;
-    return e->value;
-}
-
-static void print(grib_context* c, grib_expression* g, grib_handle* f, FILE* out)
-{
-    const grib_expression_string* e = (grib_expression_string*)g;
-    fprintf(out, "string('%s')", e->value);
-}
-
-static void destroy(grib_context* c, grib_expression* g)
-{
-    grib_expression_string* e = (grib_expression_string*)g;
-    grib_context_free_persistent(c, e->value);
-}
-
-static void add_dependency(grib_expression* g, grib_accessor* observer)
-{
-    /* grib_expression_string* e = (grib_expression_string*)g; */
-}
-
-grib_expression* new_string_expression(grib_context* c, const char* value)
-{
-    grib_expression_string* e = (grib_expression_string*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_string));
-    e->base.cclass            = grib_expression_class_string;
-    e->value                  = grib_context_strdup_persistent(c, value);
-    return (grib_expression*)e;
-}
-
-static int native_type(grib_expression* g, grib_handle* h)
-{
-    return GRIB_TYPE_STRING;
-}
diff --git a/src/grib_expression_class_string_compare.cc b/src/grib_expression_class_string_compare.cc
deleted file mode 100644
index 603846b7b..000000000
--- a/src/grib_expression_class_string_compare.cc
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = destroy
-   IMPLEMENTS = native_type
-   IMPLEMENTS = evaluate_long
-   IMPLEMENTS = evaluate_double
-   IMPLEMENTS = print
-   IMPLEMENTS = add_dependency
-   MEMBERS    = grib_expression *left
-   MEMBERS    = grib_expression *right
-   MEMBERS    = int eq
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static int     native_type(grib_expression*,grib_handle*);
-static int     evaluate_long(grib_expression*,grib_handle*,long*);
-static int     evaluate_double(grib_expression*,grib_handle*,double*);
-
-typedef struct grib_expression_string_compare{
-  grib_expression base;
-    /* Members defined in string_compare */
-    grib_expression *left;
-    grib_expression *right;
-    int eq;
-} grib_expression_string_compare;
-
-
-static grib_expression_class _grib_expression_class_string_compare = {
-    0,                      /* super */
-    "string_compare",                      /* name  */
-    sizeof(grib_expression_string_compare),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    0,
-    &evaluate_long,
-    &evaluate_double,
-    0,
-};
-
-grib_expression_class* grib_expression_class_string_compare = &_grib_expression_class_string_compare;
-
-/* END_CLASS_IMP */
-
-/* Note: A fast cut-down version of strcmp which does NOT return -1 */
-/* 0 means input strings are equal and 1 means not equal */
-GRIB_INLINE static int grib_inline_strcmp(const char* a, const char* b)
-{
-    if (*a != *b)
-        return 1;
-    while ((*a != 0 && *b != 0) && *(a) == *(b)) {
-        a++;
-        b++;
-    }
-    return (*a == 0 && *b == 0) ? 0 : 1;
-}
-
-static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
-{
-    int ret = 0;
-    char b1[1024] = {0,};
-    size_t l1 = sizeof(b1);
-    char b2[1024] = {0,};
-    size_t l2 = sizeof(b2);
-    const char* v1 = NULL;
-    const char* v2 = NULL;
-
-    grib_expression_string_compare* e = (grib_expression_string_compare*)g;
-
-    v1 = grib_expression_evaluate_string(h, e->left, b1, &l1, &ret);
-    if (!v1 || ret) {
-        *lres = 0;
-        return ret;
-    }
-
-    v2 = grib_expression_evaluate_string(h, e->right, b2, &l2, &ret);
-    if (!v2 || ret) {
-        *lres = 0;
-        return ret;
-    }
-
-    if (e->eq) // IS operator
-        *lres = (grib_inline_strcmp(v1, v2) == 0);
-    else // ISNOT operator
-        *lres = (grib_inline_strcmp(v1, v2) != 0);
-
-    return GRIB_SUCCESS;
-}
-
-static int evaluate_double(grib_expression* g, grib_handle* h, double* dres)
-{
-    long n;
-    int ret = evaluate_long(g, h, &n);
-    *dres   = n;
-    return ret;
-}
-
-static void print(grib_context* c, grib_expression* g, grib_handle* f, FILE* out)
-{
-    grib_expression_string_compare* e = (grib_expression_string_compare*)g;
-    fprintf(out, "string_compare(");
-    grib_expression_print(c, e->left, f, out);
-    fprintf(out, ",");
-    grib_expression_print(c, e->right, f, out);
-    fprintf(out, ")");
-}
-
-static void destroy(grib_context* c, grib_expression* g)
-{
-    grib_expression_string_compare* e = (grib_expression_string_compare*)g;
-    grib_expression_free(c, e->left);
-    grib_expression_free(c, e->right);
-}
-
-static void add_dependency(grib_expression* g, grib_accessor* observer)
-{
-    grib_expression_string_compare* e = (grib_expression_string_compare*)g;
-    grib_dependency_observe_expression(observer, e->left);
-    grib_dependency_observe_expression(observer, e->right);
-}
-
-grib_expression* new_string_compare_expression(grib_context* c,
-                                               grib_expression* left, grib_expression* right, int eq)
-{
-    grib_expression_string_compare* e = (grib_expression_string_compare*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_string_compare));
-    e->base.cclass = grib_expression_class_string_compare;
-    e->left  = left;
-    e->right = right;
-    e->eq    = eq;
-    return (grib_expression*)e;
-}
-
-static int native_type(grib_expression* g, grib_handle* h)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/grib_expression_class_sub_string.cc b/src/grib_expression_class_sub_string.cc
deleted file mode 100644
index 8ed6c3dff..000000000
--- a/src/grib_expression_class_sub_string.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = native_type
-   IMPLEMENTS = destroy
-   IMPLEMENTS = evaluate_string
-   IMPLEMENTS = print
-   IMPLEMENTS = add_dependency
-   MEMBERS    = char* value
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static int     native_type(grib_expression*,grib_handle*);
-static string  evaluate_string(grib_expression*,grib_handle*,char*,size_t*,int*);
-
-typedef struct grib_expression_sub_string{
-  grib_expression base;
-    /* Members defined in sub_string */
-    char* value;
-} grib_expression_sub_string;
-
-
-static grib_expression_class _grib_expression_class_sub_string = {
-    0,                      /* super */
-    "sub_string",                      /* name  */
-    sizeof(grib_expression_sub_string),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    0,
-    0,
-    0,
-    &evaluate_string,
-};
-
-grib_expression_class* grib_expression_class_sub_string = &_grib_expression_class_sub_string;
-
-/* END_CLASS_IMP */
-
-static const char* evaluate_string(grib_expression* g, grib_handle* h, char* buf, size_t* size, int* err)
-{
-    const grib_expression_sub_string* e = (grib_expression_sub_string*)g;
-    *err = 0;
-    return e->value;
-}
-
-static void print(grib_context* c, grib_expression* g, grib_handle* f, FILE* out)
-{
-    const grib_expression_sub_string* e = (grib_expression_sub_string*)g;
-    fprintf(out, "string('%s')", e->value);
-}
-
-static void destroy(grib_context* c, grib_expression* g)
-{
-    grib_expression_sub_string* e = (grib_expression_sub_string*)g;
-    grib_context_free_persistent(c, e->value);
-}
-
-static void add_dependency(grib_expression* g, grib_accessor* observer)
-{
-    /* grib_expression_sub_string* e = (grib_expression_sub_string*)g; */
-}
-
-grib_expression* new_sub_string_expression(grib_context* c, const char* value, size_t start, size_t length)
-{
-    char v[1024] = {0,};
-    grib_expression_sub_string* e = (grib_expression_sub_string*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_sub_string));
-    const size_t slen             = strlen(value);
-    /* if (start<0) start+=strlen(value);  */
-
-    if (length == 0) {
-        grib_context_log(c, GRIB_LOG_ERROR, "Invalid substring: length must be > 0");
-        grib_context_free_persistent(c, e);
-        return NULL;
-    }
-    if (start > slen) { /* to catch a -ve number passed to start */
-        grib_context_log(c, GRIB_LOG_ERROR, "Invalid substring: start=%lu", start);
-        grib_context_free_persistent(c, e);
-        return NULL;
-    }
-    if (start + length > slen) {
-        grib_context_log(c, GRIB_LOG_ERROR, "Invalid substring: start(=%lu)+length(=%lu) > length('%s'))", start, length, value);
-        grib_context_free_persistent(c, e);
-        return NULL;
-    }
-
-    memcpy(v, value + start, length);
-    e->base.cclass = grib_expression_class_sub_string;
-    e->value       = grib_context_strdup_persistent(c, v);
-    return (grib_expression*)e;
-}
-
-static int native_type(grib_expression* g, grib_handle* h)
-{
-    return GRIB_TYPE_STRING;
-}
diff --git a/src/grib_expression_class_true.cc b/src/grib_expression_class_true.cc
deleted file mode 100644
index 41f3a40ae..000000000
--- a/src/grib_expression_class_true.cc
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = destroy
-   IMPLEMENTS = native_type
-   IMPLEMENTS = evaluate_long
-   IMPLEMENTS = evaluate_double
-   IMPLEMENTS = print
-   IMPLEMENTS = add_dependency
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static int     native_type(grib_expression*,grib_handle*);
-static int     evaluate_long(grib_expression*,grib_handle*,long*);
-static int     evaluate_double(grib_expression*,grib_handle*,double*);
-
-typedef struct grib_expression_true{
-  grib_expression base;
-    /* Members defined in true */
-} grib_expression_true;
-
-
-static grib_expression_class _grib_expression_class_true = {
-    0,                      /* super */
-    "true",                      /* name  */
-    sizeof(grib_expression_true),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    0,
-    &evaluate_long,
-    &evaluate_double,
-    0,
-};
-
-grib_expression_class* grib_expression_class_true = &_grib_expression_class_true;
-
-/* END_CLASS_IMP */
-
-static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
-{
-    *lres = 1;
-    return GRIB_SUCCESS;
-}
-
-static int evaluate_double(grib_expression* g, grib_handle* h, double* dres)
-{
-    *dres = 1;
-    return GRIB_SUCCESS;
-}
-
-static void print(grib_context* c, grib_expression* g, grib_handle* f, FILE* out)
-{
-    fprintf(out, "true()");
-}
-
-static void destroy(grib_context* c, grib_expression* g)
-{
-}
-
-
-static void add_dependency(grib_expression* g, grib_accessor* observer)
-{
-}
-
-grib_expression* new_true_expression(grib_context* c)
-{
-    grib_expression_true* e = (grib_expression_true*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_true));
-    e->base.cclass          = grib_expression_class_true;
-    return (grib_expression*)e;
-}
-
-static int native_type(grib_expression* g, grib_handle* h)
-{
-    return GRIB_TYPE_LONG;
-}
diff --git a/src/grib_expression_class_unop.cc b/src/grib_expression_class_unop.cc
deleted file mode 100644
index 18eb073fb..000000000
--- a/src/grib_expression_class_unop.cc
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * (C) Copyright 2005- ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- *
- * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
- * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
- */
-
-#include "grib_api_internal.h"
-
-/*
-   This is used by make_class.pl
-
-   START_CLASS_DEF
-   CLASS      = expression
-   IMPLEMENTS = destroy
-   IMPLEMENTS = native_type
-   IMPLEMENTS = get_name
-   IMPLEMENTS = evaluate_long
-   IMPLEMENTS = evaluate_double
-   IMPLEMENTS = print
-   IMPLEMENTS = add_dependency
-   MEMBERS    = grib_expression *exp
-   MEMBERS = grib_unop_long_proc  long_func
-   MEMBERS = grib_unop_double_proc  double_func
-   END_CLASS_DEF
-
- */
-/* START_CLASS_IMP */
-
-/*
-
-Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
-Instead edit values between START_CLASS_DEF and END_CLASS_DEF
-or edit "expression.class" and rerun ./make_class.pl
-
-*/
-
-typedef const char* string; /* to keep make_class.pl happy */
-
-static void    destroy(grib_context*,grib_expression* e);
-static void    print(grib_context*, grib_expression*, grib_handle*, FILE*);
-static void    add_dependency(grib_expression* e, grib_accessor* observer);
-static string  get_name(grib_expression* e);
-static int     native_type(grib_expression*,grib_handle*);
-static int     evaluate_long(grib_expression*,grib_handle*,long*);
-static int     evaluate_double(grib_expression*,grib_handle*,double*);
-
-typedef struct grib_expression_unop{
-  grib_expression base;
-    /* Members defined in unop */
-    grib_expression *exp;
-    grib_unop_long_proc  long_func;
-    grib_unop_double_proc  double_func;
-} grib_expression_unop;
-
-
-static grib_expression_class _grib_expression_class_unop = {
-    0,                      /* super */
-    "unop",                      /* name  */
-    sizeof(grib_expression_unop),/* size of instance */
-    0,                           /* inited */
-    0,                       /* constructor */
-    &destroy,                    /* destructor */
-    &print,
-    &add_dependency,
-    &native_type,
-    &get_name,
-    &evaluate_long,
-    &evaluate_double,
-    0,
-};
-
-grib_expression_class* grib_expression_class_unop = &_grib_expression_class_unop;
-
-/* END_CLASS_IMP */
-
-static int evaluate_long(grib_expression* g, grib_handle* h, long* lres)
-{
-    long v = 0;
-    grib_expression_unop* e = (grib_expression_unop*)g;
-    int ret = grib_expression_evaluate_long(h, e->exp, &v);
-    if (ret != GRIB_SUCCESS)
-        return ret;
-    *lres = e->long_func(v);
-    return GRIB_SUCCESS;
-}
-
-static int evaluate_double(grib_expression* g, grib_handle* h, double* dres)
-{
-    double v = 0;
-    grib_expression_unop* e = (grib_expression_unop*)g;
-    int ret = grib_expression_evaluate_double(h, e->exp, &v);
-    if (ret != GRIB_SUCCESS)
-        return ret;
-    *dres = e->double_func ? e->double_func(v) : e->long_func(v);
-    return GRIB_SUCCESS;
-}
-
-static const char* get_name(grib_expression* g)
-{
-    grib_expression_unop* e = (grib_expression_unop*)g;
-    return grib_expression_get_name(e->exp);
-}
-
-static void print(grib_context* c, grib_expression* g, grib_handle* f, FILE* out)
-{
-    grib_expression_unop* e = (grib_expression_unop*)g;
-    fprintf(out, "unop(");
-    grib_expression_print(c, e->exp, f, out);
-    fprintf(out, ")");
-}
-
-static void destroy(grib_context* c, grib_expression* g)
-{
-    grib_expression_unop* e = (grib_expression_unop*)g;
-    grib_expression_free(c, e->exp);
-}
-
-static void add_dependency(grib_expression* g, grib_accessor* observer)
-{
-    grib_expression_unop* e = (grib_expression_unop*)g;
-    grib_dependency_observe_expression(observer, e->exp);
-}
-
-grib_expression* new_unop_expression(grib_context* c,
-                                     grib_unop_long_proc long_func,
-                                     grib_unop_double_proc double_func,
-                                     grib_expression* exp)
-{
-    grib_expression_unop* e = (grib_expression_unop*)grib_context_malloc_clear_persistent(c, sizeof(grib_expression_unop));
-    e->base.cclass          = grib_expression_class_unop;
-    e->exp                  = exp;
-    e->long_func            = long_func;
-    e->double_func          = double_func;
-    return (grib_expression*)e;
-}
-
-static int native_type(grib_expression* g, grib_handle* h)
-{
-    grib_expression_unop* e = (grib_expression_unop*)g;
-    return e->long_func ? GRIB_TYPE_LONG : GRIB_TYPE_DOUBLE;
-}
diff --git a/src/grib_expression_factory.h b/src/grib_expression_factory.h
deleted file mode 100644
index 7cacd3ac1..000000000
--- a/src/grib_expression_factory.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* This file is automatically generated by ./make_class.pl, do not edit */
-{ "accessor", &grib_expression_class_accessor, },
-{ "binop", &grib_expression_class_binop, },
-{ "double", &grib_expression_class_double, },
-{ "functor", &grib_expression_class_functor, },
-{ "is_in_dict", &grib_expression_class_is_in_dict, },
-{ "is_in_list", &grib_expression_class_is_in_list, },
-{ "is_integer", &grib_expression_class_is_integer, },
-{ "length", &grib_expression_class_length, },
-{ "logical_and", &grib_expression_class_logical_and, },
-{ "logical_or", &grib_expression_class_logical_or, },
-{ "long", &grib_expression_class_long, },
-{ "string", &grib_expression_class_string, },
-{ "string_compare", &grib_expression_class_string_compare, },
-{ "sub_string", &grib_expression_class_sub_string, },
-{ "true", &grib_expression_class_true, },
-{ "unop", &grib_expression_class_unop, },
diff --git a/src/grib_iterator_factory.cc b/src/grib_iterator_factory.cc
index 9ea143b3d..15026358f 100644
--- a/src/grib_iterator_factory.cc
+++ b/src/grib_iterator_factory.cc
@@ -63,7 +63,7 @@ static const struct table_entry table[] = {
 eccodes::geo_iterator::Iterator* grib_iterator_factory(grib_handle* h, grib_arguments* args, unsigned long flags, int* error)
 {
     size_t i = 0, num_table_entries = 0;
-    const char* type = (char*)grib_arguments_get_name(h, args, 0);
+    const char* type = (char*)args->get_name(h, 0);
     *error = GRIB_NOT_IMPLEMENTED;
 
     num_table_entries = sizeof(table) / sizeof(table[0]);
diff --git a/src/grib_iterator_factory.h b/src/grib_iterator_factory.h
index b45f6cfe0..086734823 100644
--- a/src/grib_iterator_factory.h
+++ b/src/grib_iterator_factory.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "grib_api_internal.h"
-#include "geo_iterator/grib_iterator.h"
+#include "geo/iterator/grib_iterator.h"
 
 extern eccodes::geo_iterator::Iterator* grib_iterator_gaussian;
 extern eccodes::geo_iterator::Iterator* grib_iterator_gaussian_reduced;
diff --git a/src/grib_lex.cc b/src/grib_lex.cc
index 8efe0e58d..b08487049 100644
--- a/src/grib_lex.cc
+++ b/src/grib_lex.cc
@@ -47,7 +47,6 @@ typedef int16_t flex_int16_t;
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
-typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -156,7 +155,7 @@ typedef struct grib_yy_buffer_state *YY_BUFFER_STATE;
 typedef size_t grib_yy_size_t;
 #endif
 
-extern grib_yy_size_t grib_yyleng;
+extern int grib_yyleng;
 
 extern FILE *grib_yyin, *grib_yyout;
 
@@ -199,7 +198,7 @@ struct grib_yy_buffer_state
 	/* Number of characters read into grib_yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	grib_yy_size_t grib_yy_n_chars;
+	int grib_yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -268,8 +267,8 @@ static YY_BUFFER_STATE * grib_yy_buffer_stack = NULL; /**< Stack as an array. */
 
 /* grib_yy_hold_char holds the character lost when grib_yytext is formed. */
 static char grib_yy_hold_char;
-static grib_yy_size_t grib_yy_n_chars;		/* number of characters read into grib_yy_ch_buf */
-grib_yy_size_t grib_yyleng;
+static int grib_yy_n_chars;		/* number of characters read into grib_yy_ch_buf */
+int grib_yyleng;
 
 /* Points to current character in buffer. */
 static char *grib_yy_c_buf_p = NULL;
@@ -296,7 +295,7 @@ static void grib_yy_init_buffer ( YY_BUFFER_STATE b, FILE *file  );
 
 YY_BUFFER_STATE grib_yy_scan_buffer ( char *base, grib_yy_size_t size  );
 YY_BUFFER_STATE grib_yy_scan_string ( const char *grib_yy_str  );
-YY_BUFFER_STATE grib_yy_scan_bytes ( const char *bytes, grib_yy_size_t len  );
+YY_BUFFER_STATE grib_yy_scan_bytes ( const char *bytes, int len  );
 
 void *grib_yyalloc ( grib_yy_size_t  );
 void *grib_yyrealloc ( void *, grib_yy_size_t  );
@@ -349,7 +348,7 @@ static void grib_yynoreturn grib_yy_fatal_error ( const char* msg  );
  */
 #define YY_DO_BEFORE_ACTION \
 	(grib_yytext_ptr) = grib_yy_bp; \
-	grib_yyleng = (grib_yy_size_t) (grib_yy_cp - grib_yy_bp); \
+	grib_yyleng = (int) (grib_yy_cp - grib_yy_bp); \
 	(grib_yy_hold_char) = *grib_yy_cp; \
 	*grib_yy_cp = '\0'; \
 	(grib_yy_c_buf_p) = grib_yy_cp;
@@ -1199,8 +1198,8 @@ void _grib_ignore_grib_yyunput_unused_error() { grib_yyunput(0,0); }
  #define GET_INPUT input
 #endif
 
+#line 1201 "gribl.cc"
 #line 1202 "gribl.cc"
-#line 1203 "gribl.cc"
 
 #define INITIAL 0
 
@@ -1239,7 +1238,7 @@ FILE *grib_yyget_out ( void );
 
 void grib_yyset_out  ( FILE * _out_str  );
 
-			grib_yy_size_t grib_yyget_leng ( void );
+			int grib_yyget_leng ( void );
 
 char *grib_yyget_text ( void );
 
@@ -1308,7 +1307,7 @@ static int input ( void );
 	if ( YY_CURRENT_BUFFER_LVALUE->grib_yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		grib_yy_size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( grib_yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -1421,7 +1420,7 @@ YY_DECL
 
 
 
-#line 1424 "gribl.cc"
+#line 1423 "gribl.cc"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -2222,7 +2221,7 @@ YY_RULE_SETUP
 #line 285 "gribl.l"
 ECHO;
 	YY_BREAK
-#line 2225 "gribl.cc"
+#line 2224 "gribl.cc"
 case YY_STATE_EOF(INITIAL):
 	grib_yyterminate();
 
@@ -2409,7 +2408,7 @@ static int grib_yy_get_next_buffer (void)
 
 	else
 		{
-			grib_yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->grib_yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -2423,7 +2422,7 @@ static int grib_yy_get_next_buffer (void)
 
 			if ( b->grib_yy_is_our_buffer )
 				{
-				grib_yy_size_t new_size = b->grib_yy_buf_size * 2;
+				int new_size = b->grib_yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->grib_yy_buf_size += b->grib_yy_buf_size / 8;
@@ -2481,7 +2480,7 @@ static int grib_yy_get_next_buffer (void)
 
 	if (((grib_yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->grib_yy_buf_size) {
 		/* Extend the array by 50%, plus the number we really need. */
-		grib_yy_size_t new_size = (grib_yy_n_chars) + number_to_move + ((grib_yy_n_chars) >> 1);
+		int new_size = (grib_yy_n_chars) + number_to_move + ((grib_yy_n_chars) >> 1);
 		YY_CURRENT_BUFFER_LVALUE->grib_yy_ch_buf = (char *) grib_yyrealloc(
 			(void *) YY_CURRENT_BUFFER_LVALUE->grib_yy_ch_buf, (grib_yy_size_t) new_size  );
 		if ( ! YY_CURRENT_BUFFER_LVALUE->grib_yy_ch_buf )
@@ -2570,7 +2569,7 @@ static int grib_yy_get_next_buffer (void)
 	if ( grib_yy_cp < YY_CURRENT_BUFFER_LVALUE->grib_yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		grib_yy_size_t number_to_move = (grib_yy_n_chars) + 2;
+		int number_to_move = (grib_yy_n_chars) + 2;
 		char *dest = &YY_CURRENT_BUFFER_LVALUE->grib_yy_ch_buf[
 					YY_CURRENT_BUFFER_LVALUE->grib_yy_buf_size + 2];
 		char *source =
@@ -2621,7 +2620,7 @@ static int grib_yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			grib_yy_size_t offset = (grib_yy_c_buf_p) - (grib_yytext_ptr);
+			int offset = (int) ((grib_yy_c_buf_p) - (grib_yytext_ptr));
 			++(grib_yy_c_buf_p);
 
 			switch ( grib_yy_get_next_buffer(  ) )
@@ -2990,12 +2989,12 @@ YY_BUFFER_STATE grib_yy_scan_string (const char * grib_yystr )
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE grib_yy_scan_bytes  (const char * grib_yybytes, grib_yy_size_t  _grib_yybytes_len )
+YY_BUFFER_STATE grib_yy_scan_bytes  (const char * grib_yybytes, int  _grib_yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
 	grib_yy_size_t n;
-	grib_yy_size_t i;
+	int i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = (grib_yy_size_t) (_grib_yybytes_len + 2);
@@ -3037,7 +3036,7 @@ static void grib_yynoreturn grib_yy_fatal_error (const char* msg )
 	do \
 		{ \
 		/* Undo effects of setting up grib_yytext. */ \
-        grib_yy_size_t grib_yyless_macro_arg = (n); \
+        int grib_yyless_macro_arg = (n); \
         YY_LESS_LINENO(grib_yyless_macro_arg);\
 		grib_yytext[grib_yyleng] = (grib_yy_hold_char); \
 		(grib_yy_c_buf_p) = grib_yytext + grib_yyless_macro_arg; \
@@ -3077,7 +3076,7 @@ FILE *grib_yyget_out  (void)
 /** Get the length of the current token.
  * 
  */
-grib_yy_size_t grib_yyget_leng  (void)
+int grib_yyget_leng  (void)
 {
         return grib_yyleng;
 }
diff --git a/src/grib_loader_from_handle.cc b/src/grib_loader_from_handle.cc
index ea85b0310..7b6161310 100644
--- a/src/grib_loader_from_handle.cc
+++ b/src/grib_loader_from_handle.cc
@@ -80,7 +80,7 @@ int grib_init_accessor_from_handle(grib_loader* loader, grib_accessor* ga, grib_
     if (default_value) {
         grib_context_log(h->context, GRIB_LOG_DEBUG, "Copying:  setting %s to default value",
                          ga->name_);
-        ga->pack_expression(grib_arguments_get_expression(h, default_value, 0));
+        ga->pack_expression(default_value->get_expression(h, 0));
     }
 
     if ((ga->flags_ & GRIB_ACCESSOR_FLAG_NO_COPY) ||
diff --git a/src/grib_nearest_factory.cc b/src/grib_nearest_factory.cc
index 6babc985c..9b4d24893 100644
--- a/src/grib_nearest_factory.cc
+++ b/src/grib_nearest_factory.cc
@@ -33,7 +33,7 @@ eccodes::geo_nearest::Nearest* grib_nearest_factory(grib_handle* h, grib_argumen
 {
     size_t i = 0, num_table_entries = 0;
     *error = GRIB_NOT_IMPLEMENTED;
-    char* type = (char*)grib_arguments_get_name(h, args, 0);
+    char* type = (char*)args->get_name(h, 0);
 
     num_table_entries = sizeof(table) / sizeof(table[0]);
     for (i = 0; i < num_table_entries; i++) {
diff --git a/src/grib_nearest_factory.h b/src/grib_nearest_factory.h
index 658abff30..f3831b437 100644
--- a/src/grib_nearest_factory.h
+++ b/src/grib_nearest_factory.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "grib_api_internal.h"
-#include "geo_nearest/grib_nearest.h"
+#include "geo/nearest/grib_nearest.h"
 
 extern eccodes::geo_nearest::Nearest* grib_nearest_healpix;
 extern eccodes::geo_nearest::Nearest* grib_nearest_lambert_azimuthal_equal_area;
diff --git a/src/grib_util.cc b/src/grib_util.cc
index 4a4299e4e..88338fa5f 100644
--- a/src/grib_util.cc
+++ b/src/grib_util.cc
@@ -2015,6 +2015,9 @@ int grib2_choose_PDTN(int current_PDTN, bool is_det, bool is_instant)
         if (is_interval && is_ens) return 85;
         if (is_interval && is_det) return 46;
     }
+    if (current_PDTN == 50) {
+        if (is_instant && is_ens) return 45;
+    }
 
     return current_PDTN;  // no change
 }
@@ -2103,7 +2106,7 @@ int grib2_select_PDTN(int is_eps, int is_instant,
         }
         else {
             if (is_instant)
-                return 50; // 44 is deprecated, 50 is the corrected template
+                return 50; // ECC-1963: 44 is deprecated
             else
                 return 46;
         }
diff --git a/src/grib_yacc.cc b/src/grib_yacc.cc
index c8a774711..d59f471d0 100644
--- a/src/grib_yacc.cc
+++ b/src/grib_yacc.cc
@@ -2459,7 +2459,7 @@ grib_yyreduce:
 
   case 35: /* arguments: argument ',' arguments  */
 #line 319 "griby.y"
-                                       { (grib_yyvsp[-2].explist)->next = (grib_yyvsp[0].explist); (grib_yyval.explist) = (grib_yyvsp[-2].explist); }
+                                       { (grib_yyvsp[-2].explist)->next_ = (grib_yyvsp[0].explist); (grib_yyval.explist) = (grib_yyvsp[-2].explist); }
 #line 2464 "y.tab.c"
     break;
 
@@ -2594,7 +2594,7 @@ grib_yyreduce:
     {
       /* ECC-485: Set length to 0 and prepend the new argument */
       grib_arguments* a = grib_arguments_new(grib_parser_context, new_accessor_expression(grib_parser_context,(grib_yyvsp[-5].str),0,0),NULL);
-      a->next = (grib_yyvsp[-2].explist);
+      a->next_ = (grib_yyvsp[-2].explist);
       (grib_yyval.act) = grib_action_create_gen(grib_parser_context, (grib_yyvsp[-3].str), "codetable",
                                   0, a, /* length=0 and additional argument */
                                   (grib_yyvsp[-1].explist), (grib_yyvsp[0].lval), NULL, NULL);
@@ -2958,7 +2958,7 @@ grib_yyreduce:
         new_accessor_expression(grib_parser_context,(grib_yyvsp[-3].str),0,0),
 		NULL
         );
-      a->next=(grib_yyvsp[-1].explist);
+      a->next_=(grib_yyvsp[-1].explist);
       (grib_yyval.act) = grib_action_create_meta(grib_parser_context,
       "ITERATOR","iterator",a,NULL,
       GRIB_ACCESSOR_FLAG_HIDDEN|GRIB_ACCESSOR_FLAG_READ_ONLY,NULL); free((grib_yyvsp[-3].str));
@@ -2974,7 +2974,7 @@ grib_yyreduce:
         new_accessor_expression(grib_parser_context,(grib_yyvsp[-3].str),0,0),
 		NULL
         );
-      a->next=(grib_yyvsp[-1].explist);
+      a->next_=(grib_yyvsp[-1].explist);
       (grib_yyval.act) = grib_action_create_meta(grib_parser_context,
       "NEAREST","nearest",a,NULL,
       GRIB_ACCESSOR_FLAG_HIDDEN|GRIB_ACCESSOR_FLAG_READ_ONLY,NULL); free((grib_yyvsp[-3].str));
@@ -2990,7 +2990,7 @@ grib_yyreduce:
         new_accessor_expression(grib_parser_context,(grib_yyvsp[-3].str),0,0),
 		NULL
         );
-      a->next=(grib_yyvsp[-1].explist);
+      a->next_=(grib_yyvsp[-1].explist);
       (grib_yyval.act) = grib_action_create_meta(grib_parser_context,
       "BOX","box",a,NULL,
       GRIB_ACCESSOR_FLAG_HIDDEN|GRIB_ACCESSOR_FLAG_READ_ONLY,NULL); free((grib_yyvsp[-3].str));
diff --git a/src/griby.y b/src/griby.y
index 823b24c17..8e330938a 100644
--- a/src/griby.y
+++ b/src/griby.y
@@ -316,7 +316,7 @@ argument_list: empty       { $$ = 0; }
               ;
 
 arguments: argument
-              | argument ',' arguments { $1->next = $3; $$ = $1; }
+              | argument ',' arguments { $1->next_ = $3; $$ = $1; }
               ;
 
 argument: expression { $$ = grib_arguments_new(grib_parser_context,$1,NULL); }
@@ -388,7 +388,7 @@ simple: UNSIGNED '[' INTEGER ']'   IDENT   default flags
     {
       /* ECC-485: Set length to 0 and prepend the new argument */
       grib_arguments* a = grib_arguments_new(grib_parser_context, new_accessor_expression(grib_parser_context,$3,0,0),NULL);
-      a->next = $6;
+      a->next_ = $6;
       $$ = grib_action_create_gen(grib_parser_context, $5, "codetable",
                                   0, a, /* length=0 and additional argument */
                                   $7, $8, NULL, NULL);
@@ -575,7 +575,7 @@ simple: UNSIGNED '[' INTEGER ']'   IDENT   default flags
         new_accessor_expression(grib_parser_context,$2,0,0),
 		NULL
         );
-      a->next=$4;
+      a->next_=$4;
       $$ = grib_action_create_meta(grib_parser_context,
       "ITERATOR","iterator",a,NULL,
       GRIB_ACCESSOR_FLAG_HIDDEN|GRIB_ACCESSOR_FLAG_READ_ONLY,NULL); free($2);
@@ -587,7 +587,7 @@ simple: UNSIGNED '[' INTEGER ']'   IDENT   default flags
         new_accessor_expression(grib_parser_context,$2,0,0),
 		NULL
         );
-      a->next=$4;
+      a->next_=$4;
       $$ = grib_action_create_meta(grib_parser_context,
       "NEAREST","nearest",a,NULL,
       GRIB_ACCESSOR_FLAG_HIDDEN|GRIB_ACCESSOR_FLAG_READ_ONLY,NULL); free($2);
@@ -599,7 +599,7 @@ simple: UNSIGNED '[' INTEGER ']'   IDENT   default flags
         new_accessor_expression(grib_parser_context,$2,0,0),
 		NULL
         );
-      a->next=$4;
+      a->next_=$4;
       $$ = grib_action_create_meta(grib_parser_context,
       "BOX","box",a,NULL,
       GRIB_ACCESSOR_FLAG_HIDDEN|GRIB_ACCESSOR_FLAG_READ_ONLY,NULL); free($2);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index acd134c8d..94b84ba28 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -112,7 +112,6 @@ if( HAVE_BUILD_TOOLS )
         grib_generalised_tiles
         # grib_true_imagery
         grib2_wave_spectra
-        grib_element
         grib_suppressed
         grib_destine_mars_keys
         grib_2nd_order_numValues
@@ -174,6 +173,7 @@ if( HAVE_BUILD_TOOLS )
     # and/or take much longer
     list(APPEND tests_extra
         grib_data_quality_checks
+        grib_check_message_validity
         grib_update_sections_lengths
         grib_units_bias_factor
         grib_set_large_message_fail
@@ -182,6 +182,7 @@ if( HAVE_BUILD_TOOLS )
         grib_bpv_limit
         grib_complex
         grib_double_cmp
+        grib_element
         grib_change_packing
         grib_run_length_packing
         grib_grid_space_view
@@ -261,7 +262,9 @@ if( HAVE_BUILD_TOOLS )
         bufr_ecc-1476
         bufr_ecc-1623
         bufr_ecc-1785
+        bufr_ecc-1958
         bufr_ecc-1938
+        grib_488
         grib_ecc-490
         grib_ecc-756
         grib_ecc-806
diff --git a/tests/bufr_ecc-1028.sh b/tests/bufr_ecc-1028.sh
index 36016648a..f759f7fe5 100755
--- a/tests/bufr_ecc-1028.sh
+++ b/tests/bufr_ecc-1028.sh
@@ -24,7 +24,7 @@ status=$?
 set -e
 [ $status -ne 0 ]
 # Check error message
-grep -q "Delayed replication: 101000: expected 1 but only found 0 elements" $tempError
+grep -q "Delayed replication: 101000: expected 1 but only found 0 element(s)" $tempError
 
 
 rm -f $tempFilt $tempError
diff --git a/tests/bufr_ecc-1958.sh b/tests/bufr_ecc-1958.sh
new file mode 100755
index 000000000..0a5a92c69
--- /dev/null
+++ b/tests/bufr_ecc-1958.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+# (C) Copyright 2005- ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+# 
+# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+#
+
+. ./include.ctest.sh
+
+REDIRECT=/dev/null
+
+label="bufr_ecc-1958_test"
+tempBufr=temp.$label.bufr
+tempFilt=temp.$label.filt
+tempLog=temp.$label.log
+tempOut=temp.$label.txt
+tempRef=temp.$label.ref
+
+sample_bufr4=$ECCODES_SAMPLES_PATH/BUFR4.tmpl
+
+# 005074 indexInRangeDirection
+# 005075 indexInAzimuthalDirection
+# 008085 beamIdentifier
+# 022161 waveSpectra
+# 002134 antennaBeamAzimuth
+
+cat >$tempFilt<<EOF
+ set numberOfSubsets = 1;
+ set inputExtendedDelayedDescriptorReplicationFactor = {32};
+ set masterTablesVersionNumber = 41;
+ set updateSequenceNumber = 0;
+ set bufrHeaderSubCentre = 0;
+ set unexpandedDescriptors = { 109000,31002,5074,107024,5075,8085,22161,8085,102003,2134,22161 };
+ write;
+EOF
+${tools_dir}/codes_bufr_filter -o $tempBufr $tempFilt $sample_bufr4
+
+# Check descriptor dump
+${tools_dir}/bufr_dump -d $tempBufr > $tempOut
+c=$( grep -c -w antennaBeamAzimuth $tempOut )
+[ $c -eq 72 ]
+
+# Check full dump
+${tools_dir}/bufr_dump -p $tempBufr > $tempOut
+c=$( grep -c -w indexInRangeDirection $tempOut )
+[ $c -eq 32 ]
+
+# 32*24   = 768
+c=$( grep -c -w indexInAzimuthalDirection $tempOut )
+[ $c -eq 768 ]
+
+# 32*24*3 = 2304
+c=$( grep -c -w antennaBeamAzimuth $tempOut )
+[ $c -eq 2304 ]
+
+
+# Clean up
+rm -f $tempBufr $tempFilt $tempLog $tempOut $tempRef
diff --git a/tests/codes_assert.sh b/tests/codes_assert.sh
index 1bd5c878d..cea933d81 100755
--- a/tests/codes_assert.sh
+++ b/tests/codes_assert.sh
@@ -12,6 +12,11 @@
 
 label="codes_assert_test"
 
+if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
+    echo "$0: This test is currently disabled on Windows"
+    exit 0
+fi
+
 tempOut=temp.$label.txt
 sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
 
@@ -23,7 +28,7 @@ cat $def_dir/grib2/boot.def > $bootfile
 echo 'assert( year == 1990 );' >> $bootfile
 echo >> $bootfile
 
-export ECCODES_DEFINITION_PATH=$PWD/$tempDir/definitions
+export ECCODES_DEFINITION_PATH=$PWD/$tempDir/definitions:$ECCODES_DEFINITION_PATH
 # This will activate the print statement above
 ${tools_dir}/grib_set -s year=1990 $sample_grib2 /dev/null
 
diff --git a/tests/codes_ecc-1929.sh b/tests/codes_ecc-1929.sh
index c7ed04d3e..114e6bb87 100755
--- a/tests/codes_ecc-1929.sh
+++ b/tests/codes_ecc-1929.sh
@@ -12,6 +12,11 @@
 
 label="codes_ecc-1929_test"
 
+if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
+    echo "$0: This test is currently disabled on Windows"
+    exit 0
+fi
+
 tempOut=temp.$label.txt
 sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
 
@@ -23,7 +28,7 @@ cat $def_dir/grib2/boot.def > $bootfile
 echo 'print "DEBUG: [gridType=] [typeOfLevel=]";' >> $bootfile
 echo >> $bootfile
 
-export ECCODES_DEFINITION_PATH=$PWD/$tempDir/definitions
+export ECCODES_DEFINITION_PATH=$PWD/$tempDir/definitions:$ECCODES_DEFINITION_PATH
 # This will activate the print statement above
 ${tools_dir}/grib_get -p edition $sample_grib2 > $tempOut
 grep -q "DEBUG: gridType=regular_ll typeOfLevel=surface" $tempOut
diff --git a/tests/grib2_chemicals_aerosols.sh b/tests/grib2_chemicals_aerosols.sh
index 61dd06455..5fef16643 100755
--- a/tests/grib2_chemicals_aerosols.sh
+++ b/tests/grib2_chemicals_aerosols.sh
@@ -56,7 +56,7 @@ grib_check_key_equals $temp productDefinitionTemplateNumber '57'
 grib_check_key_equals $temp constituentType,numberOfModeOfDistribution,modeNumber '0 0 0'
 
 # Plain aerosols
-${tools_dir}/grib_set -s is_aerosol=1 $sample2 $temp
+${tools_dir}/grib_set -s tablesVersion=$latest,is_aerosol=1 $sample2 $temp
 grib_check_key_equals $temp productDefinitionTemplateNumber '50'
 grib_check_key_equals $temp aerosolType,typeOfSizeInterval '0 0'
 
diff --git a/tests/grib_488.sh b/tests/grib_488.sh
new file mode 100755
index 000000000..ce481056f
--- /dev/null
+++ b/tests/grib_488.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+# (C) Copyright 2005- ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+# 
+# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+#
+
+. ./include.ctest.sh
+
+# ---------------------------------------------------------
+# This is the test for the JIRA issue GRIB-488
+# GRIB2: step calculation for typeOfTimeIncrement=1
+# ---------------------------------------------------------
+
+label="grib-488_test"
+tempGrib=temp.$label.grib
+tempFilt=temp.$label.filt
+
+sample_grib2=$ECCODES_SAMPLES_PATH/reduced_gg_pl_80_grib2.tmpl
+
+cat >$tempFilt<<EOF
+    set marsClass = 'em';
+    set marsType  = 'fc';
+    set marsStream = 'edmm';
+    set experimentVersionNumber = '1605';
+    set productDefinitionTemplateNumber = 11;
+    set yearOfEndOfOverallTimeInterval  = 1900;
+    set monthOfEndOfOverallTimeInterval = 1;
+    set dayOfEndOfOverallTimeInterval   = 1;
+    set hourOfEndOfOverallTimeInterval = 0;
+    set numberOfMissingInStatisticalProcess = 31;
+    set typeOfStatisticalProcessing = 0;
+    set typeOfTimeIncrement = 1;
+    set lengthOfTimeRange = 3;
+    set indicatorOfUnitForTimeIncrement = 1;
+    set timeIncrement = 24;
+
+    print "[stepRange=]   [mars.step=]";
+    write;
+EOF
+${tools_dir}/grib_filter -o $tempGrib $tempFilt $sample_grib2
+grib_check_key_equals $tempGrib stepRange,mars.step "0-3 3"
+
+
+# Clean up
+rm -f $tempGrib $tempFilt
diff --git a/tests/grib_bitmap.sh b/tests/grib_bitmap.sh
index e78ccc897..35df405e9 100755
--- a/tests/grib_bitmap.sh
+++ b/tests/grib_bitmap.sh
@@ -246,6 +246,12 @@ ${tools_dir}/grib_set -r -s packingType=grid_complex_spatial_differencing $temp2
 stats=`${tools_dir}/grib_get -F%.2f -p max,min,avg $temp2`
 [ "$stats" = '549.61 11.61 203.28'  ]
 
+# ECC-1968
+# ---------
+in=${data_dir}/grid_complex_spatial_differencing.grib2
+${tools_dir}/grib_set -s setBitsPerValue=28 $in $temp2
+grib_check_key_equals $temp2 bitsPerValue 24 # Update this once wgrib2 fixes this bug
+
 # Clean up for ECC-1858
 rm -f $in_with_bitmap $in_no_bitmap
 rm -f $tempSimple
diff --git a/tests/grib_check_message_validity.sh b/tests/grib_check_message_validity.sh
new file mode 100755
index 000000000..73496c491
--- /dev/null
+++ b/tests/grib_check_message_validity.sh
@@ -0,0 +1,56 @@
+#!/bin/sh
+# (C) Copyright 2005- ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+
+. ./include.ctest.sh
+
+label="grib_check_message_validity_test"
+tempGrib=temp.$label.grib
+tempText=temp.$label.txt
+tempFilt=temp.$label.filt
+
+sample=$ECCODES_SAMPLES_PATH/reduced_gg_pl_32_grib2.tmpl
+grib_check_key_equals $sample   isMessageValid 1
+
+# Check reduced Gaussian grid Ni
+# ------------------------------
+cat >$tempFilt<<EOF
+   set Ni = 0; # illegal
+   assert ( isMessageValid == 0 );
+   set Ni = MISSING;
+   assert ( isMessageValid == 1 );
+   set Ni = 0; # illegal again
+   write;
+EOF
+${tools_dir}/grib_filter -o $tempGrib $tempFilt $sample 2>$tempText
+grep -q "Invalid Ni" $tempText
+grib_check_key_equals $tempGrib isMessageValid 0
+grib_check_key_equals $sample   isMessageValid 1
+
+# Check reduced Gaussian grid pl
+# ------------------------------
+cat >$tempFilt<<EOF
+   meta pl_elem4 element(pl, 4);
+   set pl_elem4 = 0;
+   assert ( isMessageValid == 0 );
+   write;
+EOF
+${tools_dir}/grib_filter -o $tempGrib $tempFilt $sample 2>$tempText
+grep -q "Invalid PL array" $tempText
+grib_check_key_equals $tempGrib isMessageValid 0
+
+
+# Check data values
+# ------------------------------
+${tools_dir}/grib_set -s bitsPerValue=25 $data_dir/sample.grib2 $tempGrib
+grib_check_key_equals $tempGrib isMessageValid 0 2>$tempText
+grep -q "Data section size mismatch" $tempText
+
+
+# Clean up
+rm -f $tempGrib $tempText $tempFilt
diff --git a/tests/grib_check_param_concepts.cc b/tests/grib_check_param_concepts.cc
index e46cbce0c..319217546 100644
--- a/tests/grib_check_param_concepts.cc
+++ b/tests/grib_check_param_concepts.cc
@@ -12,24 +12,11 @@
  * Check GRIB2 parameter concept file e.g. shortName.def, paramId.def
  */
 
+#include "expression/grib_expression_class_long.h"
+#include "expression/grib_expression_class_functor.h"
+#include "expression/grib_expression_class_string.h"
 #include "grib_api_internal.h"
 
-typedef struct grib_expression_long {
-    grib_expression base;
-    long value;
-} grib_expression_long;
-
-typedef struct grib_expression_functor {
-    grib_expression base;
-    char* name;
-    grib_arguments* args;
-} grib_expression_functor;
-
-typedef struct grib_expression_string {
-    grib_expression base;
-    char* value;
-} grib_expression_string;
-
 static int type_of_surface_missing(const char* name, const char* value)
 {
     /* Surface Type is Code Table 4.5 in which 255 is the same as missing */
@@ -95,26 +82,30 @@ static int grib_check_param_concepts(const char* key, const char* filename)
             }
         }
         while (concept_condition) {
-            char condition_value[512] = {0,};
-            grib_expression* expression = concept_condition->expression;
+            char condition_value[512] = {0, };
+            eccodes::Expression* expression = concept_condition->expression;
             const char* condition_name  = concept_condition->name;
             /* printf("%s\n", concept_value->name); */
             /* condition_name is discipline, parameterCategory etc. */
-            if (strcmp(expression->cclass->name, "long") == 0) {
-                grib_expression_long* el = (grib_expression_long*)expression;
-                snprintf(condition_value, sizeof(condition_value), "%ld", el->value);
+            if (strcmp(expression->class_name(), "long") == 0) {
+                eccodes::expression::Long* el = dynamic_cast<eccodes::expression::Long*>(expression);
+                long value;
+                el->evaluate_long(NULL, &value);
+                snprintf(condition_value, sizeof(condition_value), "%ld", value);
             }
-            else if (strcmp(expression->cclass->name, "functor") == 0) {
-                grib_expression_functor* ef = (grib_expression_functor*)expression;
-                snprintf(condition_value, sizeof(condition_value), "%s", ef->name);
+            else if (strcmp(expression->class_name(), "functor") == 0) {
+                eccodes::expression::Functor* ef = dynamic_cast<eccodes::expression::Functor*>(expression);
+                snprintf(condition_value, sizeof(condition_value), "%s", ef->name());
             }
-            else if (strcmp(expression->cclass->name, "string") == 0) {
-                grib_expression_string* es = (grib_expression_string*)expression;
-                snprintf(condition_value, sizeof(condition_value), "%s", es->value);
+            else if (strcmp(expression->class_name(), "string") == 0) {
+                eccodes::expression::String* es = dynamic_cast<eccodes::expression::String*>(expression);
+                int error;
+                const char* value = es->evaluate_string(NULL, NULL, NULL, &error);
+                snprintf(condition_value, sizeof(condition_value), "%s", value);
             }
             else {
                 fprintf(stderr, "%s %s: Unknown class name: '%s'\n",
-                        key, concept_value->name, expression->cclass->name);
+                        key, concept_value->name, expression->class_name());
                 Assert(0);
             }
             if (!isLocal && strcmp(condition_name, "localTablesVersion") == 0) {
diff --git a/tests/grib_check_param_concepts.sh b/tests/grib_check_param_concepts.sh
index 77f5ecc22..c55aa627e 100755
--- a/tests/grib_check_param_concepts.sh
+++ b/tests/grib_check_param_concepts.sh
@@ -68,7 +68,7 @@ set -e
 # First check the GRIB2 paramId.def and shortName.def
 # ----------------------------------------------------
 $EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/grib2/paramId.def
-datasets="ecmf uerra cerise hydro s2s tigge era6 destine era"
+datasets="ecmf uerra cerise hydro s2s tigge era6 destine era nextgems"
 for a_dataset in $datasets; do
     $EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/grib2/localConcepts/$a_dataset/paramId.def
 done
diff --git a/tests/grib_destine_mars_keys.sh b/tests/grib_destine_mars_keys.sh
index dc24677a8..1c38e665b 100755
--- a/tests/grib_destine_mars_keys.sh
+++ b/tests/grib_destine_mars_keys.sh
@@ -97,5 +97,18 @@ ${tools_dir}/grib_ls -jm $temp_grib_a
 ${tools_dir}/grib_set -s productionStatusOfProcessedData=12 $sample_grib2 $temp_grib_a
 ${tools_dir}/grib_compare -b productionStatusOfProcessedData $sample_grib2 $temp_grib_a
 
+# ECC-1832 On-Demand DT metadata
+# Check setting dataset to on-demand-extremes-dt (4). Check keys are present and equal defaults
+${tools_dir}/grib_set -s dataset=4 $destine_sample $temp_grib_a
+
+grib_check_key_exists $temp_grib_a dataset,georef
+grib_check_key_equals $temp_grib_a "dataset,dataset:s,georef,mars.georef" "4 on-demand-extremes-dt s0000000 s0000000"
+
+# Check an example where a few additional things are set in on-demand-extremes-dt
+
+${tools_dir}/grib_set -s dataset=4,georef=gcpkd2eu $destine_sample $temp_grib_a
+
+grib_check_key_equals $temp_grib_a "georef" "gcpkd2eu"
+
 # Clean up
 rm -f $temp_grib_a $temp_grib_b $destine_sample
diff --git a/tests/grib_dump_debug.sh b/tests/grib_dump_debug.sh
index f220cea10..b7a5c57df 100755
--- a/tests/grib_dump_debug.sh
+++ b/tests/grib_dump_debug.sh
@@ -31,8 +31,6 @@ reduced_gaussian_pressure_level.grib1
 reduced_gaussian_pressure_level_constant.grib1
 reduced_gaussian_sub_area.grib1
 reduced_gaussian_surface.grib1
-reduced_latlon_surface.grib1
-reduced_latlon_surface_constant.grib1
 reference_ensemble_mean.grib1
 reference_stdev.grib1
 regular_gaussian_model_level.grib1
@@ -55,8 +53,6 @@ reduced_gaussian_pressure_level.grib2
 reduced_gaussian_pressure_level_constant.grib2
 reduced_gaussian_sub_area.grib2
 reduced_gaussian_surface.grib2
-reduced_latlon_surface.grib2
-reduced_latlon_surface_constant.grib2
 regular_gaussian_model_level.grib2
 regular_gaussian_pressure_level.grib2
 regular_gaussian_pressure_level_constant.grib2
diff --git a/tests/grib_element.sh b/tests/grib_element.sh
index 8297e09c8..193ef8a41 100755
--- a/tests/grib_element.sh
+++ b/tests/grib_element.sh
@@ -11,6 +11,7 @@
 . ./include.ctest.sh
 
 label="grib_element_test"
+tempGrib=temp.${label}.grib
 tempRef=temp.${label}.ref
 tempText=temp.${label}.txt
 tempFilt=temp.${label}.filt
@@ -72,6 +73,25 @@ status=$?
 set -e
 [ $status -ne 0 ]
 
+# Encode a single double element in an array
+input=$data_dir/sample.grib2
+cat > $tempFilt <<EOF
+    print "Before:  [min=] [max=]";
+    transient avg1 = avg;
+    transient max1 = max;
+    meta elemN element(values, -1);
+    assert( elemN < 301 );
+    print "Last elem was: [elemN:d]";
+    set elemN = 312; # Pass in an integer. Should call pack_double
+    print "Last elem now: [elemN:d]";
+    print "After:  [min=] [max=]";
+    assert( elemN > 310 );
+    assert ( avg > avg1 );
+    assert ( max > max1 );
+    write;
+EOF
+${tools_dir}/grib_filter -o $tempGrib $tempFilt $input
+
 
 # Clean up
-rm -f $tempRef $tempText $tempFilt
+rm -f $tempRef $tempText $tempFilt $tempGrib
diff --git a/tests/grib_keys_iter.cc b/tests/grib_keys_iter.cc
index 4becf79c7..0e93fefde 100644
--- a/tests/grib_keys_iter.cc
+++ b/tests/grib_keys_iter.cc
@@ -39,9 +39,15 @@ int main(int argc, char* argv[])
             GRIB_CHECK(grib_get_native_type(h, name, &type), 0);
             Assert( type > 0 && type < 7 );
             int ktype = grib_keys_iterator_get_native_type(kiter);
-            Assert(type == ktype);
+            if (type != ktype) {
+                fprintf(stderr, "ERROR: key=%s type=%s ktype=%s\n", name, grib_get_type_name(type), grib_get_type_name(ktype));
+                return 1;
+            }
             const char* type_name = grib_get_type_name(type);
-            Assert( !STR_EQUAL(type_name, "unknown") );
+            if (STR_EQUAL(type_name, "unknown")) {
+                fprintf(stderr, "ERROR: key=%s type is unknown!\n", name);
+                return 1;
+            }
             printf("%s = %s (%d)\n", name, type_name, type);
 
             if (STR_EQUAL(type_name, "label")) {
@@ -59,6 +65,19 @@ int main(int argc, char* argv[])
                 int e = grib_keys_iterator_get_long(kiter, &lVal, &llen);
                 Assert(!e);
                 Assert(lVal == 1 || lVal == 2);
+                Assert(codes_key_is_computed(h, name, &e) == 0 && !e);
+            }
+            if (STR_EQUAL(name, "gridType")) {
+                int e = 0;
+                Assert(codes_key_is_computed(h, name, &e) == 1 && !e);
+            }
+            if (STR_EQUAL(name, "longitudeOfLastGridPointInDegrees")) {
+                int e = 0;
+                Assert(codes_key_is_computed(h, name, &e) == 1 && !e);
+            }
+            if (STR_EQUAL(name, "longitudeOfLastGridPoint")) {
+                int e = 0;
+                Assert(codes_key_is_computed(h, name, &e) == 0 && !e);
             }
         }
 
diff --git a/tests/grib_modelName.sh b/tests/grib_modelName.sh
index d0dde3cc4..598ac974f 100755
--- a/tests/grib_modelName.sh
+++ b/tests/grib_modelName.sh
@@ -14,6 +14,7 @@
 
 label="grib_modelName_test"
 tempGrib=temp.$label.grib
+temp2Grib=temp2.$label.grib
 tempFilt=temp.$label.filt
 tempLog=temp.$label.log
 tempOut=temp.$label.txt
@@ -30,6 +31,18 @@ grib_check_key_equals $tempGrib modelName,modelVersion "IFS cy48r1"
 ${tools_dir}/grib_set -s generatingProcessIdentifier=100 $sample $tempGrib
 grib_check_key_equals $tempGrib modelName,modelVersion "IFS unknown"
 
+# Check that this only works for centre ecmf
+${tools_dir}/grib_set -s generatingProcessIdentifier=1,backgroundProcess=1,centre=84 $sample $tempGrib
+[ $( ${tools_dir}/grib_get -f -p modelName $tempGrib ) = "not_found" ]
+[ $( ${tools_dir}/grib_get -f -p modelVersion $tempGrib ) = "not_found" ]
+
+# Check that it works for pseudocentres (e.g. DestinE)
+${tools_dir}/grib_set -s generatingProcessIdentifier=1,backgroundProcess=3,productionStatusOfProcessedData=13 $sample $tempGrib
+grib_check_key_equals $tempGrib modelName,modelVersion "ALARO cy46h1"
+${tools_dir}/grib_set -s productionStatusOfProcessedData=0 $tempGrib $temp2Grib
+[ $( ${tools_dir}/grib_get -f -p modelName $temp2Grib ) = "unknown" ]
+[ $( ${tools_dir}/grib_get -f -p modelVersion $temp2Grib ) = "not_found" ]
+
 # Keys are read-only (may change this later)
 set +e
 ${tools_dir}/grib_set -s modelName=AIFS $sample $tempGrib 2>$tempLog
diff --git a/tests/grib_second_order.sh b/tests/grib_second_order.sh
index 0d44a87cb..241f4af7c 100755
--- a/tests/grib_second_order.sh
+++ b/tests/grib_second_order.sh
@@ -210,6 +210,18 @@ ${tools_dir}/grib_set -s scaleValuesBy=1.01 $input $temp1
 ${tools_dir}/grib_dump $temp1
 grib_check_key_equals $temp1 packingType grid_second_order
 
+# ECC-1986: GRIB1: Setting field values in second order packing
+cat > $tempFilt<<EOF
+  if (count==1) {
+    # min = 19074.9, max = 20717.6
+    assert( min < 20000 );
+    set offsetValuesBy = 1000.0;
+    assert( min > 20000 );
+  }
+EOF
+input=lfpw.grib1
+${tools_dir}/grib_filter $tempFilt $input
+
 
 # Clean up
 rm -f $temp_stat1 $temp_stat2
diff --git a/tests/grib_spectral.sh b/tests/grib_spectral.sh
index c55c9239d..df3bf43f0 100755
--- a/tests/grib_spectral.sh
+++ b/tests/grib_spectral.sh
@@ -12,21 +12,49 @@
 
 label="grib_spectral_test"
 
-output=output.$label.grib
+tempFilt=temp.${label}.filt
+tempGrib=temp.${label}.grib
+
 input_complex=$ECCODES_SAMPLES_PATH/sh_ml_grib2.tmpl
 
-$EXEC ${test_dir}/grib_spectral $input_complex $output
+$EXEC ${test_dir}/grib_spectral $input_complex $tempGrib
 
-rm -f $output
+rm -f $tempGrib
 
 # Now try spectral simple
-input_simple=$label.simple.grib
-${tools_dir}/grib_set  -rs packingType=spectral_simple $input_complex $input_simple
-$EXEC ${test_dir}/grib_spectral $input_simple $output
+tempSimple=temp.$label.simple.grib
+${tools_dir}/grib_set  -rs packingType=spectral_simple $input_complex $tempSimple
+$EXEC ${test_dir}/grib_spectral $tempSimple $tempGrib
 
 # GRIB1: octet_number pack_long
 input_complex=$ECCODES_SAMPLES_PATH/sh_ml_grib1.tmpl
-${tools_dir}/grib_set  -s Nassigned=1 $input_complex $output
+${tools_dir}/grib_set  -s Nassigned=1 $input_complex $tempGrib
 
+# Encode a spectral sample starting from GRIB2.tmpl
+sample2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
+cat > $tempFilt <<EOF
+    set numberOfDataPoints = 6;
+    set numberOfValues = 6;
+    set bitsPerValue = 16;
+    set values = {33, 0, 1, 0, 2, 0};
+    set typeOfFirstFixedSurface = 105;
+    set scaleFactorOfFirstFixedSurface = 0;
+    set scaledValueOfFirstFixedSurface = 0;
 
-rm -f $output $input_simple
+    set gridDefinitionTemplateNumber=50;
+    set J=1;
+    set K=1;
+    set M=1;
+    set spectralType = 1;
+    set spectralMode = 1;
+
+    set dataRepresentationTemplateNumber=51;
+    write;
+EOF
+${tools_dir}/grib_filter -o $tempGrib $tempFilt $sample2
+${tools_dir}/grib_get_data $tempGrib
+${tools_dir}/grib_dump $tempGrib
+grib_check_key_equals $tempGrib packingType spectral_complex
+grib_check_key_equals $tempGrib gridType sh
+
+rm -f $tempSimple $tempFilt $tempGrib
diff --git a/tests/grib_step.sh b/tests/grib_step.sh
index 9fc7f9abe..274f1f7ab 100755
--- a/tests/grib_step.sh
+++ b/tests/grib_step.sh
@@ -118,6 +118,12 @@ grib_check_key_equals $temp productDefinitionTemplateNumber,typeOfStatisticalPro
 ${tools_dir}/grib_set -s stepType=mode,paramId=260320     $grib2_sample $temp
 grib_check_key_equals $temp productDefinitionTemplateNumber,typeOfStatisticalProcessing '8 101'
 
+# ECC-1991: stepType for index processing
+# -----------------------------------------
+${tools_dir}/grib_set -s stepType=index $grib2_sample $temp
+grib_check_key_equals $temp productDefinitionTemplateNumber,typeOfStatisticalProcessing '8 102'
+
+
 # ECC-1577: stepType when typeOfTimeIncrement=255
 # -----------------------------------------------
 ${tools_dir}/grib_set -s stepType=accum,typeOfTimeIncrement=255 $grib2_sample $temp
diff --git a/tests/list_codetable_flagtable_keys.cc b/tests/list_codetable_flagtable_keys.cc
index 3d2d5da71..cf7b27144 100644
--- a/tests/list_codetable_flagtable_keys.cc
+++ b/tests/list_codetable_flagtable_keys.cc
@@ -65,7 +65,7 @@ static void print_names(grib_action* a)
             grib_action_gen* ag = (grib_action_gen*)a;
             if (strcmp(a->op,"codetable")==0 || strcmp(a->op,"codeflag")==0) {
                 printf("%s", a->name);
-                table = grib_arguments_get_string(NULL, ag->params, 0);
+                table = ag->params->get_string(NULL, 0);
                 if (table) printf("\t%s=%s", a->op, table);
                 printf("\n");
             }
diff --git a/tests/unit_tests.cc b/tests/unit_tests.cc
index bca6b2555..d0838fa4b 100644
--- a/tests/unit_tests.cc
+++ b/tests/unit_tests.cc
@@ -114,6 +114,22 @@ static void test_gaussian_latitudes(int order)
     free(lats);
 }
 
+static void test_grib_get_reduced_row_legacy()
+{
+    printf("Running %s ...\n", __func__);
+    long npoints=0, ilon_first=0, ilon_last=0;
+
+    grib_get_reduced_row_legacy(25, 0.0, 100.0, &npoints, &ilon_first, &ilon_last);
+    // printf("Result: npoints=%ld, ilon_first=%ld, ilon_last=%ld\n", npoints, ilon_first, ilon_last);
+
+    grib_get_reduced_row_legacy(25, 90.0, 100.0, &npoints, &ilon_first, &ilon_last);
+    grib_get_reduced_row_legacy(25, 295.0, 300.0, &npoints, &ilon_first, &ilon_last);
+    grib_get_reduced_row_legacy(25, -20.0, 30.0, &npoints, &ilon_first, &ilon_last);
+    grib_get_reduced_row_legacy(25, 301, 300.0, &npoints, &ilon_first, &ilon_last);
+    grib_get_reduced_row_legacy(200, 0.0, 359.0, &npoints, &ilon_first, &ilon_last);
+}
+
+
 static void test_gaussian_latitude_640()
 {
     printf("Running %s ...\n", __func__);
@@ -842,9 +858,7 @@ static void test_grib_get_binary_scale_fact()
 {
     printf("Running %s ...\n", __func__);
     int err = 0;
-    long result = grib_get_binary_scale_fact(INFINITY, 0, 0, &err);
-    Assert( err == GRIB_OUT_OF_RANGE);
-    Assert( result == 0 );
+    long result = 0;
 
     result = grib_get_binary_scale_fact(100, 0, 65, &err); // bpv too big
     Assert( err == GRIB_OUT_OF_RANGE);
@@ -868,6 +882,8 @@ int main(int argc, char** argv)
     codes_print_api_version(stdout);
     printf("\n");
 
+    test_grib_get_reduced_row_legacy();
+
     test_codes_context_set_debug();
     test_codes_get_error_message();
     test_grib_get_binary_scale_fact();
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 9cb1eec4e..0a3ee9486 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -24,6 +24,9 @@ ecbuild_add_library( TARGET    ecc_tools
                      NOINSTALL
                      SOURCES   ${ecc_tools_sources}
                      PRIVATE_LIBS      eccodes )
+if( eccodes_HAVE_ECKIT_GEO )
+    target_link_libraries( ecc_tools PRIVATE eckit )
+endif()
 
 # tools binaries
 list( APPEND ecc_tools_binaries
diff --git a/tools/codes_export_resource.cc b/tools/codes_export_resource.cc
index 98ba7712d..afb93cc9d 100644
--- a/tools/codes_export_resource.cc
+++ b/tools/codes_export_resource.cc
@@ -108,7 +108,8 @@ int main(int argc, char* argv[])
     grib_context_free(c, full_path);
 
     if (read_count == 0) {
-        fprintf(stderr, "Error: Number of bytes read == 0. Please check the path refers to a file.\n");
+        fprintf(stderr, "Error: Number of bytes read == 0. Please check the path refers to a regular %s file.\n",
+                        (resource_type == SAMPLE) ? "sample" : "definition");
     } else {
         printf("Resource exported to file '%s'.\n", out_file);
     }
diff --git a/tools/grib_compare.cc b/tools/grib_compare.cc
index 4e984ac1c..903534d8e 100644
--- a/tools/grib_compare.cc
+++ b/tools/grib_compare.cc
@@ -312,7 +312,7 @@ int grib_tool_init(grib_runtime_options* options)
         options->idx     = grib_fieldset_new_from_files(context, filename,
                                                     nfiles, 0, 0, 0, orderby, &ret);
         if (ret) {
-            fprintf(stderr, "%s: Unable to create index for input file %s (%s)",
+            fprintf(stderr, "%s: Unable to create index for input file '%s' (%s)\n",
                     tool_name, options->infile_extra->name, grib_get_error_message(ret));
             exit(ret);
         }
diff --git a/tools/grib_tools.cc b/tools/grib_tools.cc
index 2c0598b0b..8c05058b2 100644
--- a/tools/grib_tools.cc
+++ b/tools/grib_tools.cc
@@ -9,9 +9,14 @@
  */
 
 #include "grib_tools.h"
+
 #include <stdlib.h>
 #include <string>
 
+#ifdef HAVE_ECKIT_GEO
+    #include "eckit/runtime/Main.h"
+#endif
+
 #if HAVE_LIBJASPER
 /* Remove compiler warnings re macros being redefined */
 #undef PACKAGE_BUGREPORT
@@ -141,6 +146,10 @@ static grib_handle* grib_handle_new_from_file_x(grib_context* c, FILE* f, int mo
 
 int grib_tool(int argc, char** argv)
 {
+#ifdef HAVE_ECKIT_GEO
+    eckit::Main::initialise(argc, argv);
+#endif
+
     int ret                = 0;
     int i = 0;
     grib_context* c        = grib_context_get_default();