diff --git a/definitions/grib2/boot.def b/definitions/grib2/boot.def
index d20772ace..44cf284ae 100644
--- a/definitions/grib2/boot.def
+++ b/definitions/grib2/boot.def
@@ -18,7 +18,6 @@ constant grib2divider   = 1000000;
 alias extraDimensionPresent=zero;
 alias is_tigge = zero;
 alias is_s2s = zero;
-transient is_efas = 0;
 transient angleSubdivisions=grib2divider;  # micro degrees
 
 meta gts_header gts_header() : no_copy,hidden,read_only;
diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def
index ed457d2fb..589beb2bc 100644
--- a/definitions/grib2/cfVarName.def
+++ b/definitions/grib2/cfVarName.def
@@ -113,26 +113,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 1 ;
 	}
-#Wind speed
-'ws' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 100 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 is_uerra = 1 ;
-	}
-#Wind speed
-'ws' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 200 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 is_uerra = 1 ;
-	}
 #Unbalanced component of temperature
 'uctp' = {
 	 discipline = 0 ;
@@ -185,17 +165,6 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#10 metre wind gust since previous post-processing
-'fg10' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 22 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 scaledValueOfFirstFixedSurface = 10 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 is_uerra = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	}
 #Specific rain water content
 'crwc' = {
 	 discipline = 0 ;
@@ -266,28 +235,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 37 ;
 	}
-#Maximum temperature at 2 metres since previous post-processing
-'mx2t' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 scaledValueOfFirstFixedSurface = 2 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 is_uerra = 1 ;
-	}
-#Minimum temperature at 2 metres since previous post-processing
-'mn2t' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 typeOfStatisticalProcessing = 3 ;
-	 is_uerra = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 scaledValueOfFirstFixedSurface = 2 ;
-	}
 #Ozone mass mixing ratio
 'o3' = {
 	 discipline = 0 ;
@@ -1107,7 +1054,6 @@
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 22 ;
-	 is_uerra = 0 ;
 	 typeOfFirstFixedSurface = 103 ;
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 scaledValueOfFirstFixedSurface = 10 ;
@@ -1901,7 +1847,6 @@
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 6 ;
 	 indicatorOfUnitForTimeRange = 1 ;
-	 is_uerra = 0 ;
 	}
 #Evaporation in the last 24 hours
 'eva24' = {
@@ -1912,29 +1857,6 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 24 ;
-	 is_uerra = 0 ;
-	}
-#Total precipitation in the last 6 hours
-'tp06' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 52 ;
-	 is_efas = 1 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	 lengthOfTimeRange = 6 ;
-	 indicatorOfUnitForTimeRange = 1 ;
-	}
-#Total precipitation in the last 24 hours
-'tp24' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 52 ;
-	 lengthOfTimeRange = 24 ;
-	 indicatorOfUnitForTimeRange = 1 ;
-	 is_efas = 1 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
 	}
 #Fraction of snow cover
 'fscov' = {
@@ -2702,7 +2624,6 @@
 	 discipline = 0 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 0 ;
-	 is_uerra = 0 ;
 	 typeOfStatisticalProcessing = 2 ;
 	 typeOfFirstFixedSurface = 103 ;
 	 scaleFactorOfFirstFixedSurface = 0 ;
@@ -2715,7 +2636,6 @@
 	 discipline = 0 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 0 ;
-	 is_uerra = 0 ;
 	 typeOfFirstFixedSurface = 103 ;
 	 typeOfStatisticalProcessing = 3 ;
 	 scaleFactorOfFirstFixedSurface = 0 ;
diff --git a/definitions/grib2/local.98.41.def b/definitions/grib2/local.98.41.def
index 924d6d6a3..5619b7b47 100644
--- a/definitions/grib2/local.98.41.def
+++ b/definitions/grib2/local.98.41.def
@@ -38,8 +38,6 @@ unsigned[2] anoffsetLast      = missing(): dump, can_be_missing;
 unsigned[2] anoffsetFrequency = missing(): dump, can_be_missing;
 
 # Boolean
-remove is_efas;
-transient is_efas = 1;
 transient lsdate_bug = 1: hidden; # See ECC-707
 
 # Note: the key typeOfPostProcessing is in the PDTNs 70, 71, 72 and 73
diff --git a/definitions/grib2/localConcepts/egrr/cfVarName.def b/definitions/grib2/localConcepts/egrr/cfVarName.def
index 99a9945ed..432101fc9 100644
--- a/definitions/grib2/localConcepts/egrr/cfVarName.def
+++ b/definitions/grib2/localConcepts/egrr/cfVarName.def
@@ -1,26 +1,4 @@
 # Automatically generated by ./create_def.pl, do not edit
-#Maximum temperature at 2 metres since previous post-processing
-'mx2t' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaleFactorOfFirstFixedSurface = 1 ;
-	 scaledValueOfFirstFixedSurface = 15 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 is_uerra = 1 ;
-	}
-#Minimum temperature at 2 metres since previous post-processing
-'mn2t' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 typeOfStatisticalProcessing = 3 ;
-	 is_uerra = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaleFactorOfFirstFixedSurface = 1 ;
-	 scaledValueOfFirstFixedSurface = 15 ;
-	}
 #Maximum temperature at 2 metres in the last 6 hours
 'mx2t6' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/egrr/name.def b/definitions/grib2/localConcepts/egrr/name.def
index f1ce0156a..b1b4c5700 100644
--- a/definitions/grib2/localConcepts/egrr/name.def
+++ b/definitions/grib2/localConcepts/egrr/name.def
@@ -1,26 +1,4 @@
 # Automatically generated by ./create_def.pl, do not edit
-#Maximum temperature at 2 metres since previous post-processing
-'Maximum temperature at 2 metres since previous post-processing' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 is_uerra = 1 ;
-	 scaledValueOfFirstFixedSurface = 15 ;
-	 scaleFactorOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 typeOfFirstFixedSurface = 103 ;
-	}
-#Minimum temperature at 2 metres since previous post-processing
-'Minimum temperature at 2 metres since previous post-processing' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 scaledValueOfFirstFixedSurface = 15 ;
-	 scaleFactorOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 3 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 is_uerra = 1 ;
-	}
 #Maximum temperature at 2 metres in the last 6 hours
 'Maximum temperature at 2 metres in the last 6 hours' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/egrr/paramId.def b/definitions/grib2/localConcepts/egrr/paramId.def
index 561ef8625..a3ccb82c4 100644
--- a/definitions/grib2/localConcepts/egrr/paramId.def
+++ b/definitions/grib2/localConcepts/egrr/paramId.def
@@ -1,26 +1,4 @@
 # Automatically generated by ./create_def.pl, do not edit
-#Maximum temperature at 2 metres since previous post-processing
-'201' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 scaledValueOfFirstFixedSurface = 15 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 is_uerra = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaleFactorOfFirstFixedSurface = 1 ;
-	}
-#Minimum temperature at 2 metres since previous post-processing
-'202' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 is_uerra = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaleFactorOfFirstFixedSurface = 1 ;
-	 scaledValueOfFirstFixedSurface = 15 ;
-	 typeOfStatisticalProcessing = 3 ;
-	}
 #Maximum temperature at 2 metres in the last 6 hours
 '121' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/egrr/shortName.def b/definitions/grib2/localConcepts/egrr/shortName.def
index 3a824a001..93aedfec9 100644
--- a/definitions/grib2/localConcepts/egrr/shortName.def
+++ b/definitions/grib2/localConcepts/egrr/shortName.def
@@ -1,26 +1,4 @@
 # Automatically generated by ./create_def.pl, do not edit
-#Maximum temperature at 2 metres since previous post-processing
-'mx2t' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaleFactorOfFirstFixedSurface = 1 ;
-	 scaledValueOfFirstFixedSurface = 15 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 is_uerra = 1 ;
-	}
-#Minimum temperature at 2 metres since previous post-processing
-'mn2t' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 typeOfStatisticalProcessing = 3 ;
-	 is_uerra = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaleFactorOfFirstFixedSurface = 1 ;
-	 scaledValueOfFirstFixedSurface = 15 ;
-	}
 #Maximum temperature at 2 metres in the last 6 hours
 'mx2t6' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/egrr/units.def b/definitions/grib2/localConcepts/egrr/units.def
index 8e1c3f3ad..9847903a6 100644
--- a/definitions/grib2/localConcepts/egrr/units.def
+++ b/definitions/grib2/localConcepts/egrr/units.def
@@ -1,26 +1,4 @@
 # Automatically generated by ./create_def.pl, do not edit
-#Maximum temperature at 2 metres since previous post-processing
-'K' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 is_uerra = 1 ;
-	 scaledValueOfFirstFixedSurface = 15 ;
-	 scaleFactorOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 typeOfFirstFixedSurface = 103 ;
-	}
-#Minimum temperature at 2 metres since previous post-processing
-'K' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 scaledValueOfFirstFixedSurface = 15 ;
-	 scaleFactorOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 3 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 is_uerra = 1 ;
-	}
 #Maximum temperature at 2 metres in the last 6 hours
 'K' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/hydro/cfVarName.def b/definitions/grib2/localConcepts/hydro/cfVarName.def
new file mode 100644
index 000000000..40d4a9c61
--- /dev/null
+++ b/definitions/grib2/localConcepts/hydro/cfVarName.def
@@ -0,0 +1,20 @@
+#Total precipitation in the last 6 hours
+'tp06' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 52 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 lengthOfTimeRange = 6 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	}
+#Total precipitation in the last 24 hours
+'tp24' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 52 ;
+	 lengthOfTimeRange = 24 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
diff --git a/definitions/grib2/localConcepts/hydro/name.def b/definitions/grib2/localConcepts/hydro/name.def
new file mode 100644
index 000000000..29be30ae1
--- /dev/null
+++ b/definitions/grib2/localConcepts/hydro/name.def
@@ -0,0 +1,20 @@
+#Total precipitation in the last 6 hours
+'Total precipitation in the last 6 hours' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 52 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 lengthOfTimeRange = 6 ;
+	}
+#Total precipitation in the last 24 hours
+'Total precipitation in the last 24 hours' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 52 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 lengthOfTimeRange = 24 ;
+	}
diff --git a/definitions/grib2/localConcepts/hydro/paramId.def b/definitions/grib2/localConcepts/hydro/paramId.def
new file mode 100644
index 000000000..a73020f4a
--- /dev/null
+++ b/definitions/grib2/localConcepts/hydro/paramId.def
@@ -0,0 +1,20 @@
+#Total precipitation in the last 6 hours
+'260267' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 52 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 lengthOfTimeRange = 6 ;
+	}
+#Total precipitation in the last 24 hours
+'260268' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 52 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 lengthOfTimeRange = 24 ;
+	}
diff --git a/definitions/grib2/localConcepts/hydro/shortName.def b/definitions/grib2/localConcepts/hydro/shortName.def
new file mode 100644
index 000000000..2f3ea9f11
--- /dev/null
+++ b/definitions/grib2/localConcepts/hydro/shortName.def
@@ -0,0 +1,20 @@
+#Total precipitation in the last 6 hours
+'tp06' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 52 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 lengthOfTimeRange = 6 ;
+	}
+#Total precipitation in the last 24 hours
+'tp24' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 52 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 lengthOfTimeRange = 24 ;
+	}
diff --git a/definitions/grib2/localConcepts/hydro/units.def b/definitions/grib2/localConcepts/hydro/units.def
new file mode 100644
index 000000000..25290e5ad
--- /dev/null
+++ b/definitions/grib2/localConcepts/hydro/units.def
@@ -0,0 +1,20 @@
+#Total precipitation in the last 6 hours
+'kg m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 52 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 lengthOfTimeRange = 6 ;
+	}
+#Total precipitation in the last 24 hours
+'kg m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 52 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	 lengthOfTimeRange = 24 ;
+	}
diff --git a/definitions/grib2/localConcepts/uerra/cfVarName.def b/definitions/grib2/localConcepts/uerra/cfVarName.def
new file mode 100644
index 000000000..24926018d
--- /dev/null
+++ b/definitions/grib2/localConcepts/uerra/cfVarName.def
@@ -0,0 +1,120 @@
+#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 ;
+    }
+#10 metre wind gust since previous post-processing
+'fg10' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 22 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     lengthOfTimeRange = 3 ;
+	}
+#10 metre wind gust since previous post-processing
+'fg10' = {
+     discipline = 0 ;
+     parameterCategory = 2 ;
+     parameterNumber = 22 ;
+     scaleFactorOfFirstFixedSurface = 0 ;
+     scaledValueOfFirstFixedSurface = 10 ;
+     typeOfStatisticalProcessing = 2 ;
+     typeOfFirstFixedSurface = 103 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     lengthOfTimeRange = 1 ;
+    }
+#Maximum temperature at 2 metres since previous post-processing
+'mx2t' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Minimum temperature at 2 metres since previous post-processing
+'mn2t' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	}
+#Maximum temperature at 2 metres since previous post-processing
+'mx2t' = {
+     discipline = 0 ;
+     parameterCategory = 0 ;
+     parameterNumber = 0 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     typeOfStatisticalProcessing = 2 ;
+    }
+#Minimum temperature at 2 metres since previous post-processing
+'mn2t' = {
+     discipline = 0 ;
+     parameterCategory = 0 ;
+     parameterNumber = 0 ;
+     typeOfStatisticalProcessing = 3 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+    }
+#Evaporation
+'eva' = {
+     discipline = 0 ;
+     parameterCategory = 1 ;
+     parameterNumber = 79 ;
+     typeOfFirstFixedSurface = 1 ;
+     typeOfStatisticalProcessing = 1 ;
+     lengthOfTimeRange = 6 ;
+     indicatorOfUnitForTimeRange = 1 ;
+    }
+#Evaporation
+'eva' = {
+     discipline = 0 ;
+     parameterCategory = 1 ;
+     parameterNumber = 79 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     typeOfFirstFixedSurface = 1 ;
+     typeOfStatisticalProcessing = 1 ;
+     lengthOfTimeRange = 24 ;
+    }
+#2 metre temperature
+'t2m' = {
+     discipline = 0 ;
+     parameterCategory = 0 ;
+     parameterNumber = 0 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+    }
+#Surface air relative humidity
+'r2' = {
+     discipline = 0 ;
+     parameterCategory = 1 ;
+     parameterNumber = 1 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+    }
diff --git a/definitions/grib2/localConcepts/uerra/name.def b/definitions/grib2/localConcepts/uerra/name.def
new file mode 100644
index 000000000..40456ac19
--- /dev/null
+++ b/definitions/grib2/localConcepts/uerra/name.def
@@ -0,0 +1,120 @@
+#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 ;
+    }
+#10 metre wind gust since previous post-processing
+'10 metre wind gust since previous post-processing' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 22 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     lengthOfTimeRange = 3 ;
+	}
+#10 metre wind gust since previous post-processing
+'10 metre wind gust since previous post-processing' = {
+     discipline = 0 ;
+     parameterCategory = 2 ;
+     parameterNumber = 22 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 10 ;
+     scaleFactorOfFirstFixedSurface = 0 ;
+     typeOfStatisticalProcessing = 2 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     lengthOfTimeRange = 1 ;
+    }
+#Maximum temperature at 2 metres since previous post-processing
+'Maximum temperature at 2 metres since previous post-processing' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Minimum temperature at 2 metres since previous post-processing
+'Minimum temperature at 2 metres since previous post-processing' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Maximum temperature at 2 metres since previous post-processing
+'Maximum temperature at 2 metres since previous post-processing' = {
+     discipline = 0 ;
+     parameterCategory = 0 ;
+     parameterNumber = 0 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+     typeOfStatisticalProcessing = 2 ;
+    }
+#Minimum temperature at 2 metres since previous post-processing
+'Minimum temperature at 2 metres since previous post-processing' = {
+     discipline = 0 ;
+     parameterCategory = 0 ;
+     parameterNumber = 0 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+     typeOfStatisticalProcessing = 3 ;
+    }
+#Evaporation
+'Evaporation' = {
+     discipline = 0 ;
+     parameterCategory = 1 ;
+     parameterNumber = 79 ;
+     typeOfFirstFixedSurface = 1 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     typeOfStatisticalProcessing = 1 ;
+     lengthOfTimeRange = 6 ;
+    }
+#Evaporation
+'Evaporation' = {
+     discipline = 0 ;
+     parameterCategory = 1 ;
+     parameterNumber = 79 ;
+     typeOfFirstFixedSurface = 1 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     typeOfStatisticalProcessing = 1 ;
+     lengthOfTimeRange = 24 ;
+    }
+#2 metre temperature
+'2 metre temperature' = {
+     discipline = 0 ;
+     parameterCategory = 0 ;
+     parameterNumber = 0 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+    }
+#Surface air relative humidity
+'Surface air relative humidity' = {
+     discipline = 0 ;
+     parameterCategory = 1 ;
+     parameterNumber = 1 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+     typeOfFirstFixedSurface = 103 ;
+    }
diff --git a/definitions/grib2/localConcepts/uerra/paramId.def b/definitions/grib2/localConcepts/uerra/paramId.def
new file mode 100644
index 000000000..227c609d1
--- /dev/null
+++ b/definitions/grib2/localConcepts/uerra/paramId.def
@@ -0,0 +1,120 @@
+#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 ;
+    }
+#10 metre wind gust since previous post-processing
+'49' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 22 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     lengthOfTimeRange = 3 ;
+	}
+#10 metre wind gust since previous post-processing
+'49' = {
+     discipline = 0 ;
+     parameterCategory = 2 ;
+     parameterNumber = 22 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 10 ;
+     scaleFactorOfFirstFixedSurface = 0 ;
+     typeOfStatisticalProcessing = 2 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     lengthOfTimeRange = 1 ;
+    }
+#Maximum temperature at 2 metres since previous post-processing
+'201' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Minimum temperature at 2 metres since previous post-processing
+'202' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Maximum temperature at 2 metres since previous post-processing
+'201' = {
+     discipline = 0 ;
+     parameterCategory = 0 ;
+     parameterNumber = 0 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+     typeOfStatisticalProcessing = 2 ;
+    }
+#Minimum temperature at 2 metres since previous post-processing
+'202' = {
+     discipline = 0 ;
+     parameterCategory = 0 ;
+     parameterNumber = 0 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+     typeOfStatisticalProcessing = 3 ;
+    }
+#Evaporation
+'260259' = {
+     discipline = 0 ;
+     parameterCategory = 1 ;
+     parameterNumber = 79 ;
+     typeOfFirstFixedSurface = 1 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     typeOfStatisticalProcessing = 1 ;
+     lengthOfTimeRange = 6 ;
+    }
+#Evaporation
+'260259' = {
+     discipline = 0 ;
+     parameterCategory = 1 ;
+     parameterNumber = 79 ;
+     typeOfFirstFixedSurface = 1 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     typeOfStatisticalProcessing = 1 ;
+     lengthOfTimeRange = 24 ;
+    }
+#2 metre temperature
+'167' = {
+     discipline = 0 ;
+     parameterCategory = 0 ;
+     parameterNumber = 0 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+    }
+#Surface air relative humidity
+'260242' = {
+     discipline = 0 ;
+     parameterCategory = 1 ;
+     parameterNumber = 1 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+    }
diff --git a/definitions/grib2/localConcepts/uerra/shortName.def b/definitions/grib2/localConcepts/uerra/shortName.def
new file mode 100644
index 000000000..836bfce97
--- /dev/null
+++ b/definitions/grib2/localConcepts/uerra/shortName.def
@@ -0,0 +1,120 @@
+#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 ;
+    }
+#10 metre wind gust since previous post-processing
+'10fg' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 22 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     lengthOfTimeRange = 3 ;
+	}
+#10 metre wind gust since previous post-processing
+'10fg' = {
+     discipline = 0 ;
+     parameterCategory = 2 ;
+     parameterNumber = 22 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 10 ;
+     scaleFactorOfFirstFixedSurface = 0 ;
+     typeOfStatisticalProcessing = 2 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     lengthOfTimeRange = 1 ;
+    }
+#Maximum temperature at 2 metres since previous post-processing
+'mx2t' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Minimum temperature at 2 metres since previous post-processing
+'mn2t' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Maximum temperature at 2 metres since previous post-processing
+'mx2t' = {
+     discipline = 0 ;
+     parameterCategory = 0 ;
+     parameterNumber = 0 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+     typeOfStatisticalProcessing = 2 ;
+    }
+#Minimum temperature at 2 metres since previous post-processing
+'mn2t' = {
+     discipline = 0 ;
+     parameterCategory = 0 ;
+     parameterNumber = 0 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+     typeOfStatisticalProcessing = 3 ;
+    }
+#Evaporation
+'eva' = {
+     discipline = 0 ;
+     parameterCategory = 1 ;
+     parameterNumber = 79 ;
+     typeOfFirstFixedSurface = 1 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     typeOfStatisticalProcessing = 1 ;
+     lengthOfTimeRange = 6 ;
+    }
+#Evaporation
+'eva' = {
+     discipline = 0 ;
+     parameterCategory = 1 ;
+     parameterNumber = 79 ;
+     typeOfFirstFixedSurface = 1 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     typeOfStatisticalProcessing = 1 ;
+     lengthOfTimeRange = 24 ;
+    }
+#2 metre temperature
+'2t' = {
+     discipline = 0 ;
+     parameterCategory = 0 ;
+     parameterNumber = 0 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+    }
+#Surface air relative humidity
+'2r' = {
+     discipline = 0 ;
+     parameterCategory = 1 ;
+     parameterNumber = 1 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+    }
diff --git a/definitions/grib2/localConcepts/uerra/units.def b/definitions/grib2/localConcepts/uerra/units.def
new file mode 100644
index 000000000..fc9c4cf36
--- /dev/null
+++ b/definitions/grib2/localConcepts/uerra/units.def
@@ -0,0 +1,120 @@
+#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 ;
+    }
+#10 metre wind gust since previous post-processing
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 22 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     lengthOfTimeRange = 3 ;
+	}
+#10 metre wind gust since previous post-processing
+'m s**-1' = {
+     discipline = 0 ;
+     parameterCategory = 2 ;
+     parameterNumber = 22 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 10 ;
+     scaleFactorOfFirstFixedSurface = 0 ;
+     typeOfStatisticalProcessing = 2 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     lengthOfTimeRange = 1 ;
+    }
+#Maximum temperature at 2 metres since previous post-processing
+'K' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Minimum temperature at 2 metres since previous post-processing
+'K' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Maximum temperature at 2 metres since previous post-processing
+'K' = {
+     discipline = 0 ;
+     parameterCategory = 0 ;
+     parameterNumber = 0 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+     typeOfStatisticalProcessing = 2 ;
+    }
+#Minimum temperature at 2 metres since previous post-processing
+'K' = {
+     discipline = 0 ;
+     parameterCategory = 0 ;
+     parameterNumber = 0 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+     typeOfStatisticalProcessing = 3 ;
+    }
+#Evaporation
+'kg m**-2' = {
+     discipline = 0 ;
+     parameterCategory = 1 ;
+     parameterNumber = 79 ;
+     typeOfFirstFixedSurface = 1 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     typeOfStatisticalProcessing = 1 ;
+     lengthOfTimeRange = 6 ;
+    }
+#Evaporation
+'kg m**-2' = {
+     discipline = 0 ;
+     parameterCategory = 1 ;
+     parameterNumber = 79 ;
+     typeOfFirstFixedSurface = 1 ;
+     indicatorOfUnitForTimeRange = 1 ;
+     typeOfStatisticalProcessing = 1 ;
+     lengthOfTimeRange = 24 ;
+    }
+#2 metre temperature
+'K' = {
+     discipline = 0 ;
+     parameterCategory = 0 ;
+     parameterNumber = 0 ;
+     typeOfFirstFixedSurface = 103 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+    }
+#Surface air relative humidity
+'%' = {
+     discipline = 0 ;
+     parameterCategory = 1 ;
+     parameterNumber = 1 ;
+     scaledValueOfFirstFixedSurface = 15 ;
+     scaleFactorOfFirstFixedSurface = 1 ;
+     typeOfFirstFixedSurface = 103 ;
+    }
diff --git a/definitions/grib2/marsLevtypeConcept.def b/definitions/grib2/marsLevtypeConcept.def
new file mode 100644
index 000000000..5ad13fad2
--- /dev/null
+++ b/definitions/grib2/marsLevtypeConcept.def
@@ -0,0 +1,43 @@
+# Concept marsLevtype
+'sfc'  = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=255;}
+'sfc'  = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=8;}
+'o2d'  = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=9;}
+'sfc'  = {typeOfFirstFixedSurface=7; typeOfSecondFixedSurface=255;}
+'sfc'  = {typeOfFirstFixedSurface=8; typeOfSecondFixedSurface=255;}
+'sfc'  = {typeOfFirstFixedSurface=17; typeOfSecondFixedSurface=255;}
+'sfc'  = {typeOfFirstFixedSurface=18; typeOfSecondFixedSurface=255;}
+'o2d'  = {typeOfFirstFixedSurface=20; scaleFactorOfFirstFixedSurface=-2; scaledValueOfFirstFixedSurface=29315; typeOfSecondFixedSurface=255;}
+'o2d'  = {typeOfFirstFixedSurface=20; typeOfSecondFixedSurface=255;}
+'pl'   = {typeOfFirstFixedSurface=100; typeOfSecondFixedSurface=255;}
+'sfc'  = {typeOfFirstFixedSurface=101; typeOfSecondFixedSurface=255;}
+'sfc'  = {typeOfFirstFixedSurface=102; typeOfSecondFixedSurface=255;}
+'sfc'  = {typeOfFirstFixedSurface=103; typeOfSecondFixedSurface=255;}
+'ml'   = {typeOfFirstFixedSurface=105; typeOfSecondFixedSurface=255;}
+'sfc'  = {typeOfFirstFixedSurface=106; typeOfSecondFixedSurface=255;}
+'sfc'  = {typeOfFirstFixedSurface=106;typeOfSecondFixedSurface=106;}
+'pt'   = {typeOfFirstFixedSurface=107; typeOfSecondFixedSurface=255;}
+'pv'   = {typeOfFirstFixedSurface=109; typeOfSecondFixedSurface=255;}
+'sol'  = {typeOfFirstFixedSurface=114; typeOfSecondFixedSurface=255;}
+'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;}
+'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=174; typeOfSecondFixedSurface=255;}
+'o2d'  = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=255;}
+'o2d'  = {typeOfFirstFixedSurface=176; typeOfSecondFixedSurface=255;}
+'o2d'  = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=176;}
+'o2d'  = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=176;}
+'sfc'  = {typeOfFirstFixedSurface=177; typeOfSecondFixedSurface=255;}
diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def
index 335d681ba..62d3ff6ac 100644
--- a/definitions/grib2/name.def
+++ b/definitions/grib2/name.def
@@ -113,26 +113,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 1 ;
 	}
-#Wind speed
-'Wind speed' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 100 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 is_uerra = 1 ;
-	}
-#Wind speed
-'Wind speed' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 200 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 is_uerra = 1 ;
-	}
 #Unbalanced component of temperature
 'Unbalanced component of temperature' = {
 	 discipline = 0 ;
@@ -185,17 +165,6 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#10 metre wind gust since previous post-processing
-'10 metre wind gust since previous post-processing' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 22 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 10 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 is_uerra = 1 ;
-	}
 #Specific rain water content
 'Specific rain water content' = {
 	 discipline = 0 ;
@@ -266,28 +235,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 37 ;
 	}
-#Maximum temperature at 2 metres since previous post-processing
-'Maximum temperature at 2 metres since previous post-processing' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 2 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 is_uerra = 1 ;
-	}
-#Minimum temperature at 2 metres since previous post-processing
-'Minimum temperature at 2 metres since previous post-processing' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 2 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfStatisticalProcessing = 3 ;
-	 is_uerra = 1 ;
-	}
 #Ozone mass mixing ratio
 'Ozone mass mixing ratio' = {
 	 discipline = 0 ;
@@ -1113,7 +1060,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 2 ;
 	 lengthOfTimeRange = 3 ;
-	 is_uerra = 0 ;
 	}
 #Relative humidity with respect to water
 'Relative humidity with respect to water' = {
@@ -1901,7 +1847,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 6 ;
-	 is_uerra = 0 ;
 	}
 #Evaporation in the last 24 hours
 'Evaporation in the last 24 hours' = {
@@ -1912,29 +1857,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 24 ;
-	 is_uerra = 0 ;
-	}
-#Total precipitation in the last 6 hours
-'Total precipitation in the last 6 hours' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 52 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 indicatorOfUnitForTimeRange = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	 lengthOfTimeRange = 6 ;
-	 is_efas = 1 ;
-	}
-#Total precipitation in the last 24 hours
-'Total precipitation in the last 24 hours' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 52 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 indicatorOfUnitForTimeRange = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	 lengthOfTimeRange = 24 ;
-	 is_efas = 1 ;
 	}
 #Fraction of snow cover
 'Fraction of snow cover' = {
@@ -2708,7 +2630,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 2 ;
 	 lengthOfTimeRange = 6 ;
-	 is_uerra = 0 ;
 	}
 #Minimum temperature at 2 metres in the last 6 hours
 'Minimum temperature at 2 metres in the last 6 hours' = {
@@ -2721,7 +2642,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 3 ;
 	 lengthOfTimeRange = 6 ;
-	 is_uerra = 0 ;
 	}
 #Geopotential
 'Geopotential' = {
diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def
index 56f9a4544..5baf2aeae 100644
--- a/definitions/grib2/paramId.def
+++ b/definitions/grib2/paramId.def
@@ -113,26 +113,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 1 ;
 	}
-#Wind speed
-'10' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 100 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 is_uerra = 1 ;
-	}
-#Wind speed
-'10' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 200 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 is_uerra = 1 ;
-	}
 #Unbalanced component of temperature
 '21' = {
 	 discipline = 0 ;
@@ -185,17 +165,6 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#10 metre wind gust since previous post-processing
-'49' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 22 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 10 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 is_uerra = 1 ;
-	}
 #Specific rain water content
 '75' = {
 	 discipline = 0 ;
@@ -266,28 +235,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 37 ;
 	}
-#Maximum temperature at 2 metres since previous post-processing
-'201' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 2 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 is_uerra = 1 ;
-	}
-#Minimum temperature at 2 metres since previous post-processing
-'202' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 2 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfStatisticalProcessing = 3 ;
-	 is_uerra = 1 ;
-	}
 #Ozone mass mixing ratio
 '203' = {
 	 discipline = 0 ;
@@ -1113,7 +1060,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 2 ;
 	 lengthOfTimeRange = 3 ;
-	 is_uerra = 0 ;
 	}
 #Relative humidity with respect to water
 '228030' = {
@@ -1901,7 +1847,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 6 ;
-	 is_uerra = 0 ;
 	}
 #Evaporation in the last 24 hours
 '260266' = {
@@ -1912,29 +1857,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 24 ;
-	 is_uerra = 0 ;
-	}
-#Total precipitation in the last 6 hours
-'260267' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 52 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 indicatorOfUnitForTimeRange = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	 lengthOfTimeRange = 6 ;
-	 is_efas = 1 ;
-	}
-#Total precipitation in the last 24 hours
-'260268' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 52 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 indicatorOfUnitForTimeRange = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	 lengthOfTimeRange = 24 ;
-	 is_efas = 1 ;
 	}
 #Fraction of snow cover
 '260289' = {
@@ -2708,7 +2630,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 2 ;
 	 lengthOfTimeRange = 6 ;
-	 is_uerra = 0 ;
 	}
 #Minimum temperature at 2 metres in the last 6 hours
 '122' = {
@@ -2721,7 +2642,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 3 ;
 	 lengthOfTimeRange = 6 ;
-	 is_uerra = 0 ;
 	}
 #Geopotential
 '129' = {
diff --git a/definitions/grib2/section.1.def b/definitions/grib2/section.1.def
index 62a94ccd8..a9bca14ce 100644
--- a/definitions/grib2/section.1.def
+++ b/definitions/grib2/section.1.def
@@ -116,14 +116,6 @@ if ( ((section1Length > 21) or setCalendarId > 0) and deleteCalendarId == 0) {
   template calendarIdentification "grib2/template.1.[calendarIdentificationTemplateNumber:l].def";
 }
 
-concept is_uerra(zero) {
-   '1' = {productionStatusOfProcessedData=10;}
-   '1' = {productionStatusOfProcessedData=11;}
-   '1' = {productionStatusOfProcessedData=9;}
-   '1' = {productionStatusOfProcessedData=8;}
-   '0' = {dummy=1;}
-}
-
 constant conceptsMasterDir="grib2" : hidden;
 constant conceptsLocalDirAll="grib2/localConcepts/[centre:s]" : hidden;
 constant conceptsLocalDirECMF="grib2/localConcepts/ecmf" : hidden;
diff --git a/definitions/grib2/section.4.def b/definitions/grib2/section.4.def
index 7e6ebccac..7618e9054 100644
--- a/definitions/grib2/section.4.def
+++ b/definitions/grib2/section.4.def
@@ -23,6 +23,25 @@ if (centre==7 || centre==46) {
    alias disableGrib1LocalSection=one;
 }
 
+concept datasetForLocal(unknown) {
+#  "tigge"   = {productionStatusOfProcessedData=4;}
+#  "tigge"   = {productionStatusOfProcessedData=5;}
+#  "s2s"     = {productionStatusOfProcessedData=6;}
+#  "s2s"     = {productionStatusOfProcessedData=7;}
+  "hydro"   = {marsClass="ce";} # EFAS/GLOFAS
+  "hydro"   = {marsClass="ul";} #ULYSSES
+  "uerra"   = {productionStatusOfProcessedData=8;} # UERRA
+  "uerra"   = {productionStatusOfProcessedData=9;} # UERRA
+  "uerra"   = {productionStatusOfProcessedData=10;} # CARRA/CERRA
+  "uerra"   = {productionStatusOfProcessedData=11;} # CARRA/CERRA
+  "unknown" = { dummy=1; }
+}
+
+if (!(datasetForLocal is "unknown")) {
+   constant conceptsDir2 = "grib2/localConcepts/[datasetForLocal]": hidden;
+   constant conceptsDir1 = "grib2": hidden;
+}
+
 codetable[2] productDefinitionTemplateNumber('4.0.table',masterDir,localDir) : dump;
 
 if (section2Used == 1) {
diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def
index 70b7ebeea..1392bd480 100644
--- a/definitions/grib2/shortName.def
+++ b/definitions/grib2/shortName.def
@@ -113,26 +113,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 1 ;
 	}
-#Wind speed
-'ws' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 100 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 is_uerra = 1 ;
-	}
-#Wind speed
-'ws' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 200 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 is_uerra = 1 ;
-	}
 #Unbalanced component of temperature
 'uctp' = {
 	 discipline = 0 ;
@@ -185,17 +165,6 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#10 metre wind gust since previous post-processing
-'10fg' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 22 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 10 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 is_uerra = 1 ;
-	}
 #Specific rain water content
 'crwc' = {
 	 discipline = 0 ;
@@ -266,28 +235,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 37 ;
 	}
-#Maximum temperature at 2 metres since previous post-processing
-'mx2t' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 2 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 is_uerra = 1 ;
-	}
-#Minimum temperature at 2 metres since previous post-processing
-'mn2t' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 2 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfStatisticalProcessing = 3 ;
-	 is_uerra = 1 ;
-	}
 #Ozone mass mixing ratio
 'o3' = {
 	 discipline = 0 ;
@@ -1113,7 +1060,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 2 ;
 	 lengthOfTimeRange = 3 ;
-	 is_uerra = 0 ;
 	}
 #Relative humidity with respect to water
 'rhw' = {
@@ -1901,7 +1847,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 6 ;
-	 is_uerra = 0 ;
 	}
 #Evaporation in the last 24 hours
 'eva24' = {
@@ -1912,29 +1857,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 24 ;
-	 is_uerra = 0 ;
-	}
-#Total precipitation in the last 6 hours
-'tp06' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 52 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 indicatorOfUnitForTimeRange = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	 lengthOfTimeRange = 6 ;
-	 is_efas = 1 ;
-	}
-#Total precipitation in the last 24 hours
-'tp24' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 52 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 indicatorOfUnitForTimeRange = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	 lengthOfTimeRange = 24 ;
-	 is_efas = 1 ;
 	}
 #Fraction of snow cover
 'fscov' = {
@@ -2708,7 +2630,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 2 ;
 	 lengthOfTimeRange = 6 ;
-	 is_uerra = 0 ;
 	}
 #Minimum temperature at 2 metres in the last 6 hours
 'mn2t6' = {
@@ -2721,7 +2642,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 3 ;
 	 lengthOfTimeRange = 6 ;
-	 is_uerra = 0 ;
 	}
 #Geopotential
 'z' = {
diff --git a/definitions/grib2/template.4.horizontal.def b/definitions/grib2/template.4.horizontal.def
index 071ae07b0..4e58946dd 100755
--- a/definitions/grib2/template.4.horizontal.def
+++ b/definitions/grib2/template.4.horizontal.def
@@ -74,7 +74,7 @@ if (extraDim) {
             alias mars.levelist = level;
         }
     }
-    alias mars.levtype  = typeOfFirstFixedSurface;
+    concept mars.levtype (unknown,"marsLevtypeConcept.def",conceptsDir2,conceptsDir1):no_copy;
     # GRIB-372: levelist alias does not pertain to surface parameters
     if (levtype is "sfc") {
         unalias mars.levelist;
diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def
index e5fc404be..5134eefe2 100644
--- a/definitions/grib2/units.def
+++ b/definitions/grib2/units.def
@@ -113,26 +113,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 1 ;
 	}
-#Wind speed
-'m s**-1' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 100 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 is_uerra = 1 ;
-	}
-#Wind speed
-'m s**-1' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 1 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 200 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 is_uerra = 1 ;
-	}
 #Unbalanced component of temperature
 'K' = {
 	 discipline = 0 ;
@@ -185,17 +165,6 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#10 metre wind gust since previous post-processing
-'m s**-1' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 22 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 10 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 is_uerra = 1 ;
-	}
 #Specific rain water content
 'kg kg**-1' = {
 	 discipline = 0 ;
@@ -266,28 +235,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 37 ;
 	}
-#Maximum temperature at 2 metres since previous post-processing
-'K' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 2 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 is_uerra = 1 ;
-	}
-#Minimum temperature at 2 metres since previous post-processing
-'K' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 typeOfFirstFixedSurface = 103 ;
-	 scaledValueOfFirstFixedSurface = 2 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 typeOfStatisticalProcessing = 3 ;
-	 is_uerra = 1 ;
-	}
 #Ozone mass mixing ratio
 'kg kg**-1' = {
 	 discipline = 0 ;
@@ -1113,7 +1060,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 2 ;
 	 lengthOfTimeRange = 3 ;
-	 is_uerra = 0 ;
 	}
 #Relative humidity with respect to water
 '%' = {
@@ -1901,7 +1847,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 6 ;
-	 is_uerra = 0 ;
 	}
 #Evaporation in the last 24 hours
 'kg m**-2' = {
@@ -1912,29 +1857,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 24 ;
-	 is_uerra = 0 ;
-	}
-#Total precipitation in the last 6 hours
-'kg m**-2' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 52 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 indicatorOfUnitForTimeRange = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	 lengthOfTimeRange = 6 ;
-	 is_efas = 1 ;
-	}
-#Total precipitation in the last 24 hours
-'kg m**-2' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 52 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 indicatorOfUnitForTimeRange = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	 lengthOfTimeRange = 24 ;
-	 is_efas = 1 ;
 	}
 #Fraction of snow cover
 'Proportion' = {
@@ -2708,7 +2630,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 2 ;
 	 lengthOfTimeRange = 6 ;
-	 is_uerra = 0 ;
 	}
 #Minimum temperature at 2 metres in the last 6 hours
 'K' = {
@@ -2721,7 +2642,6 @@
 	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 3 ;
 	 lengthOfTimeRange = 6 ;
-	 is_uerra = 0 ;
 	}
 #Geopotential
 'm**2 s**-2' = {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b94632b94..8116b4dc8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -85,7 +85,6 @@ if( HAVE_BUILD_TOOLS )
         grib_ecc-1195
         grib_ecc-1212
         grib_ecc-1230
-        grib_ecc-1255
         grib_ecc-1258
         grib_ecc-1260
         grib_ecc-1261
diff --git a/tests/grib_check_param_concepts.sh b/tests/grib_check_param_concepts.sh
index 161733c18..476ae1f1e 100755
--- a/tests/grib_check_param_concepts.sh
+++ b/tests/grib_check_param_concepts.sh
@@ -18,9 +18,13 @@
 # ----------------------------------------------------
 $EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/grib2/paramId.def
 $EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/grib2/localConcepts/ecmf/paramId.def
+$EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/grib2/localConcepts/uerra/paramId.def
+$EXEC ${test_dir}/grib_check_param_concepts paramId $ECCODES_DEFINITION_PATH/grib2/localConcepts/hydro/paramId.def
 
 $EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/shortName.def
 $EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/localConcepts/ecmf/shortName.def
+$EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/localConcepts/uerra/shortName.def
+$EXEC ${test_dir}/grib_check_param_concepts shortName $ECCODES_DEFINITION_PATH/grib2/localConcepts/hydro/shortName.def
 
 
 # Check the group: name.def paramId.def shortName.def units.def cfVarName.def
@@ -52,6 +56,9 @@ defs_dirs="
  $ECCODES_DEFINITION_PATH/grib1/localConcepts/lowm
  $ECCODES_DEFINITION_PATH/grib1/localConcepts/rjtd
 
+ $ECCODES_DEFINITION_PATH/grib2/localConcepts/uerra
+ $ECCODES_DEFINITION_PATH/grib2/localConcepts/hydro
+
  $ECCODES_DEFINITION_PATH/grib2/localConcepts/egrr
  $ECCODES_DEFINITION_PATH/grib2/localConcepts/ekmi
  $ECCODES_DEFINITION_PATH/grib2/localConcepts/eswi
diff --git a/tests/grib_ecc-1255.sh b/tests/grib_ecc-1255.sh
deleted file mode 100755
index e5fb1dfe3..000000000
--- a/tests/grib_ecc-1255.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/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.sh
-set -u
-
-label="grib_ecc-1255-test"
-tempGrib=temp.$label.grib
-tempFilt1=temp.1.$label.filt
-tempFilt2=temp.2.$label.filt
-sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
-
-# Non-EFAS GRIB
-# -----------------
-cat > $tempFilt1 <<EOF
- print "is_efas=[is_efas]";
-EOF
-result=`${tools_dir}/grib_filter $tempFilt1 $sample_grib2`
-[ "$result" = "is_efas=0" ]
-
-
-# EFAS GRIB
-# -----------
-cat > $tempFilt2 <<EOF
- set setLocalDefinition = 1;
- set localDefinitionNumber = 41; # sets is_efas to 1
- write;
-EOF
-${tools_dir}/grib_filter -o $tempGrib $tempFilt2 $sample_grib2
-
-result=`${tools_dir}/grib_filter $tempFilt1 $tempGrib`
-[ "$result" = "is_efas=1" ]
-
-
-# Clean up
-rm -f $tempGrib $tempFilt1 $tempFilt2
diff --git a/tests/grib_efas.sh b/tests/grib_efas.sh
index 6e2d563d5..58aa70273 100755
--- a/tests/grib_efas.sh
+++ b/tests/grib_efas.sh
@@ -20,33 +20,32 @@ temp3=temp3.$label.grib
 # Stream EFAS
 # ---------------------------
 # Create a starting GRIB with a basic local definition for MARS
-${tools_dir}/grib_set -s tablesVersion=19,setLocalDefinition=1,stream=efas $ECCODES_SAMPLES_PATH/GRIB2.tmpl $sample
-
-# Check is_efas key
-grib_check_key_equals $sample is_efas 0
+# The MARS class must be set to categorise the EFAS parameters as 'hydrological'
+# See key 'datasetForLocal'
+${tools_dir}/grib_set -s tablesVersion=19,setLocalDefinition=1,class=ce,stream=efas $ECCODES_SAMPLES_PATH/GRIB2.tmpl $sample
 
 # Test a non-ensemble, instantaneous field
 ${tools_dir}/grib_set -s productDefinitionTemplateNumber=0 $sample $temp1
 ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41 $temp1 $temp2
-grib_check_key_equals $temp2 is_efas,productDefinitionTemplateNumber '1 70'
+grib_check_key_equals $temp2 productDefinitionTemplateNumber '70'
 grib_check_key_exists $temp2 isFillup,dateOfForecast,timeOfForecast,anoffset
 
 # Test an ensemble, instantaneous field
 ${tools_dir}/grib_set -s productDefinitionTemplateNumber=1,number=13 $sample $temp1
 ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41 $temp1 $temp2
-grib_check_key_equals $temp2 is_efas,number,productDefinitionTemplateNumber '1 13 71'
+grib_check_key_equals $temp2 number,productDefinitionTemplateNumber '13 71'
 
 # Test a non-ensemble, non-instantaneous field
 ${tools_dir}/grib_set -s productDefinitionTemplateNumber=8,stepType=accum $sample $temp1
 ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41 $temp1 $temp2
-grib_check_key_equals $temp2 is_efas,productDefinitionTemplateNumber,typeOfStatisticalProcessing '1 72 1'
+grib_check_key_equals $temp2 productDefinitionTemplateNumber,typeOfStatisticalProcessing '72 1'
 
 # Test an ensemble, non-instantaneous field (plus mars.origin tests)
 ${tools_dir}/grib_set -s productDefinitionTemplateNumber=11,stepType=accum $sample $temp1
 ${tools_dir}/grib_set -s \
     setLocalDefinition=1,localDefinitionNumber=41,type=pf,inputOriginatingCentre=ecmf,typeOfPostProcessing=1 \
     $temp1 $temp2
-grib_check_key_equals $temp2 is_efas,productDefinitionTemplateNumber,typeOfStatisticalProcessing '1 73 1'
+grib_check_key_equals $temp2 productDefinitionTemplateNumber,typeOfStatisticalProcessing '73 1'
 grib_check_key_equals $temp2 mars.origin 'ecmf'
 grib_check_key_equals $temp2 mars.model  'lisflood'
 
@@ -57,10 +56,10 @@ grib_check_key_equals $temp2 mars.model  'geff'
 
 # Parameter tests
 ${tools_dir}/grib_set -s paramId=260267 $temp2 $temp3
-grib_check_key_equals $temp3 paramId,is_efas,lengthOfTimeRange '260267 1 6'
+grib_check_key_equals $temp3 paramId,lengthOfTimeRange '260267 6'
 
 ${tools_dir}/grib_set -s paramId=260268 $temp2 $temp3
-grib_check_key_equals $temp3 paramId,is_efas,lengthOfTimeRange '260268 1 24'
+grib_check_key_equals $temp3 paramId,lengthOfTimeRange '260268 24'
 
 # Use stepType
 ${tools_dir}/grib_set -s localDefinitionNumber=41,stepType=accum $sample $temp1
@@ -75,18 +74,22 @@ grib_check_key_equals $temp1 anoffsetFirst,anoffsetLast,anoffsetFrequency "MISSI
 # MARS step
 types="sfo fu go"
 for t in $types; do
-  ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36,paramId=260268 \
+  ${tools_dir}/grib_set -s \
+    setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36 \
   $sample $temp1
-  grib_check_key_equals $temp1 mars.step 36 # end step (ECC-701)
-  grib_check_key_exists $temp1 mars.anoffset
+  ${tools_dir}/grib_set -s paramId=260268 $temp1 $temp2
+  grib_check_key_equals $temp2 mars.step 36 # end step (ECC-701)
+  grib_check_key_exists $temp2 mars.anoffset
   #${tools_dir}/grib_dump -Da $temp1 | grep mars.step
 done
 
 types="fc pf cf"
 for t in $types; do
-  ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36,paramId=260268 \
+  ${tools_dir}/grib_set -s \
+    setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36 \
   $sample $temp1
-  grib_check_key_equals $temp1 mars.step 36 # end step
+  ${tools_dir}/grib_set -s paramId=260268 $temp1 $temp2
+  grib_check_key_equals $temp2 mars.step 36 # end step
   #${tools_dir}/grib_dump -Da $temp1 | grep mars.step
 done
 
diff --git a/tests/grib_indexing.sh b/tests/grib_indexing.sh
index 86abd7708..0dcd3e879 100755
--- a/tests/grib_indexing.sh
+++ b/tests/grib_indexing.sh
@@ -94,8 +94,8 @@ diff $tempRef $tempOut
 ${tools_dir}/grib_index_build -N -k mars.levtype -o $tempIndex ${data_dir}/tigge_cf_ecmwf.grib2 |\
    grep -q "mars.levtype = { sfc, pl, pv, pt }"
 
-${tools_dir}/grib_index_build -N -k mars.levtype:i -o $tempIndex ${data_dir}/tigge_cf_ecmwf.grib2 |\
-   grep -q "mars.levtype = { 103, 1, 106, 100, 101, 8, 109, 107 }"
+#${tools_dir}/grib_index_build -N -k mars.levtype:i -o $tempIndex ${data_dir}/tigge_cf_ecmwf.grib2 |\
+#   grep -q "mars.levtype = { 103, 1, 106, 100, 101, 8, 109, 107 }"
 
 echo "grib_compare with index files..."
 # ------------------------------------
diff --git a/tests/grib_set.sh b/tests/grib_set.sh
index 2871f661d..ce208f44f 100755
--- a/tests/grib_set.sh
+++ b/tests/grib_set.sh
@@ -26,8 +26,8 @@ levtype=`${tools_dir}/grib_get -p levtype $outfile`
 centre=`${tools_dir}/grib_get -p centre $outfile`
 [ $centre = "cnmc" ]
 
-levtype=`${tools_dir}/grib_get -p levtype:l $outfile`
-[ $levtype -eq 100 ]
+#levtype=`${tools_dir}/grib_get -p levtype:l $outfile`
+#[ $levtype -eq 100 ]
 
 centre=`${tools_dir}/grib_get -p centre:l $outfile`
 [ $centre -eq 80 ]
@@ -39,7 +39,7 @@ outfile=${data_dir}/set.grib2
 
 rm -f $outfile
 
-${tools_dir}/grib_set -v -p levtype:l,centre:s  -s levtype:l=100,centre:s=cnmc $infile $outfile >$REDIRECT
+${tools_dir}/grib_set -v -p levtype:l,centre:s  -s levtype=pl,centre:s=cnmc $infile $outfile >$REDIRECT
 
 levtype=`${tools_dir}/grib_get -p levtype $outfile`
 [ $levtype = "pl" ]
@@ -47,8 +47,8 @@ levtype=`${tools_dir}/grib_get -p levtype $outfile`
 centre=`${tools_dir}/grib_get -p centre $outfile`
 [ $centre = "cnmc" ]
 
-levtype=`${tools_dir}/grib_get -p levtype:l $outfile`
-[ $levtype -eq 100 ]
+#levtype=`${tools_dir}/grib_get -p levtype:l $outfile`
+#[ $levtype -eq 100 ]
 
 centre=`${tools_dir}/grib_get -p centre:l $outfile`
 [ $centre -eq 80 ]