diff --git a/bufr/src/main/java/ucar/nc2/iosp/bufr/MessageUncompressedDataReader.java b/bufr/src/main/java/ucar/nc2/iosp/bufr/MessageUncompressedDataReader.java
index 744dd08f84..63bb254956 100644
--- a/bufr/src/main/java/ucar/nc2/iosp/bufr/MessageUncompressedDataReader.java
+++ b/bufr/src/main/java/ucar/nc2/iosp/bufr/MessageUncompressedDataReader.java
@@ -233,8 +233,8 @@ private void readData(DebugOut out, BitReader reader, BitCounterUncompressed tab
 
         if (req.wantRow()) {
           int index = req.abb.addObjectToHeap(seq);
-          if (req.bb.position() >= req.bb.limit())
-            System.out.println("HEY");
+          //if (req.bb.position() >= req.bb.limit())
+          // todo: make logger System.out.println("HEY");
           req.bb.putInt(index); // an index into the Heap
         }
         continue;
@@ -358,8 +358,6 @@ private ArraySequence makeArraySequenceUncompressed(DebugOut out, BitReader read
     if (req.wantRow()) {
       Sequence seq = (Sequence) seqdd.refersTo;
 
-      if (seq == null)
-        System.out.println("HEY");
       assert seq != null;
 
       // for the obs structure
diff --git a/cdm/src/main/java/ucar/nc2/ft/fmrc/FmrcInv.java b/cdm/src/main/java/ucar/nc2/ft/fmrc/FmrcInv.java
index 2162faa799..b52ed090a5 100644
--- a/cdm/src/main/java/ucar/nc2/ft/fmrc/FmrcInv.java
+++ b/cdm/src/main/java/ucar/nc2/ft/fmrc/FmrcInv.java
@@ -279,7 +279,7 @@ public static double getOffsetInHours(CalendarDate base, CalendarDate forecast)
     double result =  diff / 1000.0 / 60.0 / 60.0;                // LOOK why convert to double? precision may be lost ??
     long testRoundoff = (long) ( result * 1000.0 * 60.0 * 60.0);
     if (diff != testRoundoff)
-      System.out.println("HEY");
+      log.debug("diff does not equal testRoundoff");
     return result;
   }
 
diff --git a/cdm/src/main/java/ucar/nc2/ft/point/standard/Table.java b/cdm/src/main/java/ucar/nc2/ft/point/standard/Table.java
index e670eb877f..761ec57301 100644
--- a/cdm/src/main/java/ucar/nc2/ft/point/standard/Table.java
+++ b/cdm/src/main/java/ucar/nc2/ft/point/standard/Table.java
@@ -1050,7 +1050,7 @@ public StructureDataIterator getStructureDataIterator(Cursor cursor, int bufferS
       StructureMembers.Member m = members.findMember(nestedTableName);
 
       if (m == null) {
-        System.out.println("HEY");
+        log.debug("Member is null");
       } else if (m.getDataType() == DataType.SEQUENCE) {
         ArraySequence seq = parentStruct.getArraySequence(m);
         return seq.getStructureDataIterator();
diff --git a/grib/src/main/java/ucar/nc2/grib/grib2/table/NcepLocalTables.java b/grib/src/main/java/ucar/nc2/grib/grib2/table/NcepLocalTables.java
index 40593dbf7b..4cd047b3e9 100644
--- a/grib/src/main/java/ucar/nc2/grib/grib2/table/NcepLocalTables.java
+++ b/grib/src/main/java/ucar/nc2/grib/grib2/table/NcepLocalTables.java
@@ -59,7 +59,7 @@
  */
 public class NcepLocalTables extends LocalTables {
   static private final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(NcepLocalTables.class);
-  static private final String defaultResourcePath = "resources/grib2/ncep/v20.0.0/";
+  static private final String defaultResourcePath = "resources/grib2/ncep/v21.0.0/";
   private static NcepLocalTables single;
 
   public static Grib2Customizer getCust(Grib2Table table) {
diff --git a/grib/src/main/resources/resources/grib1/ncep/ncepTable3.xml b/grib/src/main/resources/resources/grib1/ncep/ncepTable3.xml
index acc2263466..fe23d7a2fa 100644
--- a/grib/src/main/resources/resources/grib1/ncep/ncepTable3.xml
+++ b/grib/src/main/resources/resources/grib1/ncep/ncepTable3.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <table3>
   <title>NCEP GRIB-1 Table 3</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/on388/table3.html</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/on388/table3.html</source>
   <parameter code="1">
     <description>Ground or water surface</description>
     <abbrev>SFC</abbrev>
diff --git a/grib/src/main/resources/resources/grib1/ncep/ncepTableA.xml b/grib/src/main/resources/resources/grib1/ncep/ncepTableA.xml
index 9f57b8938c..0db0d4dc5f 100644
--- a/grib/src/main/resources/resources/grib1/ncep/ncepTableA.xml
+++ b/grib/src/main/resources/resources/grib1/ncep/ncepTableA.xml
@@ -12,7 +12,7 @@
     <description>NCEP/ARL Smoke Model</description>
   </parameter>
   <parameter code="5">
-    <description>Satellite Derived Precipitation and temperatures, from IR (See PDS Octet 41... for specific satellite ID)</description>
+    <description>Satellite Derived Precipitation and temperatures, from IR (See PDS Octet 41... dfor specific satellite ID)</description>
   </parameter>
   <parameter code="6">
     <description>NCEP/ARL Dust Model</description>
@@ -185,6 +185,9 @@
   <parameter code="99">
     <description>Miscellaneous Test ID</description>
   </parameter>
+  <parameter code="100">
+    <description>Miscellaneous Test ID</description>
+  </parameter>
   <parameter code="104">
     <description>National Blend GRIB</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib1/ncep/readme.txt b/grib/src/main/resources/resources/grib1/ncep/readme.txt
index de68e63fbc..b5a59b9fae 100644
--- a/grib/src/main/resources/resources/grib1/ncep/readme.txt
+++ b/grib/src/main/resources/resources/grib1/ncep/readme.txt
@@ -66,3 +66,7 @@
 
 12/01/2017 sarms
   - updated ncep grib1 tables using ucar/nc2/grib/grib1/tables/NcepHtmlScraper.java
+
+02/11/2019 sarms
+  - updated ncep grib1 tables using grib\src\test\java\ucar\nc2\grib\grib1\table\NcepHtmlScraper.java
+    of 5.0 branch.
\ No newline at end of file
diff --git a/grib/src/main/resources/resources/grib2/ncep/readme.txt b/grib/src/main/resources/resources/grib2/ncep/readme.txt
index b1461e5a2b..7eef08b593 100644
--- a/grib/src/main/resources/resources/grib2/ncep/readme.txt
+++ b/grib/src/main/resources/resources/grib2/ncep/readme.txt
@@ -827,4 +827,10 @@ Conflicts=0 extra=3 udunits=0
     Noticed a warning that "*** Cant parse 0-90 == 0-90 Elevation in increments of 100 m" on
     http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-216.shtml. Not sure how to interpret
     without an example file, so will leave out for now. Has been left out since 2015, when this
-    table appeared.
\ No newline at end of file
+    table appeared.
+
+02/11/2019 sarms
+  - updated ncep grib2 tables to v21.0.0 using grib\src\test\java\ucar\nc2\grib\grib2\table\NcepHtmlScraper.java
+    of 5.0 branch.
+    URL of NCEP GRIB2 docs changed (to https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/),
+    so updated that as well
\ No newline at end of file
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.0.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.0.xml
similarity index 97%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.0.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.0.xml
index 96ba84cd52..0efe57630b 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.0.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.0.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.0</table>
   <title>Product Definition Template Number</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-0.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-0.shtml</source>
   <parameter code="0">
     <description>Analysis or forecast at a horizontal level or in a horizontal layer at a point in time. (see Template 4.0)</description>
   </parameter>
@@ -61,7 +61,7 @@
     <description>Satellite product (see Template 4.31)</description>
   </parameter>
   <parameter code="32">
-    <description>Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for simulate (synthetic) staellite data (see Template 4.32)</description>
+    <description>Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for simulate (synthetic) satellite data (see Template 4.32)</description>
   </parameter>
   <parameter code="33">
     <description>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 (see Template 4.33)</description>
@@ -69,6 +69,9 @@
   <parameter code="34">
     <description>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(see Template 4.34)</description>
   </parameter>
+  <parameter code="35">
+    <description>Satellite product with or without associated quality values (see Template 4.35)</description>
+  </parameter>
   <parameter code="40">
     <description>Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for atmospheric chemical constituents. (see Template 4.40)</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.1.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.1.xml
similarity index 61%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.1.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.1.xml
index f32bb8ba14..dcc21893bb 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.1.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.1.xml
@@ -2,5 +2,5 @@
 <codeTable>
   <table>Table 4.1</table>
   <title>Parameter Category by Product Discipline</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-1.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-1.shtml</source>
 </codeTable>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.10.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.10.xml
similarity index 98%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.10.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.10.xml
index dfe4c51421..08477a91ed 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.10.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.10.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.10</table>
   <title>Type of Statistical Processing</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-10.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-10.shtml</source>
   <parameter code="0">
     <description>Average</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.11.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.11.xml
similarity index 91%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.11.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.11.xml
index 442d66926e..3cadef52fa 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.11.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.11.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.11</table>
   <title>Type of Time Intervals</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-11.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-11.shtml</source>
   <parameter code="1">
     <description>Successive times processed have same forecast time, start time of forecast is incremented.</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.12.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.12.xml
similarity index 82%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.12.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.12.xml
index 68e7e150f6..8239c92e72 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.12.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.12.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.12</table>
   <title>Operating Mode</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-12.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-12.shtml</source>
   <parameter code="0">
     <description>Maintenance Mode</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.13.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.13.xml
similarity index 80%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.13.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.13.xml
index 76d9969861..09c4ebd76f 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.13.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.13.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.13</table>
   <title>Quality Control Indicator</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-13.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-13.shtml</source>
   <parameter code="0">
     <description>No Quality Control Applied</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.14.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.14.xml
similarity index 80%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.14.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.14.xml
index 73a66b8da3..5d6512699b 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.14.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.14.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.14</table>
   <title>Clutter Filter Indicator</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-14.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-14.shtml</source>
   <parameter code="0">
     <description>No Clutter Filter Used</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.15.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.15.xml
similarity index 93%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.15.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.15.xml
index e6e3bd03b4..c3667688d3 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.15.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.15.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.15</table>
   <title>Type of Spatial Processing used to arrive at given</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-15.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-15.shtml</source>
   <parameter code="0">
     <description>Data is calculated directly from the source grid with no interpolation (see note 1)</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.16.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.16.xml
new file mode 100644
index 0000000000..769812b61f
--- /dev/null
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.16.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<codeTable>
+  <table>Table 4.16</table>
+  <title>Quality Value Associated with Parameter</title>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-16.shtml</source>
+  <parameter code="0">
+    <description>Confidence index (see Note 2)</description>
+  </parameter>
+  <parameter code="1">
+    <description>Quality indicator (see Note 3 and see Code Table 244)</description>
+  </parameter>
+  <parameter code="2">
+    <description>Correlation of Product with used Calibration Product (see Note 4)</description>
+  </parameter>
+  <parameter code="3">
+    <description>Standard deviation (see Note 5)</description>
+  </parameter>
+  <parameter code="4">
+    <description>Random error (see Note 5)</description>
+  </parameter>
+  <parameter code="255">
+    <description>Missing</description>
+  </parameter>
+</codeTable>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.0.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.0.xml
similarity index 98%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.0.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.0.xml
index 52ddbf99a7..e4b5ed8462 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.0.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.0.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.0</table>
   <title>Temperature</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-0.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-0.shtml</source>
   <parameter code="0">
     <shortName>TMP</shortName>
     <description>Temperature</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.1.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.1.xml
similarity index 95%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.1.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.1.xml
index 1641bbda85..5b3fbaef05 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.1.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.1.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.1</table>
   <title>Moisture</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-1.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-1.shtml</source>
   <parameter code="0">
     <shortName>SPFH</shortName>
     <description>Specific Humidity</description>
@@ -783,6 +783,46 @@
     <description>Frozen Rain</description>
     <units>kg m-2</units>
   </parameter>
+  <parameter code="228">
+    <shortName>FICEAC</shortName>
+    <description>Flat Ice Accumulation (FRAM)</description>
+    <units>kg m-2</units>
+  </parameter>
+  <parameter code="229">
+    <shortName>LICEAC</shortName>
+    <description>Line Ice Accumulation (FRAM)</description>
+    <units>kg m-2</units>
+  </parameter>
+  <parameter code="230">
+    <shortName>SLACC</shortName>
+    <description>Sleet Accumulation</description>
+    <units>kg m-2</units>
+  </parameter>
+  <parameter code="231">
+    <shortName>PPINDX</shortName>
+    <description>Precipitation Potential Index</description>
+    <units>%</units>
+  </parameter>
+  <parameter code="232">
+    <shortName>PROBCIP</shortName>
+    <description>Probability Cloud Ice Present</description>
+    <units>%</units>
+  </parameter>
+  <parameter code="233">
+    <shortName>SNOWLR</shortName>
+    <description>Snow Liquid ratio</description>
+    <units>kg kg-1</units>
+  </parameter>
+  <parameter code="234">
+    <shortName>PCPDUR</shortName>
+    <description>Precipitation Duration</description>
+    <units>hour</units>
+  </parameter>
+  <parameter code="235">
+    <shortName>CLLMR</shortName>
+    <description>Cloud Liquid Mixing Ratio</description>
+    <units>kg kg-1</units>
+  </parameter>
   <parameter code="241">
     <shortName>TSNOW</shortName>
     <description>Total Snow</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.13.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.13.xml
similarity index 90%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.13.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.13.xml
index 10ec0dc992..67f468ef96 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.13.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.13.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.13</table>
   <title>Aerosols</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-13.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-13.shtml</source>
   <parameter code="0">
     <shortName>AEROT</shortName>
     <description>Aerosol Type</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.14.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.14.xml
similarity index 96%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.14.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.14.xml
index 5a14c6150e..8fa9d1f923 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.14.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.14.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.14</table>
   <title>Trace gases</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-14.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-14.shtml</source>
   <parameter code="0">
     <shortName>TOZNE</shortName>
     <description>Total Ozone</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.15.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.15.xml
similarity index 96%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.15.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.15.xml
index 00c1885fa9..9af2fc26a1 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.15.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.15.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.15</table>
   <title>Radar</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-15.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-15.shtml</source>
   <parameter code="0">
     <shortName>BSWID</shortName>
     <description>Base Spectrum Width</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.16.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.16.xml
similarity index 95%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.16.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.16.xml
index 613703f49a..604a775d7c 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.16.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.16.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.16</table>
   <title>Forecast Radar Imagery</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-16.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-16.shtml</source>
   <parameter code="0">
     <shortName>REFZR</shortName>
     <description>Equivalent radar reflectivity factor for rain</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.17.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.17.xml
similarity index 85%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.17.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.17.xml
index 022ed4f2f3..43781f3faf 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.17.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.17.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.17</table>
   <title>Electrodynamics</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-17.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-17.shtml</source>
   <parameter code="0">
     <shortName>LTNGSD</shortName>
     <description>Lightning Strike Density</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.18.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.18.xml
similarity index 96%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.18.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.18.xml
index 4f7fbc75f6..64c5bcd4e3 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.18.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.18.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.18</table>
   <title>Nuclear/radiology</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-18.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-18.shtml</source>
   <parameter code="0">
     <shortName>ACCES</shortName>
     <description>Air Concentration of Caesium 137</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.19.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.19.xml
similarity index 95%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.19.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.19.xml
index 0f406c259c..89adf7b9b4 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.19.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.19.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.19</table>
   <title>Physical atmospheric Properties</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-19.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-19.shtml</source>
   <parameter code="0">
     <shortName>VIS</shortName>
     <description>Visibility</description>
@@ -358,4 +358,19 @@
     <description>Joint Fire Weather Probability</description>
     <units>%</units>
   </parameter>
+  <parameter code="236">
+    <shortName>SNOWLVL</shortName>
+    <description>Snow Level</description>
+    <units>m</units>
+  </parameter>
+  <parameter code="237">
+    <shortName>DRYTPROB</shortName>
+    <description>Dry Thunderstorm Probability</description>
+    <units>%</units>
+  </parameter>
+  <parameter code="238">
+    <shortName>ELLINX</shortName>
+    <description>Ellrod Index</description>
+    <units />
+  </parameter>
 </parameterMap>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.190.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.190.xml
similarity index 74%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.190.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.190.xml
index ed8e461aa7..6bba4bc5f4 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.190.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.190.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.190</table>
   <title>CCITT IA5 string</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-190.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-190.shtml</source>
   <parameter code="0">
     <shortName>ATEXT</shortName>
     <description>Arbitrary Text String</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.191.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.191.xml
similarity index 94%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.191.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.191.xml
index be2c8e91d5..bb8e86bc79 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.191.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.191.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.191</table>
   <title>Miscellaneous</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-191.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-191.shtml</source>
   <parameter code="0">
     <shortName>TSEC</shortName>
     <description>Seconds prior to initial reference time (defined in Section 1)</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.192.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.192.xml
similarity index 97%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.192.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.192.xml
index 2734c7acba..7401beee65 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.192.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.192.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.192</table>
   <title>Covariance</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-192.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-192.shtml</source>
   <parameter code="1">
     <shortName>COVMZ</shortName>
     <description>Covariance between zonal and meridional components of the wind. Defined as [uv]-[u][v], where "[]" indicates the mean over the indicated time span.</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.2.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.2.xml
similarity index 92%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.2.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.2.xml
index dcbfaabc0f..d4b68b5a8d 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.2.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.2.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.2</table>
   <title>Momentum</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-2.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-2.shtml</source>
   <parameter code="0">
     <shortName>WDIR</shortName>
     <description>Wind Direction (from which blowing)</description>
@@ -403,4 +403,34 @@
     <description>Ventilation Rate</description>
     <units>m2 s-1</units>
   </parameter>
+  <parameter code="225">
+    <shortName>TRWSPD</shortName>
+    <description>Transport Wind Speed</description>
+    <units>m s-1</units>
+  </parameter>
+  <parameter code="226">
+    <shortName>TRWDIR</shortName>
+    <description>Transport Wind Direction</description>
+    <units>Deg</units>
+  </parameter>
+  <parameter code="227">
+    <shortName>TOA10</shortName>
+    <description>Earliest Reasonable Arrival Time (10% exceedance)</description>
+    <units>s</units>
+  </parameter>
+  <parameter code="228">
+    <shortName>TOA50</shortName>
+    <description>Most Likely Arrival Time (50% exceedance)</description>
+    <units>s</units>
+  </parameter>
+  <parameter code="229">
+    <shortName>TOD50</shortName>
+    <description>Most Likely Departure Time (50% exceedance)</description>
+    <units>s</units>
+  </parameter>
+  <parameter code="230">
+    <shortName>TOD90</shortName>
+    <description>Latest Reasonable Departure Time (90% exceedance)</description>
+    <units>s</units>
+  </parameter>
 </parameterMap>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.20.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.20.xml
similarity index 98%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.20.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.20.xml
index 3f075302ad..1c823d60a6 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.20.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.20.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.20</table>
   <title>Atmospheric Chemical Constituents</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-20.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-20.shtml</source>
   <parameter code="0">
     <shortName>MASSDEN</shortName>
     <description>Mass Density (Concentration)</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.3.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.3.xml
similarity index 98%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.3.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.3.xml
index a63f7c46e0..e4b0477f6c 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.3.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.3.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.3</table>
   <title>Mass</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-3.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-3.shtml</source>
   <parameter code="0">
     <shortName>PRES</shortName>
     <description>Pressure</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.4.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.4.xml
similarity index 98%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.4.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.4.xml
index 19d84917c0..381c94d490 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.4.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.4.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.4</table>
   <title>Short wave radiation</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-4.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-4.shtml</source>
   <parameter code="0">
     <shortName>NSWRS</shortName>
     <description>Net Short-Wave Radiation Flux (Surface)*</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.5.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.5.xml
similarity index 96%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.5.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.5.xml
index e261bce8aa..70cbc81c77 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.5.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.5.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.5</table>
   <title>Long wave radiation</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-5.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-5.shtml</source>
   <parameter code="0">
     <shortName>NLWRS</shortName>
     <description>Net Long-Wave Radiation Flux (Surface)*</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.6.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.6.xml
similarity index 98%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.6.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.6.xml
index 860e75026d..84d23a3d38 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.6.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.6.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.6</table>
   <title>Cloud</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-6.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-6.shtml</source>
   <parameter code="0">
     <shortName>CICE</shortName>
     <description>Cloud Ice</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.7.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.7.xml
similarity index 90%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.7.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.7.xml
index acc1f01a4f..20e0bbb413 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.0.7.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.0.7.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.0.7</table>
   <title>Thermodynamic stability indices</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-0-7.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-0-7.shtml</source>
   <parameter code="0">
     <shortName>PLI</shortName>
     <description>Parcel Lifted Index (to 500 hPa)</description>
@@ -143,4 +143,14 @@
     <description>Hourly Minimum of Updraft Helicity</description>
     <units>m2 s-2</units>
   </parameter>
+  <parameter code="201">
+    <shortName>BNEGLAY</shortName>
+    <description>Bourgoiun Negative Energy Layer (surface to freezing level)</description>
+    <units>J kg-1</units>
+  </parameter>
+  <parameter code="202">
+    <shortName>BPOSELAY</shortName>
+    <description>Bourgoiun Positive Energy Layer (2k ft AGL to 400 hPa)</description>
+    <units>J kg-1</units>
+  </parameter>
 </parameterMap>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.1.0.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.1.0.xml
similarity index 97%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.1.0.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.1.0.xml
index a9b5b81787..2f8e76b856 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.1.0.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.1.0.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.1.0</table>
   <title>Hydrology Basic</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-1-0.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-1-0.shtml</source>
   <parameter code="0">
     <shortName>FFLDG</shortName>
     <description>Flash Flood Guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time)</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.1.1.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.1.1.xml
similarity index 93%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.1.1.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.1.1.xml
index 4543c7b519..98fb75ee16 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.1.1.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.1.1.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.1.1</table>
   <title>Hydrology Probabilities</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-1-1.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-1-1.shtml</source>
   <parameter code="0">
     <shortName>CPPOP</shortName>
     <description>Conditional percent precipitation amount fractile for an overall period (encoded as an accumulation)</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.1.2.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.1.2.xml
similarity index 95%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.1.2.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.1.2.xml
index 2fe10e0d64..e0431a2156 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.1.2.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.1.2.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.1.2</table>
   <title>Inland Water and Sediment Properties</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-1-2.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-1-2.shtml</source>
   <parameter code="0">
     <shortName>WDPTHIL</shortName>
     <description>Water Depth</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.0.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.0.xml
similarity index 98%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.0.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.0.xml
index b50858e304..b7331573d2 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.0.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.0.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.10.0</table>
   <title>Waves</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-10-0.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-10-0.shtml</source>
   <parameter code="0">
     <shortName>WVSP1</shortName>
     <description>Wave Spectra (1)</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.1.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.1.xml
similarity index 93%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.1.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.1.xml
index cf412709b7..076ffe933f 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.1.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.1.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.10.1</table>
   <title>Currents</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-10-1.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-10-1.shtml</source>
   <parameter code="0">
     <shortName>DIRC</shortName>
     <description>Current Direction</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.191.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.191.xml
similarity index 86%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.191.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.191.xml
index 7ab28dfe7b..23c027d892 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.191.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.191.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.10.191</table>
   <title>Miscellaneous</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-10-191.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-10-191.shtml</source>
   <parameter code="0">
     <shortName>TSEC</shortName>
     <description>Seconds Prior To Initial Reference Time (Defined In Section 1)</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.2.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.2.xml
similarity index 95%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.2.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.2.xml
index b7514ddac0..2a1d70c007 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.2.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.2.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.10.2</table>
   <title>Ice</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-10-2.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-10-2.shtml</source>
   <parameter code="0">
     <shortName>ICEC</shortName>
     <description>Ice Cover</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.3.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.3.xml
similarity index 97%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.3.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.3.xml
index 399d9a443d..8984b34a54 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.3.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.3.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.10.3</table>
   <title>Surface Properties</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-10-3.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-10-3.shtml</source>
   <parameter code="0">
     <shortName>WTMP</shortName>
     <description>Water Temperature</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.4.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.4.xml
similarity index 96%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.4.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.4.xml
index 40d3711054..fbef54b36e 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.10.4.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.10.4.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.10.4</table>
   <title>Sub-surface Properties</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-10-4.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-10-4.shtml</source>
   <parameter code="0">
     <shortName>MTHD</shortName>
     <description>Main Thermocline Depth</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.2.0.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.2.0.xml
similarity index 99%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.2.0.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.2.0.xml
index 1848c0f47b..e4d513570d 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.2.0.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.2.0.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.2.0</table>
   <title>Vegetation/Biomass</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-2-0.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-2-0.shtml</source>
   <parameter code="0">
     <shortName>LAND</shortName>
     <description>Land Cover (0=sea, 1=land)</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.2.1.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.2.1.xml
similarity index 75%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.2.1.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.2.1.xml
index 858b4845cb..73e31bee1d 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.2.1.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.2.1.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.2.1</table>
   <title>Agricultural/aquacultural special products</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-2-1.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-2-1.shtml</source>
   <parameter code="192">
     <shortName>CANL</shortName>
     <description>Cold Advisory for Newborn Livestock</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.2.3.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.2.3.xml
similarity index 98%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.2.3.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.2.3.xml
index 6c4dd90f8e..4678643435 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.2.3.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.2.3.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.2.3</table>
   <title>Soil Products</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-2-3.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-2-3.shtml</source>
   <parameter code="0">
     <shortName>SOTYP</shortName>
     <description>Soil Type</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.2.4.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.2.4.xml
similarity index 95%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.2.4.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.2.4.xml
index 816c626e03..cc93b04abd 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.2.4.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.2.4.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.2.4</table>
   <title>Fire Weather Products</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-2-4.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-2-4.shtml</source>
   <parameter code="0">
     <shortName>FIREOLK</shortName>
     <description>Fire Outlook</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.2.5.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.2.5.xml
similarity index 74%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.2.5.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.2.5.xml
index b92ae18009..381de4277e 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.2.5.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.2.5.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.2.5</table>
   <title>Glaciers and Inland Ice Products</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-2-5.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-2-5.shtml</source>
   <parameter code="1">
     <shortName>GLACTMP</shortName>
     <description>Glacier Temperature</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.0.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.0.xml
similarity index 94%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.0.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.0.xml
index b982b4093f..1c30559431 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.0.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.0.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.3.0</table>
   <title>Image format Products</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-3-0.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-3-0.shtml</source>
   <parameter code="0">
     <shortName>SRAD</shortName>
     <description>Scaled Radiance</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.1.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.1.xml
similarity index 97%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.1.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.1.xml
index 4cee57e603..d6b3f4c5ff 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.1.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.1.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.3.1</table>
   <title>Quantitative Products</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-3-1.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-3-1.shtml</source>
   <parameter code="0">
     <shortName>ESTP</shortName>
     <description>Estimated Precipitation</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.192.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.192.xml
similarity index 98%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.192.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.192.xml
index 789f1b840b..44b8e38754 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.192.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.192.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.3.192</table>
   <title>Forecast Satellite Imagery Products</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-3-192.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-3-192.shtml</source>
   <parameter code="0">
     <shortName>SBT122</shortName>
     <description>Simulated Brightness Temperature for GOES 12, Channel 2</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.2.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.2.xml
similarity index 95%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.2.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.2.xml
index b9723eb38d..469928d5b4 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.2.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.2.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.3.2</table>
   <title>Cloud Properties</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-3-2.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-3-2.shtml</source>
   <parameter code="0">
     <shortName>CSKPROB</shortName>
     <description>Clear Sky Probability</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.3.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.3.xml
similarity index 87%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.3.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.3.xml
index 2a6b8a6ad1..1a63f0f351 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.3.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.3.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.3.3</table>
   <title>Flight Rules Conditions</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-3-3.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-3-3.shtml</source>
   <parameter code="0">
     <shortName>PBMVFRC</shortName>
     <description>Probability of Encountering Marginal Visual Flight Rules Conditions</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.4.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.4.xml
similarity index 94%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.4.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.4.xml
index d83d873bd9..9f6a76cfa5 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.4.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.4.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.3.4</table>
   <title>Volcanic Ash</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-3-4.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-3-4.shtml</source>
   <parameter code="0">
     <shortName>VOLAPROB</shortName>
     <description>Volcanic Ash Probability</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.5.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.5.xml
similarity index 92%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.5.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.5.xml
index 5eae43c2fd..a391db1eb5 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.5.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.5.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.3.5</table>
   <title>Sea-surface Temperatur</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-3-5.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-3-5.shtml</source>
   <parameter code="0">
     <shortName>ISSTMP</shortName>
     <description>Interface Sea-Surface Temperature (See Note 1)</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.6.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.6.xml
similarity index 91%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.6.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.6.xml
index 5ff249406d..609be4a112 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.3.6.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.3.6.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.3.6</table>
   <title>Solar radiation</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-3-6.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-3-6.shtml</source>
   <parameter code="0">
     <shortName>GSOLIRR</shortName>
     <description>Global Solar Irradiance (See Note 1)</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.0.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.0.xml
similarity index 90%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.0.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.0.xml
index eec87a3a8a..dc7e5aa891 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.0.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.0.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.4.0</table>
   <title>Temperature</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-4-0.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-4-0.shtml</source>
   <parameter code="0">
     <shortName>TMPSWP</shortName>
     <description>Temperature</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.1.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.1.xml
similarity index 89%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.1.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.1.xml
index 24bf989467..d31af03f3d 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.1.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.1.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.4.1</table>
   <title>Momentum</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-4-1.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-4-1.shtml</source>
   <parameter code="0">
     <shortName>SPEED</shortName>
     <description>Velocity Magnitude (Speed)</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.2.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.2.xml
similarity index 94%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.2.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.2.xml
index a60cf6d452..ac779900b1 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.2.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.2.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.4.2</table>
   <title>Charged Particle Mass and Number</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-4-2.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-4-2.shtml</source>
   <parameter code="0">
     <shortName>PLSMDEN</shortName>
     <description>Particle Number Density</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.3.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.3.xml
similarity index 93%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.3.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.3.xml
index 417bd56007..9e67a1cc9b 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.3.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.3.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.4.3</table>
   <title>Electric and Magnetic Fields</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-4-3.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-4-3.shtml</source>
   <parameter code="0">
     <shortName>BTOT</shortName>
     <description>Magnetic Field Magnitude</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.4.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.4.xml
similarity index 92%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.4.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.4.xml
index bb1fa106b0..4003ccee48 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.4.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.4.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.4.4</table>
   <title>Energetic Particles</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-4-4.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-4-4.shtml</source>
   <parameter code="0">
     <shortName>DIFPFLUX</shortName>
     <description>Proton Flux (Differential)</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.5.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.5.xml
similarity index 55%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.5.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.5.xml
index 7dcc1d2aa6..817cfe2942 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.5.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.5.xml
@@ -2,5 +2,5 @@
 <parameterMap>
   <table>Table4.2.4.5</table>
   <title>Waves</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-4-5.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-4-5.shtml</source>
 </parameterMap>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.6.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.6.xml
similarity index 92%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.6.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.6.xml
index dad76992be..22c19a83ca 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.6.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.6.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.4.6</table>
   <title>Solar Electromagnetic Emissions</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-4-6.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-4-6.shtml</source>
   <parameter code="0">
     <shortName>TSI</shortName>
     <description>Integrated Solar Irradiance</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.7.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.7.xml
similarity index 88%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.7.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.7.xml
index 33742af043..8d9c4e1def 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.7.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.7.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.4.7</table>
   <title>Terrestrial Electromagnetic Emissions</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-4-7.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-4-7.shtml</source>
   <parameter code="0">
     <shortName>LMBINT</shortName>
     <description>Limb Intensity</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.8.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.8.xml
similarity index 93%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.8.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.8.xml
index 203400d318..f4aa65fe88 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.8.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.8.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.4.8</table>
   <title>Imagery</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-4-8.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-4-8.shtml</source>
   <parameter code="0">
     <shortName>XRAYRAD</shortName>
     <description>X-Ray Radiance</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.9.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.9.xml
similarity index 85%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.9.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.9.xml
index b3dd06c514..c68b580992 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.2.4.9.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.2.4.9.xml
@@ -2,7 +2,7 @@
 <parameterMap>
   <table>Table4.2.4.9</table>
   <title>Ion-Neutral Coupling</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-2-4-9.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-2-4-9.shtml</source>
   <parameter code="0">
     <shortName>SIGPED</shortName>
     <description>Pedersen Conductivity</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.201.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.201.xml
similarity index 91%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.201.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.201.xml
index 082df17569..9382a0acb4 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.201.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.201.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.201</table>
   <title>Precipitation Type</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-201.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-201.shtml</source>
   <parameter code="1">
     <description>Rain</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.202.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.202.xml
similarity index 69%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.202.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.202.xml
index e43fc08499..6a9a5eff3f 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.202.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.202.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.202</table>
   <title>Precipitable Water Category</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-202.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-202.shtml</source>
   <parameter code="255">
     <description>Missing</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.203.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.203.xml
similarity index 96%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.203.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.203.xml
index fa9d9907c0..f2b488c3d2 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.203.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.203.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.203</table>
   <title>Cloud Type</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-203.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-203.shtml</source>
   <parameter code="0">
     <description>Clear</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.204.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.204.xml
similarity index 86%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.204.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.204.xml
index 0bcce47bfc..3866dffaf2 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.204.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.204.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.204</table>
   <title>Thunderstorm Coverage</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-204.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-204.shtml</source>
   <parameter code="0">
     <description>None</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.205.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.205.xml
similarity index 79%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.205.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.205.xml
index ce52979c79..e2918b8556 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.205.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.205.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.205</table>
   <title>Presence of Aerosol</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-205.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-205.shtml</source>
   <parameter code="0">
     <description>Aerosol not present</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.206.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.206.xml
similarity index 78%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.206.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.206.xml
index 31bcca889e..db5065eaac 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.206.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.206.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.206</table>
   <title>Volcanic Ash</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-206.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-206.shtml</source>
   <parameter code="0">
     <description>Not Present</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.207.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.207.xml
similarity index 86%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.207.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.207.xml
index 06b1ff2d28..d55779740c 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.207.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.207.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.207</table>
   <title>Icing</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-207.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-207.shtml</source>
   <parameter code="0">
     <description>None</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.208.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.208.xml
similarity index 85%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.208.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.208.xml
index b2cc6048ef..c9cdd4c889 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.208.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.208.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.208</table>
   <title>Turbulence</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-208.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-208.shtml</source>
   <parameter code="0">
     <description>None</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.209.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.209.xml
similarity index 85%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.209.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.209.xml
index 6197d36506..f6187e5e87 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.209.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.209.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.209</table>
   <title>Planetary BoundaryLayer Regime</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-209.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-209.shtml</source>
   <parameter code="1">
     <description>Stable</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.210.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.210.xml
similarity index 79%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.210.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.210.xml
index bd04899649..ddba542dfc 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.210.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.210.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.210</table>
   <title>Contrail Intensity</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-210.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-210.shtml</source>
   <parameter code="0">
     <description>Contrail Not Present</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.211.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.211.xml
similarity index 82%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.211.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.211.xml
index e4b470c19b..62f871acb6 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.211.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.211.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.211</table>
   <title>Contrail Engine Type</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-211.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-211.shtml</source>
   <parameter code="0">
     <description>Low Bypass</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.212.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.212.xml
similarity index 92%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.212.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.212.xml
index a68f2480f9..c27938ec4b 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.212.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.212.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.212</table>
   <title>Land Use</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-212.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-212.shtml</source>
   <parameter code="1">
     <description>Urban Land</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.213.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.213.xml
similarity index 91%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.213.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.213.xml
index c428406207..3d53b4867a 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.213.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.213.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.213</table>
   <title>Soil Type</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-213.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-213.shtml</source>
   <parameter code="1">
     <description>Sand</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.215.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.215.xml
similarity index 82%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.215.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.215.xml
index ca7a716541..cacd4dde9e 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.215.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.215.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.215</table>
   <title>Remotely Sensed Snow Coverage</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-215.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-215.shtml</source>
   <parameter code="50">
     <description>No-Snow/No-Cloud</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.216.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.216.xml
similarity index 75%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.216.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.216.xml
index ccb8397d7c..e3e2306e39 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.216.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.216.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.216</table>
   <title>Elevation of Snow Covered Terrain</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-216.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-216.shtml</source>
   <parameter code="254">
     <description>Clouds</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.217.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.217.xml
similarity index 84%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.217.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.217.xml
index 8713305e51..d674de5a51 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.217.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.217.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.217</table>
   <title>Cloud Mask Type</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-217.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-217.shtml</source>
   <parameter code="0">
     <description>Clear over water</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.218.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.218.xml
similarity index 97%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.218.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.218.xml
index 9d7c73977a..063f36fa0d 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.218.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.218.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.218</table>
   <title>Pixel Scene Type</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-218.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-218.shtml</source>
   <parameter code="0">
     <description>No Scene Identified</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.219.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.219.xml
similarity index 86%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.219.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.219.xml
index a886dfcb82..af661c790f 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.219.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.219.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.219</table>
   <title>Cloud Top Height Quality Indicator</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-219.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-219.shtml</source>
   <parameter code="0">
     <description>Nominal Cloud Top Height Quality</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.220.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.220.xml
similarity index 79%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.220.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.220.xml
index 6b76d29ce4..7f257823f3 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.220.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.220.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.220</table>
   <title>Horizontal Dimension Processed</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-220.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-220.shtml</source>
   <parameter code="0">
     <description>Latitude</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.221.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.221.xml
similarity index 79%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.221.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.221.xml
index e43e3c8a33..da506f1ec4 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.221.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.221.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.221</table>
   <title>Treatment of Missing Data</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-221.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-221.shtml</source>
   <parameter code="0">
     <description>Not included</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.222.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.222.xml
similarity index 78%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.222.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.222.xml
index d078907774..da64cf96d4 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.222.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.222.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.222</table>
   <title>Categorical Result</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-222.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-222.shtml</source>
   <parameter code="0">
     <description>No</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.223.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.223.xml
similarity index 85%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.223.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.223.xml
index 210de7373d..8b00d1c84a 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.223.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.223.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.223</table>
   <title>Fire Detection Indicator</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-223.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-223.shtml</source>
   <parameter code="0">
     <description>No Fire Detected</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.224.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.224.xml
similarity index 90%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.224.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.224.xml
index 341bae5d39..ae0ebe1007 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.224.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.224.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.224</table>
   <title>Categorical Outlook</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-224.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-224.shtml</source>
   <parameter code="0">
     <description>No Risk Area</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.225.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.225.xml
similarity index 54%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.225.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.225.xml
index 253d06dee6..2e2522215f 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.225.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.225.xml
@@ -2,5 +2,5 @@
 <codeTable>
   <table>Table 4.225</table>
   <title>Weather</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-225.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-225.shtml</source>
 </codeTable>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.227.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.227.xml
similarity index 86%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.227.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.227.xml
index 8bd530866c..1a41bb6e6a 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.227.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.227.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.227</table>
   <title>Icing Scenario (Weather/Cloud Classification)</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-227.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-227.shtml</source>
   <parameter code="0">
     <description>None</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.230.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.230.xml
similarity index 99%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.230.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.230.xml
index 8332da46b8..35a1679c52 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.230.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.230.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.230</table>
   <title>Atmospheric Chemical or Physical Type</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-230.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-230.shtml</source>
   <parameter code="0">
     <description>Ozone</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.233.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.233.xml
similarity index 99%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.233.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.233.xml
index d0f4b532d3..f50f505ae1 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.233.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.233.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.233</table>
   <title>Aerosol Type</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-233.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-233.shtml</source>
   <parameter code="0">
     <description>Ozone</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.234.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.234.xml
similarity index 95%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.234.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.234.xml
index f1bae85e04..aa90d37cb1 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.234.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.234.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.234</table>
   <title>Canopy Cover Fraction</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-234.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-234.shtml</source>
   <parameter code="1">
     <description>Crops, mixed farming</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.235.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.235.xml
similarity index 81%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.235.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.235.xml
index 2f32eb4cc8..70ece5b046 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.235.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.235.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.235</table>
   <title>WaveGenerated Wave Spectral Description</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-235.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-235.shtml</source>
   <parameter code="0">
     <description>Total Wave Spectrum (combined wind waves and swell)</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.236.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.236.xml
similarity index 88%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.236.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.236.xml
index 803f3d64d0..9dd14c9b2f 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.236.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.236.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.236</table>
   <title>Soil Texture Cover Fraction</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-236.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-236.shtml</source>
   <parameter code="1">
     <description>Coarse</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.240.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.240.xml
similarity index 95%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.240.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.240.xml
index b3085fbefc..0e2fdfa95f 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.240.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.240.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.240</table>
   <title>Type of Distribution Function</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-240.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-240.shtml</source>
   <parameter code="0">
     <description>No specific distribution function given</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.241.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.241.xml
similarity index 86%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.241.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.241.xml
index ece68c2f3d..4f59d85979 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.241.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.241.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.241</table>
   <title>Coverage Attributes</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-241.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-241.shtml</source>
   <parameter code="0">
     <description>Undefined</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.242.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.242.xml
similarity index 83%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.242.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.242.xml
index 7e6e4508a6..1453a39c82 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.242.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.242.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.242</table>
   <title>Tile Classification</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-242.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-242.shtml</source>
   <parameter code="1">
     <description>Land use classes according to ESA-GLOBCOVER GCV2009</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.243.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.243.xml
similarity index 97%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.243.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.243.xml
index db1cd7a28a..34f8506b4a 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.243.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.243.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.243</table>
   <title>Tile Class</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-243.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-243.shtml</source>
   <parameter code="1">
     <description>Evergreen broadleaved forest</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.244.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.244.xml
similarity index 71%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.244.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.244.xml
index 46dd0bcd75..ba2dc21984 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.244.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.244.xml
@@ -2,9 +2,9 @@
 <codeTable>
   <table>Table 4.244</table>
   <title>Quality Indicator</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-244.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-244.shtml</source>
   <parameter code="0">
-    <description>Quality Information Not Given</description>
+    <description>No Quality Information Available</description>
   </parameter>
   <parameter code="1">
     <description>Failed</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.3.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.3.xml
similarity index 84%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.3.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.3.xml
index c14e7de13a..e205fe66aa 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.3.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.3.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.3</table>
   <title>Type of Generating Process</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-3.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-3.shtml</source>
   <parameter code="0">
     <description>Analysis</description>
   </parameter>
@@ -75,6 +75,15 @@
   <parameter code="196">
     <description>Perturbed Analysis for Ensemble Initialization</description>
   </parameter>
+  <parameter code="197">
+    <description>Ensemble Agreement Scale Probability</description>
+  </parameter>
+  <parameter code="198">
+    <description>Post-Processed Deterministic-Expert-Weighted Forecast</description>
+  </parameter>
+  <parameter code="199">
+    <description>Ensemble Forecast Based on Counting</description>
+  </parameter>
   <parameter code="255">
     <description>Missing</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.4.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.4.xml
similarity index 92%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.4.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.4.xml
index 0d2adcb153..aca015c4f3 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.4.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.4.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.4</table>
   <title>Indicator of Unit of Time Range</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-4.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-4.shtml</source>
   <parameter code="0">
     <description>Minute</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.5.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.5.xml
similarity index 98%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.5.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.5.xml
index 91ae470067..b09d40963a 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.5.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.5.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.5</table>
   <title>Fixed Surface Types and Units</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-5.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-5.shtml</source>
   <parameter code="1">
     <description>Ground or Water Surface</description>
   </parameter>
@@ -142,7 +142,7 @@
     <description>Bottom Of Sediment Layer Penetrated By Thermal Wave</description>
   </parameter>
   <parameter code="166">
-    <description>Maxing Layer</description>
+    <description>Mixing Layer</description>
   </parameter>
   <parameter code="167">
     <description>Bottom of Root Zone</description>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.6.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.6.xml
similarity index 89%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.6.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.6.xml
index 6006b9545c..c49ba714b7 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.6.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.6.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.6</table>
   <title>Type of Ensemble Forecast</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-6.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-6.shtml</source>
   <parameter code="0">
     <description>Unperturbed High-Resolution Control Forecast</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.7.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.7.xml
similarity index 95%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.7.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.7.xml
index 470049e237..152477a1b5 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.7.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.7.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.7</table>
   <title>Derived Forecast</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-7.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-7.shtml</source>
   <parameter code="0">
     <description>Unweighted Mean of All Members</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.8.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.8.xml
similarity index 80%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.8.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.8.xml
index fac3d476ef..8163ee7050 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.8.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.8.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.8</table>
   <title>Clustering Method</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-8.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-8.shtml</source>
   <parameter code="0">
     <description>Anomoly Correlation</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.9.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.9.xml
similarity index 89%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.9.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.9.xml
index 8bb1168fb5..738acfde83 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.9.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.9.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.9</table>
   <title>Probability Type</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-9.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-9.shtml</source>
   <parameter code="0">
     <description>Probability of event below lower limit</description>
   </parameter>
diff --git a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.91.xml b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.91.xml
similarity index 94%
rename from grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.91.xml
rename to grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.91.xml
index d563612f48..554c605e45 100644
--- a/grib/src/main/resources/resources/grib2/ncep/v20.0.0/Table4.91.xml
+++ b/grib/src/main/resources/resources/grib2/ncep/v21.0.0/Table4.91.xml
@@ -2,7 +2,7 @@
 <codeTable>
   <table>Table 4.91</table>
   <title>Type of Interval</title>
-  <source>http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-91.shtml</source>
+  <source>https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_table4-91.shtml</source>
   <parameter code="0">
     <description>Smaller than first limit</description>
   </parameter>