diff --git a/rgbnir_definition.json b/rgbnir_definition.json
index 796169422d93e7dc583bfd586b022dcd3bb393ca..22bbe3b0d2154f8369ca78d1a9497806c5b1ad3d 100644
--- a/rgbnir_definition.json
+++ b/rgbnir_definition.json
@@ -297,7 +297,7 @@
             }
         ],
         "data_type": "Uint16",
-        "name": "hv_unit16"
+        "name": "hv_uint16"
     }, {
         "bands": [{
                 "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
@@ -317,7 +317,147 @@
             }
         ],
         "data_type": "Uint16",
-        "name": "vh_unit16"
+        "name": "vh_uint16"
+    }, {
+        "bands": [{
+                "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
+                "description": "Gray Channel",
+                "gdal_interpretation": "GrayBand",
+                "identifier": "hh_real",
+                "name": "hh_real",
+                "nil_values": [{
+                    "reason": "http://www.opengis.net/def/nil/OGC/0/unknown",
+                    "value": 0
+                }],
+                "uom": "W.m-2.Sr-1",
+                "significant_figures": 5,
+                "allowed_value_ranges": [
+                    [-32768, 32767]
+                ]
+            }, {
+                "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
+                "description": "Gray Channel",
+                "gdal_interpretation": "GrayBand",
+                "identifier": "hh_complex",
+                "name": "hh_complex",
+                "nil_values": [{
+                    "reason": "http://www.opengis.net/def/nil/OGC/0/unknown",
+                    "value": 0
+                }],
+                "uom": "W.m-2.Sr-1",
+                "significant_figures": 5,
+                "allowed_value_ranges": [
+                    [-32768, 32767]
+                ]
+            }
+        ],
+        "data_type": "Int16",
+        "name": "hh_int16"
+    }, {
+        "bands": [{
+                "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
+                "description": "Gray Channel",
+                "gdal_interpretation": "GrayBand",
+                "identifier": "hv_real",
+                "name": "hv_real",
+                "nil_values": [{
+                    "reason": "http://www.opengis.net/def/nil/OGC/0/unknown",
+                    "value": 0
+                }],
+                "uom": "W.m-2.Sr-1",
+                "significant_figures": 5,
+                "allowed_value_ranges": [
+                    [-32768, 32767]
+                ]
+            }, {
+                "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
+                "description": "Gray Channel",
+                "gdal_interpretation": "GrayBand",
+                "identifier": "hv_complex",
+                "name": "hv_complex",
+                "nil_values": [{
+                    "reason": "http://www.opengis.net/def/nil/OGC/0/unknown",
+                    "value": 0
+                }],
+                "uom": "W.m-2.Sr-1",
+                "significant_figures": 5,
+                "allowed_value_ranges": [
+                    [-32768, 32767]
+                ]
+            }
+        ],
+        "data_type": "Int16",
+        "name": "hv_int16"
+    }, {
+        "bands": [{
+                "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
+                "description": "Gray Channel",
+                "gdal_interpretation": "GrayBand",
+                "identifier": "vh_real",
+                "name": "vh_real",
+                "nil_values": [{
+                    "reason": "http://www.opengis.net/def/nil/OGC/0/unknown",
+                    "value": 0
+                }],
+                "uom": "W.m-2.Sr-1",
+                "significant_figures": 5,
+                "allowed_value_ranges": [
+                    [-32768, 32767]
+                ]
+            }, {
+                "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
+                "description": "Gray Channel",
+                "gdal_interpretation": "GrayBand",
+                "identifier": "vh_complex",
+                "name": "vh_complex",
+                "nil_values": [{
+                    "reason": "http://www.opengis.net/def/nil/OGC/0/unknown",
+                    "value": 0
+                }],
+                "uom": "W.m-2.Sr-1",
+                "significant_figures": 5,
+                "allowed_value_ranges": [
+                    [-32768, 32767]
+                ]
+            }
+        ],
+        "data_type": "Int16",
+        "name": "vh_int16"
+    }, {
+        "bands": [{
+                "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
+                "description": "Gray Channel",
+                "gdal_interpretation": "GrayBand",
+                "identifier": "vv_real",
+                "name": "vv_real",
+                "nil_values": [{
+                    "reason": "http://www.opengis.net/def/nil/OGC/0/unknown",
+                    "value": 0
+                }],
+                "uom": "W.m-2.Sr-1",
+                "significant_figures": 5,
+                "allowed_value_ranges": [
+                    [-32768, 32767]
+                ]
+            }, {
+                "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
+                "description": "Gray Channel",
+                "gdal_interpretation": "GrayBand",
+                "identifier": "vv_complex",
+                "name": "vv_complex",
+                "nil_values": [{
+                    "reason": "http://www.opengis.net/def/nil/OGC/0/unknown",
+                    "value": 0
+                }],
+                "uom": "W.m-2.Sr-1",
+                "significant_figures": 5,
+                "allowed_value_ranges": [
+                    [-32768, 32767]
+                ]
+            }
+        ],
+        "data_type": "Int16",
+        "name": "vv_int16"
     }, {
         "bands": [{
                 "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",