diff --git a/definitions/grib2/template.4.80.def b/definitions/grib2/template.4.80.def
index 4e3325762..383553c8b 100644
--- a/definitions/grib2/template.4.80.def
+++ b/definitions/grib2/template.4.80.def
@@ -9,6 +9,12 @@
 
 # TEMPLATE 4.80, Analysis or forecast at a horizontal level or in a horizontal layer at a point in time for optical properties of aerosol with source/sink
 
-include "grib2/template.4.parameter_aerosol_optical_source.def";
+include "grib2/template.4.parameter.def"
+include "grib2/template.4.aerosol.def"
+include "grib2/template.4.source.def"
+include "grib2/template.4.aerosol_size.def"
+include "grib2/template.4.source.def";
+include "grib2/template.4.generating_process.def"
+include "grib2/template.4.forecast_time.def"
 include "grib2/template.4.point_in_time.def";
 include "grib2/template.4.horizontal.def";
diff --git a/definitions/grib2/template.4.81.def b/definitions/grib2/template.4.81.def
index a758d4be1..940c8a16e 100644
--- a/definitions/grib2/template.4.81.def
+++ b/definitions/grib2/template.4.81.def
@@ -1,15 +1,14 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 # TEMPLATE 4.81, Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time for optical properties of aerosol with source/sink
 
-include "grib2/template.4.parameter_aerosol_optical_source.def";
+include "grib2/template.4.parameter.def"
+include "grib2/template.4.aerosol.def"
+include "grib2/template.4.source.def"
+include "grib2/template.4.aerosol_size.def"
+include "grib2/template.4.source.def";
+include "grib2/template.4.generating_process.def"
+include "grib2/template.4.forecast_time.def"
 include "grib2/template.4.point_in_time.def";
 include "grib2/template.4.horizontal.def";
 include "grib2/template.4.eps.def"
diff --git a/definitions/grib2/template.4.parameter_aerosol_optical_source.def b/definitions/grib2/template.4.parameter_aerosol_optical_source.def
deleted file mode 100644
index 4ad33d9cd..000000000
--- a/definitions/grib2/template.4.parameter_aerosol_optical_source.def
+++ /dev/null
@@ -1,60 +0,0 @@
-# (C) Copyright 2005- ECMWF.
-
-# Parameter category
-codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump;
-
-# Parameter number
-codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump;
-meta parameterUnits codetable_units(parameterNumber) : dump;
-meta parameterName  codetable_title(parameterNumber) : dump;
-
-# Atmospheric chemical or physical constitutent type
-codetable[2] aerosolType ('4.233.table',masterDir,localDir) : dump;
-
-# Source, sink or chemical/physical process (Code table 4.238)
-codetable[1] sourceSinkChemicalPhysicalProcess ('4.238.table',masterDir,localDir) = 255 : dump;
-
-codetable[1] typeOfSizeInterval ('4.91.table',masterDir,localDir) : dump;
-alias typeOfIntervalForFirstAndSecondSize=typeOfSizeInterval;
-
-# Size in metres
-signed[1] scaleFactorOfFirstSize : dump;
-signed[4] scaledValueOfFirstSize :dump;
-signed[1] scaleFactorOfSecondSize = missing() : can_be_missing,dump;
-signed[4] scaledValueOfSecondSize = missing() : can_be_missing,dump;
-
-codetable[1] typeOfWavelengthInterval ('4.91.table',masterDir,localDir) : dump;
-alias typeOfIntervalForFirstAndSecondWavelength=typeOfWavelengthInterval;
-
-# Wavelengths in metres
-signed[1] scaleFactorOfFirstWavelength : dump;
-signed[4] scaledValueOfFirstWavelength : dump;
-signed[1] scaleFactorOfSecondWavelength = missing(): can_be_missing,dump;
-signed[4] scaledValueOfSecondWavelength = missing(): can_be_missing,dump;
-
-# Type of generating process
-codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump;
-
-# Background generating process identifier (defined by originating centre)
-unsigned[1] backgroundProcess = 255 : edition_specific;
-alias backgroundGeneratingProcessIdentifier=backgroundProcess;
-
-# Analysis or forecast generating processes identifier (defined by originating centre)
-unsigned[1] generatingProcessIdentifier  : dump;
-
-# Hours of observational data cut-off after reference time
-unsigned[2] hoursAfterDataCutoff = missing() : edition_specific,can_be_missing;
-alias hoursAfterReferenceTimeOfDataCutoff=hoursAfterDataCutoff;
-
-# Minutes of observational data cut-off after reference time
-unsigned[1]  minutesAfterDataCutoff = missing() : edition_specific,can_be_missing;
-alias minutesAfterReferenceTimeOfDataCutoff=minutesAfterDataCutoff;
-
-# Indicator of unit of time range
-codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir)  : dump;
-alias defaultStepUnits = one; # 1 means Hour. See code table 4.4
-template_nofail default_step_units "grib2/localConcepts/[centre:s]/default_step_units.def";
-codetable[1] stepUnits 'stepUnits.table' = defaultStepUnits : transient,dump,no_copy;
-
-# Forecast time in units defined by previous octet (GRIB-29: supports negative forecast time)
-signed[4] forecastTime  : dump;