diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/data.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/data.yaml
index fd874e0693..602220e8df 100644
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/data.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/data.yaml
@@ -1,4 +1,6 @@
 data_central:
+- 0.0473835
+- 0.0405684
 - 0.0343165
 - 0.0291566
 - 0.0248037
@@ -37,3 +39,4 @@ data_central:
 - 5.5219e-07
 - 2.01646e-07
 - 5.11526e-08
+- 2.51767e-06
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/filter.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/filter.py
index 80508b1da4..889e3ade68 100644
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/filter.py
+++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/filter.py
@@ -1,101 +1,94 @@
 """
-
+This file contains the piece of code needed to implement the ATLAS ZpT 
+measurement at 13 TeV. We consider the combined electron-muon measurement, for
+which a total uncorrelated and a total correlated ucnertainties are given. The 
+measurement is normalised to the fiducial cross section, therefore there is no
+luminosity ucnertainty. The first three bins in pT are cropped, because of
+the impossiblity of producing theoretical predictions.
 """
 
-from filter_utils import get_data_values, get_kinematics, get_systematics
 import yaml
 
-UNCORRELATED_SYS = ["Stat (Data)", "Stat (MC)", "Efficiencies (Uncorellated)"]
-
-
-def filter_ATLAS_Z_13TEV_PT_data_kinetic():
+def get_tables():
     """
-    writes data central values and kinematics
-    to respective .yaml file
+    Get the Hepdata table
     """
-    with open("metadata.yaml", "r") as file:
-        metadata = yaml.safe_load(file)
-
-    version = metadata["hepdata"]["version"]
-
-    # tables for Z->l+l- observable
-    tables = metadata["implemented_observables"][0]["tables"]
+    hepdata_tables = ["rawdata/HEPData-ins1768911-v3-Table_4a.yaml"]
 
-    kin = get_kinematics(tables, version)
-    central_values = get_data_values(tables, version)
+    return hepdata_tables
 
+def get_all():
+    """
+    Returns data, kinematics and uncertainties for dumping in the .yaml files
+    """
+    data_central = []
+    kinematics = []
+    uncertainties = []
+
+    hepdata_tables = get_tables()
+    for table in hepdata_tables:
+        with open(table, 'r') as f:
+            input = yaml.safe_load(f)
+            
+        # Central values
+        data_values = input["dependent_variables"][0]["values"]
+        for data_value in data_values:
+            data_central.append(data_value["value"])
+        # Kinematic bins
+        kin_values = input["independent_variables"][0]["values"]
+        for kin_value in kin_values:
+            kin = {
+                'pT': {'min': kin_value['low'],
+                       'mid': 0.5 * (kin_value['low'] + kin_value['high']),
+                       'max': kin_value['high']},
+                'm_Z2': {'min': None, 'mid': 8317.44, 'max': None},
+                'sqrts':  {'min': None, 'mid': 13000, 'max': None}}
+               
+            kinematics.append(kin)
+        # Uncertainties
+        i = 0
+        for data_value in data_values:
+            errors = data_value["errors"]
+            uncertainty = {}
+            for error in errors:
+                uncertainty[error["label"]] = float(error["symerror"].replace('%',''))*data_central[i]/100.
+                uncertainty.update(uncertainty)
+                
+            uncertainties.append(uncertainty)
+            i = i+1
+
+    n=3
+    return (data_central[n:], kinematics[n:], uncertainties[n:])
+
+def filter_ATLAS_Z0J_13TEV_PT():
+    """
+    Dumps data, kinematics, and uncertainties on .yaml files
+    """
+    central_values, kinematics, uncertainties = get_all()
+    # Central values
     data_central_yaml = {"data_central": central_values}
-    kinematics_yaml = {"bins": kin}
+    # Kinematics
+    kinematics_yaml = {"bins": kinematics}
+    # Uncertainties
+    treatment = {"correlated uncertainty": "ADD",
+                 "uncorrelated uncertainty": "ADD",}
+    correlation = {"correlated uncertainty": "CORR",
+                 "uncorrelated uncertainty": "UNCORR",}
+    definitions = {}
+    for key,value in uncertainties[0].items():
+        definition = {key :
+                      {"description": key,
+                       "treatment": treatment[key],
+                       "type": correlation[key]}}
+        definitions.update(definition)
+    uncertainties_yaml = {"definitions": definitions,"bins": uncertainties}
 
-    # write central values and kinematics to yaml file
     with open("data.yaml", "w") as file:
         yaml.dump(data_central_yaml, file, sort_keys=False)
-
     with open("kinematics.yaml", "w") as file:
         yaml.dump(kinematics_yaml, file, sort_keys=False)
-
-
-def filter_ATLAS_Z_13TEV_PT_uncertainties():
-    """
-    writes uncertainties to respective .yaml file
-    """
-
-    with open("metadata.yaml", "r") as file:
-        metadata = yaml.safe_load(file)
-
-    version = metadata["hepdata"]["version"]
-    # tables for Z->l+l- observable
-    tables = metadata["implemented_observables"][0]["tables"]
-
-    systematics_LL = get_systematics(tables, version)
-
-    systematics = {"LL": systematics_LL}
-
-    # error definition
-    error_definitions = {}
-    errors = {}
-
-    for obs in ["LL"]:
-
-        error_definitions[obs] = {}
-
-        for sys in systematics[obs]:
-
-            if sys[0]['name'] in UNCORRELATED_SYS:
-                error_definitions[obs][sys[0]['name']] = {
-                    "description": f"{sys[0]['name']} from HEPDATA",
-                    "treatment": "ADD",
-                    "type": "UNCORR",
-                }
-
-            else:
-                error_definitions[obs][sys[0]['name']] = {
-                    "description": f"{sys[0]['name']} from HEPDATA",
-                    "treatment": "ADD",
-                    "type": "CORR",
-                }
-
-        # TODO:
-        # store error in dict
-        errors[obs] = []
-
-        central_values = get_data_values(tables, version)
-
-        for i in range(len(central_values)):
-            error_value = {}
-
-            for sys in systematics[obs]:
-                error_value[sys[0]['name']] = float(sys[0]['values'][i])
-
-            errors[obs].append(error_value)
-
-        uncertainties_yaml = {"definitions": error_definitions[obs], "bins": errors[obs]}
-
-        # write uncertainties
-        with open(f"uncertainties.yaml", 'w') as file:
-            yaml.dump(uncertainties_yaml, file, sort_keys=False)
-
-
+    with open("uncertainties.yaml", "w") as file:
+        yaml.dump(uncertainties_yaml, file, sort_keys=False)
+        
 if __name__ == "__main__":
-    filter_ATLAS_Z_13TEV_PT_data_kinetic()
-    filter_ATLAS_Z_13TEV_PT_uncertainties()
+    filter_ATLAS_Z0J_13TEV_PT()
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/filter_utils.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/filter_utils.py
deleted file mode 100644
index f65397c1ce..0000000000
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/filter_utils.py
+++ /dev/null
@@ -1,105 +0,0 @@
-import yaml
-
-
-def get_kinematics(table, version):
-    """
-    returns the relevant kinematics values.
-
-    Parameters
-    ----------
-    table : list
-
-    version : int
-            integer read from metadata.yaml that
-            indicated the version of the hepdata
-            tables
-
-    Returns
-    -------
-    list
-        list containing the kinematic values for all
-        hepdata tables
-    """
-    kin = []
-
-    hepdata_table = f"rawdata/HEPData-ins1768911-v3-Tabulated_Figure_6.yaml"
-
-    with open(hepdata_table, 'r') as file:
-        input = yaml.safe_load(file)
-
-    for pt in input["independent_variables"][0]['values']:
-        kin_value = {
-            'pT': {'min': pt['low'], 'mid': 0.5 * (pt['low'] + pt['high']), 'max': pt['high']},
-            'm_Z2': {'min': None, 'mid': 8317.44, 'max': None},
-            'sqrts': {'min': None, 'mid': 13000.0, 'max': None},
-        }
-
-        kin.append(kin_value)
-
-    return kin
-
-
-def get_data_values(tables, version):
-    """
-    returns the central data.
-
-    Parameters
-    ----------
-    tables : list
-            list that enumerates the table number
-
-    version : int
-            integer read from metadata.yaml that
-            indicated the version of the hepdata
-            tables
-
-    Returns
-    -------
-    list
-        list containing the central values for all
-        hepdata tables
-
-    """
-
-    data_central = []
-
-    hepdata_table = f"rawdata/HEPData-ins1768911-v3-Tabulated_Figure_6.yaml"
-
-    with open(hepdata_table, 'r') as file:
-        input = yaml.safe_load(file)
-
-    values = input['dependent_variables'][0]['values']
-
-    for value in values:
-        data_central.append(value['value'])
-
-    return data_central
-
-
-def get_systematics(tables, version):
-    """ """
-    uncertainties = []
-
-    hepdata_table = f"rawdata/HEPData-ins1768911-v{version}-Table_{tables[0]}.yaml"
-
-    with open(hepdata_table, 'r') as file:
-        input = yaml.safe_load(file)
-
-    dependent_vars = input['dependent_variables']
-
-    # skip 1st entry as these are central data values
-    for dep_var in dependent_vars[1:]:
-
-        name = dep_var['header']['name']
-        # skip first 4 and last entry as these central values are not contained
-        # in Tabulated Figure 6
-        values = [d['value'] for d in dep_var['values'][4:-1]]
-        uncertainties.append([{"name": name, "values": values}])
-
-    return uncertainties
-
-
-if __name__ == "__main__":
-    # get_kinematics(tables=[7], version=3)
-    # get_data_values(tables=[7], version=3)
-    get_systematics(tables=[5], version=3)
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/kinematics.yaml
index b9fc4971f5..c432416082 100644
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/kinematics.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/kinematics.yaml
@@ -1,4 +1,28 @@
 bins:
+- pT:
+    min: 6
+    mid: 7.0
+    max: 8
+  m_Z2:
+    min: null
+    mid: 8317.44
+    max: null
+  sqrts:
+    min: null
+    mid: 13000
+    max: null
+- pT:
+    min: 8
+    mid: 9.0
+    max: 10
+  m_Z2:
+    min: null
+    mid: 8317.44
+    max: null
+  sqrts:
+    min: null
+    mid: 13000
+    max: null
 - pT:
     min: 10
     mid: 11.0
@@ -9,7 +33,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 12
@@ -21,7 +45,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 14
@@ -33,7 +57,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 16
@@ -45,7 +69,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 18
@@ -57,7 +81,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 20
@@ -69,7 +93,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 22.5
@@ -81,7 +105,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 25
@@ -93,7 +117,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 27.5
@@ -105,7 +129,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 30
@@ -117,7 +141,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 33
@@ -129,7 +153,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 36
@@ -141,7 +165,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 39
@@ -153,7 +177,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 42
@@ -165,7 +189,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 45
@@ -177,7 +201,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 48
@@ -189,7 +213,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 51
@@ -201,7 +225,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 54
@@ -213,7 +237,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 57
@@ -225,7 +249,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 61
@@ -237,7 +261,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 65
@@ -249,7 +273,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 70
@@ -261,7 +285,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 75
@@ -273,7 +297,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 80
@@ -285,7 +309,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 85
@@ -297,7 +321,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 95
@@ -309,7 +333,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 105
@@ -321,7 +345,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 125
@@ -333,7 +357,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 150
@@ -345,7 +369,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 175
@@ -357,7 +381,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 200
@@ -369,7 +393,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 250
@@ -381,7 +405,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 300
@@ -393,7 +417,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 350
@@ -405,7 +429,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 400
@@ -417,7 +441,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 470
@@ -429,7 +453,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 550
@@ -441,7 +465,7 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
     max: null
 - pT:
     min: 650
@@ -453,5 +477,17 @@ bins:
     max: null
   sqrts:
     min: null
-    mid: 13000.0
+    mid: 13000
+    max: null
+- pT:
+    min: 900
+    mid: 1700.0
+    max: 2500
+  m_Z2:
+    min: null
+    mid: 8317.44
+    max: null
+  sqrts:
+    min: null
+    mid: 13000
     max: null
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/metadata.yaml
index cc93946fd8..d2868e04c4 100644
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/metadata.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/metadata.yaml
@@ -24,7 +24,7 @@ implemented_observables:
     label: r"$1/\sigma_{fid}d\\sigma/dp_{T}^{\\l\\l}$"
     units: "[1/GeV]"
 
-  ndata: 38
+  ndata: 41
 
   tables: [5]
   process_type: DY_NC_PT
@@ -51,8 +51,6 @@ implemented_observables:
 
     # Theory
   theory:
-    shifts:
-      ATLAS_Z0J_13TEV_PT_LL: 9
     FK_tables:
     - - ATLAS_Z0J_13TEV_PT_LL
     - - ATLAS_Z0_13TEV_TOT
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_4a.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_4a.yaml
new file mode 100644
index 0000000000..ffcac3a194
--- /dev/null
+++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_4a.yaml
@@ -0,0 +1,272 @@
+dependent_variables:
+- header: {name: '$1/\sigma_{fid} \times d\sigma/dp_{T}^{ll}$', units: 1/GEV}
+  values:
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.146737%}
+    - {label: uncorrelated uncertainty, symerror: 0.182654%}
+    value: 0.024189
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0545108%}
+    - {label: uncorrelated uncertainty, symerror: 0.0780657%}
+    value: 0.0511438
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0506089%}
+    - {label: uncorrelated uncertainty, symerror: 0.0749981%}
+    value: 0.0532324
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0455932%}
+    - {label: uncorrelated uncertainty, symerror: 0.0802127%}
+    value: 0.0473835
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.042823%}
+    - {label: uncorrelated uncertainty, symerror: 0.0902423%}
+    value: 0.0405684
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0600343%}
+    - {label: uncorrelated uncertainty, symerror: 0.107591%}
+    value: 0.0343165
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0707218%}
+    - {label: uncorrelated uncertainty, symerror: 0.124372%}
+    value:  0.0291566
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0609953%}
+    - {label: uncorrelated uncertainty, symerror: 0.136582%}
+    value: 0.0248037
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0461217%}
+    - {label: uncorrelated uncertainty, symerror: 0.145373%}
+    value: 0.021268
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.034637%}
+    - {label: uncorrelated uncertainty, symerror: 0.156366%}
+    value: 0.018325
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.025768%}
+    - {label: uncorrelated uncertainty, symerror: 0.1367%}
+    value: 0.0156045
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0339854%}
+    - {label: uncorrelated uncertainty, symerror: 0.152269%}
+    value: 0.01318
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0411065%}
+    - {label: uncorrelated uncertainty, symerror: 0.168553%}  
+    value: 0.0112073
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0508971%}
+    - {label: uncorrelated uncertainty, symerror: 0.186374%}
+    value: 0.00955676
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0594864%}
+    - {label: uncorrelated uncertainty, symerror: 0.172167%}
+    value: 0.00810287
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0779726%} 
+    - {label: uncorrelated uncertainty, symerror: 0.194268%}
+    value: 0.00678809
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0936059%}
+    - {label: uncorrelated uncertainty, symerror: 0.213769%}
+    value: 0.00575628
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.115529%}
+    - {label: uncorrelated uncertainty, symerror: 0.231418%}
+    value: 0.00487686
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.12481%}
+    - {label: uncorrelated uncertainty, symerror: 0.254212%}
+    value: 0.00416884
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.144971%}
+    - {label: uncorrelated uncertainty, symerror: 0.282523%}
+    value: 0.00352131
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.167357%}
+    - {label: uncorrelated uncertainty, symerror: 0.314478%}
+    value: 0.00297507
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.182218%}
+    - {label: uncorrelated uncertainty, symerror: 0.345915%}
+    value: 0.00254333
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.199666%}
+    - {label: uncorrelated uncertainty, symerror: 0.378715%}
+    value: 0.00218319
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.15297%}
+    - {label: uncorrelated uncertainty, symerror: 0.309867%}
+    value: 0.00187701
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.165993%}
+    - {label: uncorrelated uncertainty, symerror: 0.351415%}
+    value: 0.0015932
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.155726%}
+    - {label: uncorrelated uncertainty, symerror: 0.320541%}
+    value: 0.00135193
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.173562%}
+    - {label: uncorrelated uncertainty, symerror: 0.373781%}
+    value: 0.0011323
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.20141%}
+    - {label: uncorrelated uncertainty, symerror: 0.429775%}
+    value: 0.00095743
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.222191%}
+    - {label: uncorrelated uncertainty, symerror: 0.489079%}
+    value: 0.000814977
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.140104%}
+    - {label: uncorrelated uncertainty, symerror: 0.286435%}
+    value: 0.000653718
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.176807%}    
+    - {label: uncorrelated uncertainty, symerror: 0.365727%}
+    value: 0.000484859
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.123019%}
+    - {label: uncorrelated uncertainty, symerror: 0.24768%}
+    value: 0.000329051
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.157454%}
+    - {label: uncorrelated uncertainty, symerror: 0.318812%}
+    value: 0.000186048
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.23722%}
+    - {label: uncorrelated uncertainty, symerror: 0.507926%}
+    value: 0.000104998
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.302697%}
+    - {label: uncorrelated uncertainty, symerror: 0.781114%}
+    value: 6.12794e-05
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.219307%}
+    - {label: uncorrelated uncertainty, symerror: 0.65891%}
+    value: 3.0584e-05
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.344574%}
+    - {label: uncorrelated uncertainty, symerror: 1.38523%}
+    value: 1.22113e-05
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.561799%}
+    - {label: uncorrelated uncertainty, symerror: 2.25044%}
+    value: 5.90263e-06
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.897993%}
+    - {label: uncorrelated uncertainty, symerror: 3.75137%}
+    value: 2.77421e-06
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.824661%}
+    - {label: uncorrelated uncertainty, symerror: 4.87351%}
+    value:  1.25134e-06
+  - errors:
+    - {label: correlated uncertainty, symerror: 1.15515%}
+    - {label: uncorrelated uncertainty, symerror: 7.90601%}
+    value: 5.5219e-07
+  - errors:
+    - {label: correlated uncertainty, symerror: 1.54467%}
+    - {label: uncorrelated uncertainty, symerror: 12.8626%}
+    value: 2.01646e-07
+  - errors:
+    - {label: correlated uncertainty, symerror: 1.82228%}
+    - {label: uncorrelated uncertainty, symerror: 15.7307%}
+    value: 5.11526e-08
+  - errors:
+    - {label: correlated uncertainty, symerror: 6.30741%}
+    - {label: uncorrelated uncertainty, symerror: 60.3046%}
+    value: 2.51767e-06
+- header: {name: '$k_{dressed}$'}
+  values:
+  - {value: 0.978339}
+  - {value: 0.984972}
+  - {value: 0.994351}
+  - {value: 1.0028}
+  - {value: 1.00782}
+  - {value: 1.01148}
+  - {value: 1.01278}
+  - {value: 1.01303}
+  - {value: 1.01202}
+  - {value: 1.00898}
+  - {value: 1.00616}
+  - {value: 1.00317}
+  - {value: 0.999679}
+  - {value: 0.999156}
+  - {value: 0.997824}
+  - {value: 0.99582}
+  - {value: 0.993993}
+  - {value: 0.992858}
+  - {value: 0.991661}
+  - {value: 0.99251}
+  - {value: 0.991217}
+  - {value: 0.992147}
+  - {value: 0.993846}
+  - {value: 0.994163}
+  - {value: 0.993764}
+  - {value: 0.99512}
+  - {value: 0.995087}
+  - {value: 0.9953}
+  - {value: 0.994741}
+  - {value: 0.995926}
+  - {value: 0.995122}
+  - {value: 0.995673}
+  - {value: 0.994211}
+  - {value: 0.993365}
+  - {value: 0.992277}
+  - {value: 0.995338}
+  - {value: 0.997277}
+  - {value: 0.99423}
+  - {value: 0.991436}
+  - {value: 0.990586}
+  - {value: 0.993825}
+  - {value: 0.995003}
+  - {value: 0.989972}
+  - {value: 0.963637}
+independent_variables:
+- header: {name: 'Bin $p_{T}^{ll}$', units: GEV}
+  values:
+  - {high: 2, low: 0}
+  - {high: 4, low: 2}
+  - {high: 6, low: 4}
+  - {high: 8, low: 6}
+  - {high: 10, low: 8}
+  - {high: 12, low: 10}
+  - {high: 14, low: 12}
+  - {high: 16, low: 14}
+  - {high: 18, low: 16}
+  - {high: 20, low: 18}
+  - {high: 22.5, low: 20}
+  - {high: 25, low: 22.5}
+  - {high: 27.5, low: 25}
+  - {high: 30, low: 27.5}
+  - {high: 33, low: 30}
+  - {high: 36, low: 33}
+  - {high: 39, low: 36}
+  - {high: 42, low: 39}
+  - {high: 45, low: 42}
+  - {high: 48, low: 45}
+  - {high: 51, low: 48}
+  - {high: 54, low: 51}
+  - {high: 57, low: 54}
+  - {high: 61, low: 57}
+  - {high: 65, low: 61}
+  - {high: 70, low: 65}
+  - {high: 75, low: 70}
+  - {high: 80, low: 75}
+  - {high: 85, low: 80}
+  - {high: 95, low: 85}
+  - {high: 105, low: 95}
+  - {high: 125, low: 105}
+  - {high: 150, low: 125}
+  - {high: 175, low: 150}
+  - {high: 200, low: 175}
+  - {high: 250, low: 200}
+  - {high: 300, low: 250}
+  - {high: 350, low: 300}
+  - {high: 400, low: 350}
+  - {high: 470, low: 400}
+  - {high: 550, low: 470}
+  - {high: 650, low: 550}
+  - {high: 900, low: 650}
+  - {high: 2500, low: 900}
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_5.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_5.yaml
deleted file mode 100644
index b6490ec293..0000000000
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_5.yaml
+++ /dev/null
@@ -1,738 +0,0 @@
-dependent_variables:
-- header: {name: '$1/\sigma_{fid}d\sigma/dp_{T}^{\mu\mu}$', units: 1/GEV}
-  values:
-  - {value: 0.0483485}
-  - {value: 0.102336}
-  - {value: 0.106454}
-  - {value: 0.0949447}
-  - {value: 0.0811024}
-  - {value: 0.068568}
-  - {value: 0.0583926}
-  - {value: 0.0495932}
-  - {value: 0.0426003}
-  - {value: 0.0365929}
-  - {value: 0.039024}
-  - {value: 0.0328605}
-  - {value: 0.0280475}
-  - {value: 0.0238817}
-  - {value: 0.0242942}
-  - {value: 0.0203863}
-  - {value: 0.0172779}
-  - {value: 0.0146252}
-  - {value: 0.0124869}
-  - {value: 0.0105421}
-  - {value: 0.00896744}
-  - {value: 0.00760829}
-  - {value: 0.00648499}
-  - {value: 0.00752818}
-  - {value: 0.00635331}
-  - {value: 0.00675757}
-  - {value: 0.00565293}
-  - {value: 0.00477561}
-  - {value: 0.00405529}
-  - {value: 0.00652509}
-  - {value: 0.00486299}
-  - {value: 0.00656466}
-  - {value: 0.00463292}
-  - {value: 0.0026228}
-  - {value: 0.00151905}
-  - {value: 0.00152326}
-  - {value: 0.000600594}
-  - {value: 0.000295887}
-  - {value: 0.00014254}
-  - {value: 8.61709e-05}
-  - {value: 4.60894e-05}
-  - {value: 2.04842e-05}
-  - {value: 1.25171e-05}
-  - {value: 2.59777e-06}
-- header: {name: Stat (Data)}
-  values:
-  - {value: 8.35956e-05}
-  - {value: 7.67909e-05}
-  - {value: 7.58289e-05}
-  - {value: 7.48749e-05}
-  - {value: 7.33895e-05}
-  - {value: 7.17653e-05}
-  - {value: 6.94675e-05}
-  - {value: 6.63969e-05}
-  - {value: 6.17612e-05}
-  - {value: 5.77664e-05}
-  - {value: 5.39635e-05}
-  - {value: 5.06942e-05}
-  - {value: 4.75316e-05}
-  - {value: 4.48241e-05}
-  - {value: 4.20221e-05}
-  - {value: 4.00194e-05}
-  - {value: 3.7446e-05}
-  - {value: 3.4088e-05}
-  - {value: 3.18739e-05}
-  - {value: 3.01246e-05}
-  - {value: 2.84876e-05}
-  - {value: 2.70051e-05}
-  - {value: 2.53968e-05}
-  - {value: 2.38027e-05}
-  - {value: 2.30294e-05}
-  - {value: 2.23957e-05}
-  - {value: 2.19764e-05}
-  - {value: 2.13142e-05}
-  - {value: 2.07709e-05}
-  - {value: 1.94042e-05}
-  - {value: 1.84027e-05}
-  - {value: 1.68795e-05}
-  - {value: 1.51898e-05}
-  - {value: 1.35198e-05}
-  - {value: 1.20941e-05}
-  - {value: 1.02064e-05}
-  - {value: 8.57885e-06}
-  - {value: 6.71408e-06}
-  - {value: 5.30023e-06}
-  - {value: 4.3265e-06}
-  - {value: 3.51926e-06}
-  - {value: 2.7789e-06}
-  - {value: 2.16589e-06}
-  - {value: 1.74143e-06}
-- header: {name: Stat (MC)}
-  values:
-  - {value: 6.37438e-05}
-  - {value: 5.83828e-05}
-  - {value: 5.82812e-05}
-  - {value: 5.73778e-05}
-  - {value: 5.61428e-05}
-  - {value: 5.474e-05}
-  - {value: 5.2111e-05}
-  - {value: 4.86351e-05}
-  - {value: 4.51803e-05}
-  - {value: 4.23546e-05}
-  - {value: 3.97985e-05}
-  - {value: 3.74849e-05}
-  - {value: 3.53303e-05}
-  - {value: 3.3345e-05}
-  - {value: 3.14638e-05}
-  - {value: 2.96676e-05}
-  - {value: 2.75656e-05}
-  - {value: 2.56061e-05}
-  - {value: 2.40094e-05}
-  - {value: 2.25086e-05}
-  - {value: 2.1003e-05}
-  - {value: 1.96268e-05}
-  - {value: 1.8331e-05}
-  - {value: 1.71423e-05}
-  - {value: 1.64036e-05}
-  - {value: 1.56341e-05}
-  - {value: 1.51939e-05}
-  - {value: 1.46701e-05}
-  - {value: 1.40044e-05}
-  - {value: 1.30219e-05}
-  - {value: 1.21705e-05}
-  - {value: 1.10661e-05}
-  - {value: 9.98235e-06}
-  - {value: 8.93984e-06}
-  - {value: 7.9546e-06}
-  - {value: 6.66204e-06}
-  - {value: 5.54456e-06}
-  - {value: 4.25548e-06}
-  - {value: 3.18385e-06}
-  - {value: 2.61206e-06}
-  - {value: 2.15748e-06}
-  - {value: 1.6112e-06}
-  - {value: 1.26463e-06}
-  - {value: 1.00279e-06}
-- header: {name: Efficiencies (Uncorellated)}
-  values:
-  - {value: 9.95475e-06}
-  - {value: 8.43697e-06}
-  - {value: 8.39228e-06}
-  - {value: 8.02855e-06}
-  - {value: 7.62052e-06}
-  - {value: 7.12003e-06}
-  - {value: 6.10127e-06}
-  - {value: 4.94684e-06}
-  - {value: 3.89108e-06}
-  - {value: 2.98307e-06}
-  - {value: 2.29224e-06}
-  - {value: 1.84072e-06}
-  - {value: 1.47619e-06}
-  - {value: 1.19656e-06}
-  - {value: 1.05868e-06}
-  - {value: 1.01334e-06}
-  - {value: 9.52163e-07}
-  - {value: 9.32742e-07}
-  - {value: 1.0063e-06}
-  - {value: 1.12277e-06}
-  - {value: 1.26063e-06}
-  - {value: 1.33511e-06}
-  - {value: 1.37111e-06}
-  - {value: 1.39809e-06}
-  - {value: 1.50361e-06}
-  - {value: 1.6905e-06}
-  - {value: 2.25177e-06}
-  - {value: 2.9503e-06}
-  - {value: 3.4922e-06}
-  - {value: 3.90433e-06}
-  - {value: 4.5605e-06}
-  - {value: 4.88845e-06}
-  - {value: 5.02588e-06}
-  - {value: 5.0556e-06}
-  - {value: 5.01282e-06}
-  - {value: 4.83028e-06}
-  - {value: 4.5748e-06}
-  - {value: 3.9375e-06}
-  - {value: 3.44839e-06}
-  - {value: 3.04439e-06}
-  - {value: 2.66722e-06}
-  - {value: 1.80584e-06}
-  - {value: 1.20132e-06}
-  - {value: 0}
-- header: {name: Scale}
-  values:
-  - {value: 8.06284e-05}
-  - {value: 6.27959e-05}
-  - {value: 6.48323e-05}
-  - {value: 5.68417e-05}
-  - {value: 3.77564e-05}
-  - {value: 1.98692e-05}
-  - {value: 6.02976e-06}
-  - {value: -2.79757e-06}
-  - {value: -6.10522e-06}
-  - {value: -1.10568e-05}
-  - {value: -1.23219e-05}
-  - {value: -1.52471e-05}
-  - {value: -1.60245e-05}
-  - {value: -1.56591e-05}
-  - {value: -1.70632e-05}
-  - {value: -1.85262e-05}
-  - {value: -1.85507e-05}
-  - {value: -1.98298e-05}
-  - {value: -1.78683e-05}
-  - {value: -1.78014e-05}
-  - {value: -1.74292e-05}
-  - {value: -1.61827e-05}
-  - {value: -1.48547e-05}
-  - {value: -1.26621e-05}
-  - {value: -1.08967e-05}
-  - {value: -9.89894e-06}
-  - {value: -9.34883e-06}
-  - {value: -8.15195e-06}
-  - {value: -6.65262e-06}
-  - {value: -6.49504e-06}
-  - {value: -5.68654e-06}
-  - {value: -5.25178e-06}
-  - {value: -4.52099e-06}
-  - {value: -3.3474e-06}
-  - {value: -2.65642e-06}
-  - {value: -1.86636e-06}
-  - {value: -1.01055e-06}
-  - {value: -7.28519e-07}
-  - {value: -4.23367e-07}
-  - {value: -2.73916e-07}
-  - {value: -1.28097e-07}
-  - {value: -9.40508e-08}
-  - {value: -6.31804e-08}
-  - {value: -4.99628e-08}
-- header: {name: Resolution}
-  values:
-  - {value: -4.28443e-05}
-  - {value: -7.05279e-05}
-  - {value: -7.26597e-05}
-  - {value: -3.63975e-05}
-  - {value: 1.97555e-05}
-  - {value: 5.84463e-05}
-  - {value: 6.11683e-05}
-  - {value: 4.96738e-05}
-  - {value: 3.30354e-05}
-  - {value: 2.60181e-05}
-  - {value: 2.03084e-05}
-  - {value: 1.38317e-05}
-  - {value: 1.20235e-05}
-  - {value: 8.07986e-06}
-  - {value: 4.19756e-06}
-  - {value: 1.49509e-06}
-  - {value: 7.40895e-07}
-  - {value: 2.58524e-06}
-  - {value: 4.52804e-06}
-  - {value: 2.34797e-06}
-  - {value: 1.90124e-06}
-  - {value: 1.68493e-06}
-  - {value: 8.46977e-07}
-  - {value: 1.00756e-06}
-  - {value: 9.59722e-07}
-  - {value: -6.45403e-08}
-  - {value: -1.17319e-07}
-  - {value: 1.33488e-06}
-  - {value: 1.17755e-06}
-  - {value: 4.24838e-07}
-  - {value: 5.09838e-07}
-  - {value: 2.18449e-08}
-  - {value: 3.78211e-07}
-  - {value: 1.48667e-06}
-  - {value: 3.6665e-07}
-  - {value: 1.29541e-07}
-  - {value: 3.58043e-07}
-  - {value: 7.01139e-08}
-  - {value: 1.97343e-07}
-  - {value: 1.35954e-07}
-  - {value: -3.82766e-08}
-  - {value: 3.78e-08}
-  - {value: 9.05661e-08}
-  - {value: 1.15136e-07}
-- header: {name: Muon Saggita}
-  values:
-  - {value: 7.43367e-07}
-  - {value: -7.73359e-06}
-  - {value: -8.38056e-07}
-  - {value: -1.86534e-06}
-  - {value: 1.3535e-06}
-  - {value: 4.87774e-06}
-  - {value: 3.25268e-06}
-  - {value: 9.75616e-07}
-  - {value: 2.83518e-06}
-  - {value: 1.95059e-06}
-  - {value: 1.12455e-06}
-  - {value: 1.54483e-06}
-  - {value: 1.77062e-06}
-  - {value: 1.6488e-06}
-  - {value: 3.16e-06}
-  - {value: 2.9723e-06}
-  - {value: 1.76665e-06}
-  - {value: 6.17704e-07}
-  - {value: 5.04182e-07}
-  - {value: -1.57807e-07}
-  - {value: 7.91841e-07}
-  - {value: -5.67574e-07}
-  - {value: -1.53013e-06}
-  - {value: -7.67405e-07}
-  - {value: -5.12532e-07}
-  - {value: -8.38272e-08}
-  - {value: 1.17481e-07}
-  - {value: -6.24295e-07}
-  - {value: -1.88947e-07}
-  - {value: -5.19957e-07}
-  - {value: -1.45038e-07}
-  - {value: 1.67385e-07}
-  - {value: 1.90734e-07}
-  - {value: -1.2971e-07}
-  - {value: 2.11125e-07}
-  - {value: -7.20025e-09}
-  - {value: 5.50235e-07}
-  - {value: -7.57883e-08}
-  - {value: 2.2637e-08}
-  - {value: 4.65252e-08}
-  - {value: -6.08179e-08}
-  - {value: -8.05586e-08}
-  - {value: -2.08975e-07}
-  - {value: -1.48298e-07}
-- header: {name: Efficiencies (Corellated)}
-  values:
-  - {value: 3.87313e-07}
-  - {value: 3.34268e-07}
-  - {value: 3.31919e-07}
-  - {value: 3.07232e-07}
-  - {value: 2.53077e-07}
-  - {value: 1.95681e-07}
-  - {value: 1.52499e-07}
-  - {value: 1.32704e-07}
-  - {value: 1.27998e-07}
-  - {value: 1.23313e-07}
-  - {value: 1.21131e-07}
-  - {value: 1.17825e-07}
-  - {value: 1.21933e-07}
-  - {value: 1.27991e-07}
-  - {value: 1.24853e-07}
-  - {value: 1.15733e-07}
-  - {value: 1.13246e-07}
-  - {value: 1.05721e-07}
-  - {value: 9.42208e-08}
-  - {value: 7.8914e-08}
-  - {value: 7.02334e-08}
-  - {value: 6.0653e-08}
-  - {value: 5.48623e-08}
-  - {value: 4.72786e-08}
-  - {value: 4.34535e-08}
-  - {value: 4.19056e-08}
-  - {value: 4.39376e-08}
-  - {value: 4.28303e-08}
-  - {value: 4.68971e-08}
-  - {value: 5.24325e-08}
-  - {value: 5.77501e-08}
-  - {value: 5.8729e-08}
-  - {value: 6.20607e-08}
-  - {value: 6.06227e-08}
-  - {value: 5.81755e-08}
-  - {value: 5.07157e-08}
-  - {value: 4.06072e-08}
-  - {value: 3.23173e-08}
-  - {value: 2.60259e-08}
-  - {value: 1.76095e-08}
-  - {value: 1.34607e-08}
-  - {value: 1.04764e-08}
-  - {value: 8.54736e-09}
-  - {value: 0}
-- header: {name: Isolation}
-  values:
-  - {value: -4.18797e-07}
-  - {value: -2.568e-07}
-  - {value: -2.84694e-07}
-  - {value: -3.05259e-07}
-  - {value: -3.21406e-07}
-  - {value: -2.92554e-07}
-  - {value: -2.18755e-07}
-  - {value: -1.42078e-07}
-  - {value: -7.13211e-08}
-  - {value: -1.24541e-08}
-  - {value: 3.40861e-08}
-  - {value: 7.36893e-08}
-  - {value: 1.05107e-07}
-  - {value: 1.3236e-07}
-  - {value: 1.53502e-07}
-  - {value: 1.65516e-07}
-  - {value: 1.67276e-07}
-  - {value: 1.6175e-07}
-  - {value: 1.46781e-07}
-  - {value: 1.28402e-07}
-  - {value: 1.06839e-07}
-  - {value: 8.23239e-08}
-  - {value: 5.7094e-08}
-  - {value: 3.51944e-08}
-  - {value: 1.79093e-08}
-  - {value: 4.49587e-09}
-  - {value: -1.10006e-08}
-  - {value: -2.44197e-08}
-  - {value: -3.42587e-08}
-  - {value: -3.45687e-08}
-  - {value: -2.76893e-08}
-  - {value: -1.45591e-08}
-  - {value: 5.49643e-09}
-  - {value: 2.20514e-08}
-  - {value: 3.55273e-08}
-  - {value: 5.03334e-08}
-  - {value: 5.54564e-08}
-  - {value: 5.67922e-08}
-  - {value: 6.69081e-08}
-  - {value: 6.70416e-08}
-  - {value: 6.52608e-08}
-  - {value: 6.94277e-08}
-  - {value: 7.33839e-08}
-  - {value: 8.46319e-08}
-- header: {name: Trigger}
-  values:
-  - {value: 3.75372e-07}
-  - {value: 2.52567e-07}
-  - {value: 2.76859e-07}
-  - {value: 2.37779e-07}
-  - {value: 2.10548e-07}
-  - {value: 1.15319e-07}
-  - {value: 9.71047e-08}
-  - {value: 8.05904e-08}
-  - {value: 8.29725e-08}
-  - {value: 5.55809e-08}
-  - {value: 8.62634e-08}
-  - {value: 9.41138e-08}
-  - {value: 9.55364e-08}
-  - {value: 9.55465e-08}
-  - {value: 9.70565e-08}
-  - {value: 1.00412e-07}
-  - {value: 1.12278e-07}
-  - {value: 8.81191e-08}
-  - {value: 8.81487e-08}
-  - {value: 9.25549e-08}
-  - {value: 1.04588e-07}
-  - {value: 9.02184e-08}
-  - {value: 8.77286e-08}
-  - {value: 7.78705e-08}
-  - {value: 6.66279e-08}
-  - {value: 5.70898e-08}
-  - {value: 6.6948e-08}
-  - {value: 5.68307e-08}
-  - {value: 4.72464e-08}
-  - {value: 3.84579e-08}
-  - {value: 2.90513e-08}
-  - {value: 2.99702e-08}
-  - {value: 2.97613e-08}
-  - {value: 1.31443e-08}
-  - {value: 5.87751e-09}
-  - {value: 4.42277e-09}
-  - {value: 3.94941e-09}
-  - {value: 3.41196e-09}
-  - {value: 1.96811e-09}
-  - {value: 1.48804e-09}
-  - {value: 1.47186e-09}
-  - {value: 1.43169e-09}
-  - {value: 1.04108e-09}
-  - {value: 1.23154e-09}
-- header: {name: Muon (TTVA)}
-  values:
-  - {value: 1.31656e-07}
-  - {value: 1.10606e-07}
-  - {value: 1.16966e-07}
-  - {value: 9.84276e-08}
-  - {value: 6.50403e-08}
-  - {value: 3.40175e-08}
-  - {value: 2.47162e-08}
-  - {value: 2.73643e-08}
-  - {value: 3.07492e-08}
-  - {value: 3.15496e-08}
-  - {value: 4.03474e-08}
-  - {value: 4.85094e-08}
-  - {value: 6.22857e-08}
-  - {value: 6.6568e-08}
-  - {value: 6.23622e-08}
-  - {value: 6.4541e-08}
-  - {value: 6.18923e-08}
-  - {value: 5.92534e-08}
-  - {value: 5.41781e-08}
-  - {value: 4.11462e-08}
-  - {value: 3.44895e-08}
-  - {value: 2.86764e-08}
-  - {value: 2.41059e-08}
-  - {value: 2.10892e-08}
-  - {value: 1.48838e-08}
-  - {value: 1.43036e-08}
-  - {value: 1.85314e-08}
-  - {value: 1.78049e-08}
-  - {value: 1.88156e-08}
-  - {value: 1.87857e-08}
-  - {value: 1.83084e-08}
-  - {value: 1.78685e-08}
-  - {value: 1.60882e-08}
-  - {value: 1.0181e-08}
-  - {value: 7.66417e-09}
-  - {value: 5.04696e-09}
-  - {value: 3.29871e-09}
-  - {value: 2.47786e-09}
-  - {value: 1.53263e-09}
-  - {value: 7.49586e-10}
-  - {value: 3.26564e-10}
-  - {value: 3.50994e-10}
-  - {value: 3.04279e-10}
-  - {value: 3.20122e-10}
-- header: {name: Z-vertex reweighting}
-  values:
-  - {value: 6.07862e-07}
-  - {value: -9.78373e-07}
-  - {value: -7.84356e-08}
-  - {value: -3.15197e-07}
-  - {value: 6.92879e-08}
-  - {value: 1.45025e-07}
-  - {value: -1.00394e-07}
-  - {value: -1.59619e-07}
-  - {value: 1.00215e-07}
-  - {value: 2.27018e-08}
-  - {value: -1.27428e-07}
-  - {value: -1.52972e-07}
-  - {value: -2.7066e-07}
-  - {value: -1.97182e-08}
-  - {value: 8.22088e-08}
-  - {value: 8.99594e-08}
-  - {value: 3.73921e-08}
-  - {value: 1.61865e-07}
-  - {value: 2.84696e-07}
-  - {value: 3.49903e-07}
-  - {value: 6.95854e-08}
-  - {value: -4.72017e-08}
-  - {value: -6.21159e-08}
-  - {value: 5.48967e-08}
-  - {value: 6.94822e-08}
-  - {value: 7.28613e-08}
-  - {value: 2.04456e-08}
-  - {value: 3.99906e-08}
-  - {value: 1.90233e-07}
-  - {value: 1.9247e-07}
-  - {value: 2.09709e-07}
-  - {value: 1.87948e-07}
-  - {value: 1.36273e-07}
-  - {value: 1.56472e-07}
-  - {value: 1.86299e-07}
-  - {value: 1.21902e-07}
-  - {value: 7.91474e-08}
-  - {value: 1.98127e-08}
-  - {value: 1.32503e-08}
-  - {value: 3.37543e-08}
-  - {value: 1.28093e-08}
-  - {value: 5.65969e-09}
-  - {value: -7.63006e-09}
-  - {value: -6.05567e-09}
-- header: {name: Pile-Up}
-  values:
-  - {value: 2.9157e-05}
-  - {value: -1.17836e-05}
-  - {value: 1.58838e-05}
-  - {value: -2.24518e-06}
-  - {value: -1.71301e-06}
-  - {value: 5.05812e-07}
-  - {value: -7.96941e-06}
-  - {value: -6.7597e-06}
-  - {value: -5.00779e-07}
-  - {value: 3.02638e-06}
-  - {value: -2.07097e-06}
-  - {value: 7.05864e-07}
-  - {value: -1.85933e-06}
-  - {value: -2.63947e-06}
-  - {value: -6.2528e-06}
-  - {value: 2.01307e-06}
-  - {value: 3.8748e-06}
-  - {value: 4.30215e-06}
-  - {value: 5.96245e-06}
-  - {value: 3.93887e-06}
-  - {value: 1.66478e-06}
-  - {value: 1.86437e-06}
-  - {value: -1.53326e-06}
-  - {value: -2.54874e-06}
-  - {value: -4.28194e-06}
-  - {value: -6.36055e-06}
-  - {value: -4.71622e-06}
-  - {value: -3.52917e-06}
-  - {value: -2.83033e-06}
-  - {value: -1.92523e-06}
-  - {value: -2.24286e-06}
-  - {value: -1.31029e-06}
-  - {value: -1.44537e-06}
-  - {value: -3.4362e-07}
-  - {value: 1.57331e-07}
-  - {value: -1.60957e-06}
-  - {value: -4.53731e-07}
-  - {value: -2.60461e-08}
-  - {value: 2.11241e-07}
-  - {value: -3.27592e-07}
-  - {value: -4.9854e-07}
-  - {value: 2.46545e-07}
-  - {value: -1.12114e-07}
-  - {value: 3.25105e-09}
-- header: {name: Model}
-  values:
-  - {value: 2.25619e-05}
-  - {value: -4.51831e-05}
-  - {value: 8.19483e-07}
-  - {value: -1.03865e-05}
-  - {value: 1.17742e-05}
-  - {value: -1.11864e-05}
-  - {value: -1.47197e-05}
-  - {value: -3.52029e-06}
-  - {value: 8.49558e-06}
-  - {value: -5.49603e-06}
-  - {value: 2.01242e-06}
-  - {value: -6.19182e-06}
-  - {value: 1.60522e-06}
-  - {value: -2.45685e-06}
-  - {value: -4.081e-07}
-  - {value: -3.29613e-06}
-  - {value: 2.62187e-06}
-  - {value: 2.60744e-08}
-  - {value: 1.08053e-06}
-  - {value: 2.94885e-06}
-  - {value: 2.81772e-06}
-  - {value: 4.04169e-06}
-  - {value: 4.70821e-06}
-  - {value: 4.38535e-06}
-  - {value: 5.17698e-06}
-  - {value: 6.56265e-06}
-  - {value: 5.13726e-06}
-  - {value: 7.06317e-06}
-  - {value: 6.57973e-06}
-  - {value: 7.42633e-06}
-  - {value: 6.24654e-06}
-  - {value: 6.94908e-06}
-  - {value: 5.20604e-06}
-  - {value: 5.02928e-06}
-  - {value: 3.53347e-06}
-  - {value: 2.413e-06}
-  - {value: 1.38539e-06}
-  - {value: 1.11055e-06}
-  - {value: 4.41613e-07}
-  - {value: 4.21401e-07}
-  - {value: -1.26955e-08}
-  - {value: 1.62069e-07}
-  - {value: 1.12009e-07}
-  - {value: -7.93151e-08}
-- header: {name: Background}
-  values:
-  - {value: 2.89323e-06}
-  - {value: 2.39593e-06}
-  - {value: 2.58874e-06}
-  - {value: 2.56676e-06}
-  - {value: 2.6144e-06}
-  - {value: 2.53068e-06}
-  - {value: 2.40286e-06}
-  - {value: 2.39151e-06}
-  - {value: 2.44995e-06}
-  - {value: 2.43522e-06}
-  - {value: 2.50026e-06}
-  - {value: 2.64906e-06}
-  - {value: 2.75984e-06}
-  - {value: 2.92749e-06}
-  - {value: 3.035e-06}
-  - {value: 3.12866e-06}
-  - {value: 3.22543e-06}
-  - {value: 3.35076e-06}
-  - {value: 3.3264e-06}
-  - {value: 3.3412e-06}
-  - {value: 3.53285e-06}
-  - {value: 3.6471e-06}
-  - {value: 3.85463e-06}
-  - {value: 4.07802e-06}
-  - {value: 4.19639e-06}
-  - {value: 4.29432e-06}
-  - {value: 5.11883e-06}
-  - {value: 5.61711e-06}
-  - {value: 6.48474e-06}
-  - {value: 6.60558e-06}
-  - {value: 6.3272e-06}
-  - {value: 5.94929e-06}
-  - {value: 5.65289e-06}
-  - {value: 4.50194e-06}
-  - {value: 3.39571e-06}
-  - {value: 1.95583e-06}
-  - {value: 1.1472e-06}
-  - {value: 7.45763e-07}
-  - {value: 5.08448e-07}
-  - {value: 2.68876e-07}
-  - {value: 1.52496e-07}
-  - {value: 1.01672e-07}
-  - {value: 7.4095e-08}
-  - {value: 5.26604e-08}
-independent_variables:
-- header: {name: 'Bin $p_{T}^{\mu\mu}$', units: GEV}
-  values:
-  - {high: 2, low: 0}
-  - {high: 4, low: 2}
-  - {high: 6, low: 4}
-  - {high: 8, low: 6}
-  - {high: 10, low: 8}
-  - {high: 12, low: 10}
-  - {high: 14, low: 12}
-  - {high: 16, low: 14}
-  - {high: 18, low: 16}
-  - {high: 20, low: 18}
-  - {high: 22.5, low: 20}
-  - {high: 25, low: 22.5}
-  - {high: 27.5, low: 25}
-  - {high: 30, low: 27.5}
-  - {high: 33, low: 30}
-  - {high: 36, low: 33}
-  - {high: 39, low: 36}
-  - {high: 42, low: 39}
-  - {high: 45, low: 42}
-  - {high: 48, low: 45}
-  - {high: 51, low: 48}
-  - {high: 54, low: 51}
-  - {high: 57, low: 54}
-  - {high: 61, low: 57}
-  - {high: 65, low: 61}
-  - {high: 70, low: 65}
-  - {high: 75, low: 70}
-  - {high: 80, low: 75}
-  - {high: 85, low: 80}
-  - {high: 95, low: 85}
-  - {high: 105, low: 95}
-  - {high: 125, low: 105}
-  - {high: 150, low: 125}
-  - {high: 175, low: 150}
-  - {high: 200, low: 175}
-  - {high: 250, low: 200}
-  - {high: 300, low: 250}
-  - {high: 350, low: 300}
-  - {high: 400, low: 350}
-  - {high: 470, low: 400}
-  - {high: 550, low: 470}
-  - {high: 650, low: 550}
-  - {high: 900, low: 650}
-  - {high: 2500, low: 900}
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_7.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_7.yaml
deleted file mode 100644
index 7fdd74a753..0000000000
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_7.yaml
+++ /dev/null
@@ -1,738 +0,0 @@
-dependent_variables:
-- header: {name: '$1/\sigma_{fid}d\sigma/dp_{T}^{ee}$', units: 1/GEV}
-  values:
-  - {value: 0.0483395}
-  - {value: 0.102195}
-  - {value: 0.106443}
-  - {value: 0.0944305}
-  - {value: 0.081111}
-  - {value: 0.0686732}
-  - {value: 0.0581359}
-  - {value: 0.0495928}
-  - {value: 0.0424074}
-  - {value: 0.0367425}
-  - {value: 0.0389868}
-  - {value: 0.0331081}
-  - {value: 0.0279712}
-  - {value: 0.0239159}
-  - {value: 0.0243428}
-  - {value: 0.020337}
-  - {value: 0.0172603}
-  - {value: 0.0146538}
-  - {value: 0.0125492}
-  - {value: 0.0106034}
-  - {value: 0.00886316}
-  - {value: 0.00766768}
-  - {value: 0.00666047}
-  - {value: 0.00748112}
-  - {value: 0.00641097}
-  - {value: 0.00676931}
-  - {value: 0.00568527}
-  - {value: 0.00481647}
-  - {value: 0.00411745}
-  - {value: 0.00656875}
-  - {value: 0.00484376}
-  - {value: 0.00661927}
-  - {value: 0.0046954}
-  - {value: 0.00264589}
-  - {value: 0.00156345}
-  - {value: 0.00154866}
-  - {value: 0.000631177}
-  - {value: 0.000300889}
-  - {value: 0.000140033}
-  - {value: 9.14383e-05}
-  - {value: 4.30812e-05}
-  - {value: 2.06103e-05}
-  - {value: 1.37714e-05}
-  - {value: 2.7636e-06}
-- header: {name: Stat (Data)}
-  values:
-  - {value: 0.000102371}
-  - {value: 9.49075e-05}
-  - {value: 9.27015e-05}
-  - {value: 9.4858e-05}
-  - {value: 9.29048e-05}
-  - {value: 9.13038e-05}
-  - {value: 8.77165e-05}
-  - {value: 8.51632e-05}
-  - {value: 8.03754e-05}
-  - {value: 7.4751e-05}
-  - {value: 6.91288e-05}
-  - {value: 6.55885e-05}
-  - {value: 6.20441e-05}
-  - {value: 5.84111e-05}
-  - {value: 5.43868e-05}
-  - {value: 5.09393e-05}
-  - {value: 4.77284e-05}
-  - {value: 4.33461e-05}
-  - {value: 4.06221e-05}
-  - {value: 3.78764e-05}
-  - {value: 3.5859e-05}
-  - {value: 3.34094e-05}
-  - {value: 3.16998e-05}
-  - {value: 2.97563e-05}
-  - {value: 2.84602e-05}
-  - {value: 2.76552e-05}
-  - {value: 2.67771e-05}
-  - {value: 2.56738e-05}
-  - {value: 2.45876e-05}
-  - {value: 2.29524e-05}
-  - {value: 2.13104e-05}
-  - {value: 1.91321e-05}
-  - {value: 1.70873e-05}
-  - {value: 1.50925e-05}
-  - {value: 1.32953e-05}
-  - {value: 1.08143e-05}
-  - {value: 8.74212e-06}
-  - {value: 6.65678e-06}
-  - {value: 5.13199e-06}
-  - {value: 4.25983e-06}
-  - {value: 3.40444e-06}
-  - {value: 2.45674e-06}
-  - {value: 2.00646e-06}
-  - {value: 1.61831e-06}
-- header: {name: Stat (MC)}
-  values:
-  - {value: 8.09829e-05}
-  - {value: 7.44497e-05}
-  - {value: 7.4079e-05}
-  - {value: 7.31161e-05}
-  - {value: 7.17112e-05}
-  - {value: 7.00266e-05}
-  - {value: 6.69025e-05}
-  - {value: 6.27443e-05}
-  - {value: 5.84981e-05}
-  - {value: 5.49052e-05}
-  - {value: 5.15031e-05}
-  - {value: 4.83938e-05}
-  - {value: 4.55475e-05}
-  - {value: 4.29211e-05}
-  - {value: 4.04721e-05}
-  - {value: 3.81011e-05}
-  - {value: 3.54582e-05}
-  - {value: 3.30128e-05}
-  - {value: 3.10321e-05}
-  - {value: 2.92111e-05}
-  - {value: 2.7404e-05}
-  - {value: 2.57572e-05}
-  - {value: 2.42184e-05}
-  - {value: 2.27957e-05}
-  - {value: 2.19838e-05}
-  - {value: 2.11016e-05}
-  - {value: 2.07621e-05}
-  - {value: 2.02587e-05}
-  - {value: 1.94961e-05}
-  - {value: 1.83752e-05}
-  - {value: 1.73845e-05}
-  - {value: 1.59935e-05}
-  - {value: 1.46043e-05}
-  - {value: 1.32128e-05}
-  - {value: 1.18844e-05}
-  - {value: 1.00768e-05}
-  - {value: 8.52524e-06}
-  - {value: 6.65474e-06}
-  - {value: 5.07138e-06}
-  - {value: 4.22219e-06}
-  - {value: 3.51076e-06}
-  - {value: 2.64566e-06}
-  - {value: 2.07519e-06}
-  - {value: 1.63666e-06}
-- header: {name: Efficiencies (Uncorellated)}
-  values:
-  - {value: 7.22891e-06}
-  - {value: 7.18163e-06}
-  - {value: 6.08446e-06}
-  - {value: 6.70296e-06}
-  - {value: 6.31176e-06}
-  - {value: 6.08136e-06}
-  - {value: 5.77708e-06}
-  - {value: 6.05748e-06}
-  - {value: 6.39294e-06}
-  - {value: 5.81985e-06}
-  - {value: 5.24487e-06}
-  - {value: 4.93536e-06}
-  - {value: 5.05399e-06}
-  - {value: 5.20552e-06}
-  - {value: 5.1138e-06}
-  - {value: 5.25854e-06}
-  - {value: 4.90172e-06}
-  - {value: 4.85719e-06}
-  - {value: 4.58636e-06}
-  - {value: 4.13876e-06}
-  - {value: 3.85815e-06}
-  - {value: 3.71002e-06}
-  - {value: 3.52942e-06}
-  - {value: 3.40751e-06}
-  - {value: 2.90491e-06}
-  - {value: 2.80487e-06}
-  - {value: 2.44491e-06}
-  - {value: 2.45262e-06}
-  - {value: 2.20911e-06}
-  - {value: 2.28263e-06}
-  - {value: 2.09001e-06}
-  - {value: 1.90618e-06}
-  - {value: 1.68432e-06}
-  - {value: 1.52197e-06}
-  - {value: 1.18985e-06}
-  - {value: 9.87466e-07}
-  - {value: 8.21905e-07}
-  - {value: 7.32572e-07}
-  - {value: 5.91105e-07}
-  - {value: 5.09875e-07}
-  - {value: 2.53065e-07}
-  - {value: 1.92831e-07}
-  - {value: 1.67278e-07}
-  - {value: 1.30595e-07}
-- header: {name: Scale}
-  values:
-  - {value: 5.74042e-05}
-  - {value: 4.26257e-05}
-  - {value: 4.63821e-05}
-  - {value: 4.32444e-05}
-  - {value: 3.29997e-05}
-  - {value: 2.51705e-05}
-  - {value: 1.53554e-05}
-  - {value: 8.25684e-06}
-  - {value: 1.7743e-06}
-  - {value: -2.52894e-06}
-  - {value: -4.44667e-06}
-  - {value: -7.91584e-06}
-  - {value: -1.17235e-05}
-  - {value: -1.4944e-05}
-  - {value: -1.71182e-05}
-  - {value: -1.7969e-05}
-  - {value: -1.97807e-05}
-  - {value: -2.14742e-05}
-  - {value: -2.20046e-05}
-  - {value: -2.13968e-05}
-  - {value: -2.11376e-05}
-  - {value: -1.97205e-05}
-  - {value: -1.74363e-05}
-  - {value: -1.48847e-05}
-  - {value: -1.21268e-05}
-  - {value: -9.62642e-06}
-  - {value: -7.33729e-06}
-  - {value: -4.80769e-06}
-  - {value: -3.10729e-06}
-  - {value: -1.64398e-06}
-  - {value: -4.0303e-07}
-  - {value: 2.24266e-07}
-  - {value: 5.28301e-07}
-  - {value: 9.48076e-07}
-  - {value: 1.27241e-06}
-  - {value: 1.22838e-06}
-  - {value: 9.02861e-07}
-  - {value: 5.16388e-07}
-  - {value: 3.74232e-07}
-  - {value: 1.99243e-07}
-  - {value: 1.21779e-07}
-  - {value: 5.24385e-08}
-  - {value: 5.68144e-08}
-  - {value: 2.68711e-08}
-- header: {name: Resolution}
-  values:
-  - {value: -8.73084e-06}
-  - {value: -2.36882e-06}
-  - {value: -3.37921e-06}
-  - {value: -2.79117e-06}
-  - {value: -4.31868e-06}
-  - {value: -2.1314e-06}
-  - {value: -2.01192e-06}
-  - {value: -7.40268e-07}
-  - {value: -3.35542e-07}
-  - {value: -3.65744e-07}
-  - {value: 6.83458e-07}
-  - {value: 1.87648e-06}
-  - {value: 2.96786e-06}
-  - {value: 2.58708e-06}
-  - {value: 3.7847e-06}
-  - {value: 4.16607e-06}
-  - {value: 4.53774e-06}
-  - {value: 3.54601e-06}
-  - {value: 3.26079e-06}
-  - {value: 2.66431e-06}
-  - {value: 3.75639e-06}
-  - {value: 1.88264e-06}
-  - {value: 7.42297e-07}
-  - {value: 1.12361e-06}
-  - {value: 1.02775e-06}
-  - {value: 1.77267e-07}
-  - {value: 3.97475e-09}
-  - {value: -2.53902e-07}
-  - {value: -4.45023e-07}
-  - {value: -3.76437e-07}
-  - {value: -7.55535e-07}
-  - {value: -9.60867e-07}
-  - {value: -7.91375e-07}
-  - {value: -9.841e-07}
-  - {value: -1.03048e-06}
-  - {value: -6.24733e-07}
-  - {value: -3.65867e-07}
-  - {value: -2.13644e-07}
-  - {value: -1.92717e-07}
-  - {value: -1.03995e-07}
-  - {value: -1.11694e-08}
-  - {value: 7.86313e-09}
-  - {value: -2.20764e-08}
-  - {value: -1.79767e-08}
-- header: {name: Electron (Reco)}
-  values:
-  - {value: 3.73609e-05}
-  - {value: 2.59224e-05}
-  - {value: 2.56501e-05}
-  - {value: 2.47024e-05}
-  - {value: 1.79945e-05}
-  - {value: 1.36729e-05}
-  - {value: 1.01267e-05}
-  - {value: 4.1364e-06}
-  - {value: 1.96642e-07}
-  - {value: -2.9938e-06}
-  - {value: -3.14029e-06}
-  - {value: -4.71249e-06}
-  - {value: -6.99516e-06}
-  - {value: -1.00311e-05}
-  - {value: -1.19435e-05}
-  - {value: -1.19122e-05}
-  - {value: -1.05337e-05}
-  - {value: -1.02591e-05}
-  - {value: -8.71854e-06}
-  - {value: -7.83448e-06}
-  - {value: -7.62361e-06}
-  - {value: -6.24645e-06}
-  - {value: -5.8664e-06}
-  - {value: -5.50491e-06}
-  - {value: -5.37919e-06}
-  - {value: -5.07208e-06}
-  - {value: -3.69542e-06}
-  - {value: -3.76334e-06}
-  - {value: -4.15117e-06}
-  - {value: -4.11166e-06}
-  - {value: -3.85005e-06}
-  - {value: -3.23428e-06}
-  - {value: -3.23507e-06}
-  - {value: -3.66205e-06}
-  - {value: -2.7668e-06}
-  - {value: -1.85805e-06}
-  - {value: -1.24302e-06}
-  - {value: -9.03214e-07}
-  - {value: -5.32538e-07}
-  - {value: -3.27019e-07}
-  - {value: -1.35082e-07}
-  - {value: -1.0457e-07}
-  - {value: -2.80426e-08}
-  - {value: 3.32287e-09}
-- header: {name: Electron (ID)}
-  values:
-  - {value: 8.03197e-05}
-  - {value: 4.72418e-05}
-  - {value: 5.60831e-05}
-  - {value: 5.43746e-05}
-  - {value: 5.3162e-05}
-  - {value: 4.63812e-05}
-  - {value: 3.203e-05}
-  - {value: 2.2394e-05}
-  - {value: 1.39467e-05}
-  - {value: 7.22148e-06}
-  - {value: 7.83375e-07}
-  - {value: -6.96084e-06}
-  - {value: -1.23785e-05}
-  - {value: -1.64871e-05}
-  - {value: -2.26757e-05}
-  - {value: -2.40263e-05}
-  - {value: -2.51184e-05}
-  - {value: -2.56432e-05}
-  - {value: -2.32065e-05}
-  - {value: -2.10945e-05}
-  - {value: -1.91288e-05}
-  - {value: -1.58017e-05}
-  - {value: -1.40339e-05}
-  - {value: -1.23998e-05}
-  - {value: -1.08854e-05}
-  - {value: -1.04187e-05}
-  - {value: -1.04548e-05}
-  - {value: -1.00943e-05}
-  - {value: -1.11345e-05}
-  - {value: -1.19792e-05}
-  - {value: -1.18675e-05}
-  - {value: -1.17343e-05}
-  - {value: -1.17395e-05}
-  - {value: -1.0981e-05}
-  - {value: -1.00176e-05}
-  - {value: -7.77185e-06}
-  - {value: -5.59799e-06}
-  - {value: -4.3859e-06}
-  - {value: -3.09999e-06}
-  - {value: -1.67309e-06}
-  - {value: -8.50604e-07}
-  - {value: -5.94727e-07}
-  - {value: -4.03555e-07}
-  - {value: -2.35804e-07}
-- header: {name: Isolation}
-  values:
-  - {value: 1.65751e-05}
-  - {value: 1.42725e-05}
-  - {value: 1.02572e-05}
-  - {value: 1.12324e-05}
-  - {value: 8.98859e-06}
-  - {value: 6.06504e-06}
-  - {value: 5.00706e-06}
-  - {value: 3.95519e-06}
-  - {value: 1.24691e-06}
-  - {value: 1.77617e-06}
-  - {value: 1.70805e-06}
-  - {value: 2.72345e-06}
-  - {value: 7.85105e-07}
-  - {value: 4.45172e-07}
-  - {value: -9.63387e-07}
-  - {value: -3.14654e-07}
-  - {value: -1.40364e-06}
-  - {value: -1.37496e-06}
-  - {value: -2.18904e-06}
-  - {value: -1.46434e-06}
-  - {value: -1.33538e-06}
-  - {value: -1.22848e-06}
-  - {value: -1.33439e-06}
-  - {value: -1.07009e-06}
-  - {value: -1.55554e-06}
-  - {value: -9.52577e-07}
-  - {value: -2.53386e-07}
-  - {value: -3.37072e-07}
-  - {value: -5.83773e-07}
-  - {value: -1.0178e-06}
-  - {value: -1.2812e-06}
-  - {value: -2.19813e-06}
-  - {value: -4.19073e-06}
-  - {value: -5.63121e-06}
-  - {value: -6.08203e-06}
-  - {value: -6.07504e-06}
-  - {value: -6.00115e-06}
-  - {value: -5.78748e-06}
-  - {value: -4.72147e-06}
-  - {value: -2.64485e-06}
-  - {value: -1.40241e-06}
-  - {value: -9.78136e-07}
-  - {value: -6.87393e-07}
-  - {value: -4.66472e-07}
-- header: {name: Trigger}
-  values:
-  - {value: -4.8553e-06}
-  - {value: 3.24566e-06}
-  - {value: -2.17557e-06}
-  - {value: -1.75834e-06}
-  - {value: -1.2642e-06}
-  - {value: -2.596e-06}
-  - {value: -2.0835e-07}
-  - {value: -1.62556e-06}
-  - {value: -2.11783e-06}
-  - {value: -2.55249e-06}
-  - {value: -4.05737e-06}
-  - {value: -2.95096e-06}
-  - {value: -1.92744e-06}
-  - {value: 1.42226e-07}
-  - {value: 7.7965e-08}
-  - {value: 1.18112e-06}
-  - {value: 9.78354e-07}
-  - {value: 2.26498e-06}
-  - {value: 1.61594e-06}
-  - {value: 1.73715e-06}
-  - {value: 1.41973e-06}
-  - {value: 1.48449e-06}
-  - {value: 1.09001e-06}
-  - {value: 1.1286e-06}
-  - {value: 3.80179e-07}
-  - {value: 1.16025e-06}
-  - {value: 8.58463e-07}
-  - {value: 1.07845e-06}
-  - {value: 1.71664e-06}
-  - {value: 1.29961e-06}
-  - {value: 1.04069e-06}
-  - {value: 1.04583e-06}
-  - {value: 7.03697e-07}
-  - {value: 4.37115e-07}
-  - {value: 1.89404e-07}
-  - {value: -3.10393e-07}
-  - {value: -1.67002e-07}
-  - {value: -4.56421e-08}
-  - {value: 5.1524e-08}
-  - {value: 6.36341e-09}
-  - {value: 4.87548e-08}
-  - {value: 5.87578e-08}
-  - {value: 1.16622e-08}
-  - {value: 3.27958e-08}
-- header: {name: Charge Id}
-  values:
-  - {value: 2.19879e-05}
-  - {value: 1.45338e-05}
-  - {value: 1.79093e-05}
-  - {value: 1.86286e-05}
-  - {value: 1.71715e-05}
-  - {value: 1.59027e-05}
-  - {value: 1.06905e-05}
-  - {value: 8.10809e-06}
-  - {value: 4.61484e-06}
-  - {value: 1.44475e-06}
-  - {value: -1.22615e-06}
-  - {value: -1.44461e-06}
-  - {value: -2.39323e-06}
-  - {value: -2.3009e-06}
-  - {value: -3.57821e-06}
-  - {value: -3.94914e-06}
-  - {value: -3.6432e-06}
-  - {value: -3.85321e-06}
-  - {value: -3.85997e-06}
-  - {value: -3.39963e-06}
-  - {value: -2.79689e-06}
-  - {value: -1.83311e-06}
-  - {value: -2.11803e-06}
-  - {value: -2.86641e-06}
-  - {value: -3.17032e-06}
-  - {value: -2.56195e-06}
-  - {value: -4.46218e-06}
-  - {value: -5.94209e-06}
-  - {value: -7.89254e-06}
-  - {value: -8.64825e-06}
-  - {value: -9.31798e-06}
-  - {value: -9.10617e-06}
-  - {value: -9.61383e-06}
-  - {value: -8.43784e-06}
-  - {value: -7.06103e-06}
-  - {value: -4.96444e-06}
-  - {value: -3.27046e-06}
-  - {value: -2.04391e-06}
-  - {value: -1.33877e-06}
-  - {value: -5.29771e-07}
-  - {value: -1.73327e-07}
-  - {value: -2.39057e-07}
-  - {value: -1.43797e-07}
-  - {value: -1.17062e-07}
-- header: {name: Z-vertex reweighting}
-  values:
-  - {value: -3.27826e-06}
-  - {value: 1.36765e-06}
-  - {value: -1.1038e-06}
-  - {value: -2.76603e-07}
-  - {value: -9.88798e-07}
-  - {value: -1.85839e-06}
-  - {value: -2.9962e-07}
-  - {value: 1.03776e-08}
-  - {value: 2.03028e-07}
-  - {value: -1.04481e-06}
-  - {value: -2.82457e-06}
-  - {value: -2.39576e-06}
-  - {value: -2.10399e-06}
-  - {value: -1.9756e-06}
-  - {value: -1.67093e-06}
-  - {value: -2.27941e-06}
-  - {value: -1.32427e-06}
-  - {value: -1.76951e-07}
-  - {value: 3.96311e-07}
-  - {value: 4.76305e-07}
-  - {value: 3.35941e-08}
-  - {value: -3.48414e-07}
-  - {value: -7.09269e-07}
-  - {value: -3.84104e-07}
-  - {value: -6.22888e-07}
-  - {value: -8.8158e-07}
-  - {value: -8.80948e-07}
-  - {value: -9.44644e-07}
-  - {value: -3.74807e-07}
-  - {value: -2.77235e-08}
-  - {value: -2.87579e-07}
-  - {value: 1.5445e-07}
-  - {value: 2.68969e-07}
-  - {value: 3.3263e-07}
-  - {value: 3.40817e-07}
-  - {value: 1.3882e-07}
-  - {value: 3.24352e-09}
-  - {value: 5.66633e-08}
-  - {value: -7.09518e-08}
-  - {value: -5.27226e-08}
-  - {value: -4.60219e-08}
-  - {value: -4.3803e-08}
-  - {value: -5.90428e-09}
-  - {value: 1.68386e-08}
-- header: {name: Pile-Up}
-  values:
-  - {value: -3.40566e-05}
-  - {value: -4.01083e-05}
-  - {value: -1.37389e-05}
-  - {value: -2.41436e-05}
-  - {value: -1.75158e-05}
-  - {value: -2.91158e-06}
-  - {value: 6.10415e-06}
-  - {value: 1.61151e-05}
-  - {value: 2.9557e-05}
-  - {value: 1.55313e-05}
-  - {value: 1.00657e-05}
-  - {value: 9.50428e-06}
-  - {value: 1.83657e-06}
-  - {value: -5.23909e-06}
-  - {value: -7.73929e-06}
-  - {value: -1.24314e-05}
-  - {value: -7.29718e-06}
-  - {value: 1.4216e-06}
-  - {value: -1.67951e-06}
-  - {value: -3.75802e-06}
-  - {value: 1.76047e-06}
-  - {value: 1.04288e-06}
-  - {value: 4.29646e-06}
-  - {value: 3.06658e-06}
-  - {value: 4.17778e-06}
-  - {value: 4.87923e-06}
-  - {value: 5.73931e-06}
-  - {value: 7.83532e-06}
-  - {value: 4.24394e-06}
-  - {value: 4.76129e-06}
-  - {value: 7.66828e-06}
-  - {value: 5.46106e-06}
-  - {value: 7.46966e-06}
-  - {value: 8.1348e-06}
-  - {value: 3.75396e-06}
-  - {value: 3.82663e-06}
-  - {value: 2.40198e-06}
-  - {value: 1.71655e-06}
-  - {value: 1.50308e-06}
-  - {value: 3.80076e-07}
-  - {value: -4.82333e-07}
-  - {value: -5.9623e-08}
-  - {value: 2.18436e-07}
-  - {value: -1.03233e-07}
-- header: {name: Model}
-  values:
-  - {value: 0.000169138}
-  - {value: -4.85964e-06}
-  - {value: 7.43061e-05}
-  - {value: 7.93487e-07}
-  - {value: -1.82486e-05}
-  - {value: -8.4347e-05}
-  - {value: -0.000120036}
-  - {value: -8.76534e-05}
-  - {value: -3.68101e-05}
-  - {value: -2.44645e-06}
-  - {value: 1.14007e-05}
-  - {value: 8.55061e-06}
-  - {value: 1.44948e-05}
-  - {value: 1.62808e-05}
-  - {value: 1.92359e-05}
-  - {value: 1.72122e-05}
-  - {value: 1.20915e-05}
-  - {value: 1.23697e-05}
-  - {value: 1.21488e-05}
-  - {value: 2.19193e-07}
-  - {value: 3.43858e-06}
-  - {value: -2.08563e-06}
-  - {value: -3.92087e-07}
-  - {value: 1.44022e-06}
-  - {value: -2.50433e-06}
-  - {value: -2.14736e-06}
-  - {value: -2.18063e-06}
-  - {value: -3.85195e-06}
-  - {value: -5.92048e-06}
-  - {value: -6.16516e-06}
-  - {value: -8.2277e-06}
-  - {value: -9.81968e-06}
-  - {value: -1.09102e-05}
-  - {value: -7.8952e-06}
-  - {value: -1.0862e-05}
-  - {value: -7.84688e-06}
-  - {value: -5.73949e-06}
-  - {value: -3.52641e-06}
-  - {value: -2.2412e-06}
-  - {value: -1.23635e-06}
-  - {value: -7.92413e-07}
-  - {value: -2.13684e-07}
-  - {value: -8.44079e-08}
-  - {value: -7.07108e-08}
-- header: {name: Background}
-  values:
-  - {value: 4.60024e-05}
-  - {value: 3.27621e-05}
-  - {value: 3.58775e-05}
-  - {value: 3.30396e-05}
-  - {value: 2.65565e-05}
-  - {value: 1.97696e-05}
-  - {value: 1.23759e-05}
-  - {value: 7.1499e-06}
-  - {value: 3.72263e-06}
-  - {value: 6.19995e-07}
-  - {value: -1.42466e-06}
-  - {value: -2.99966e-06}
-  - {value: -4.75746e-06}
-  - {value: -5.74626e-06}
-  - {value: -6.42772e-06}
-  - {value: -6.84323e-06}
-  - {value: -7.2868e-06}
-  - {value: -7.53001e-06}
-  - {value: -7.844e-06}
-  - {value: -7.90314e-06}
-  - {value: -8.24127e-06}
-  - {value: -8.66496e-06}
-  - {value: -9.24032e-06}
-  - {value: -9.63899e-06}
-  - {value: -9.67172e-06}
-  - {value: -9.84973e-06}
-  - {value: -1.09577e-05}
-  - {value: -1.13264e-05}
-  - {value: -1.21091e-05}
-  - {value: -1.17502e-05}
-  - {value: -1.07569e-05}
-  - {value: -9.85639e-06}
-  - {value: -8.97617e-06}
-  - {value: -6.93188e-06}
-  - {value: -5.22174e-06}
-  - {value: -3.15496e-06}
-  - {value: -1.83193e-06}
-  - {value: -1.2298e-06}
-  - {value: -8.4747e-07}
-  - {value: -4.70712e-07}
-  - {value: -2.61734e-07}
-  - {value: -1.81369e-07}
-  - {value: -1.31375e-07}
-  - {value: -8.84721e-08}
-independent_variables:
-- header: {name: 'Bin $p_{T}^{ee}$', units: GEV}
-  values:
-  - {high: 2, low: 0}
-  - {high: 4, low: 2}
-  - {high: 6, low: 4}
-  - {high: 8, low: 6}
-  - {high: 10, low: 8}
-  - {high: 12, low: 10}
-  - {high: 14, low: 12}
-  - {high: 16, low: 14}
-  - {high: 18, low: 16}
-  - {high: 20, low: 18}
-  - {high: 22.5, low: 20}
-  - {high: 25, low: 22.5}
-  - {high: 27.5, low: 25}
-  - {high: 30, low: 27.5}
-  - {high: 33, low: 30}
-  - {high: 36, low: 33}
-  - {high: 39, low: 36}
-  - {high: 42, low: 39}
-  - {high: 45, low: 42}
-  - {high: 48, low: 45}
-  - {high: 51, low: 48}
-  - {high: 54, low: 51}
-  - {high: 57, low: 54}
-  - {high: 61, low: 57}
-  - {high: 65, low: 61}
-  - {high: 70, low: 65}
-  - {high: 75, low: 70}
-  - {high: 80, low: 75}
-  - {high: 85, low: 80}
-  - {high: 95, low: 85}
-  - {high: 105, low: 95}
-  - {high: 125, low: 105}
-  - {high: 150, low: 125}
-  - {high: 175, low: 150}
-  - {high: 200, low: 175}
-  - {high: 250, low: 200}
-  - {high: 300, low: 250}
-  - {high: 350, low: 300}
-  - {high: 400, low: 350}
-  - {high: 470, low: 400}
-  - {high: 550, low: 470}
-  - {high: 650, low: 550}
-  - {high: 900, low: 650}
-  - {high: 2500, low: 900}
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Tabulated_Figure_6.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Tabulated_Figure_6.yaml
deleted file mode 100644
index d610160f04..0000000000
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Tabulated_Figure_6.yaml
+++ /dev/null
@@ -1,466 +0,0 @@
-dependent_variables:
-- header: {name: Data}
-  values:
-  - errors:
-    - {label: systematic uncertainty, symerror: 4.22803e-05}
-    value: 0.0343165
-  - errors:
-    - {label: systematic uncertainty, symerror: 4.17154e-05}
-    value: 0.0291566
-  - errors:
-    - {label: systematic uncertainty, symerror: 3.71021e-05}
-    value: 0.0248037
-  - errors:
-    - {label: systematic uncertainty, symerror: 3.24368e-05}
-    value: 0.021268
-  - errors:
-    - {label: systematic uncertainty, symerror: 2.93486e-05}
-    value: 0.018325
-  - errors:
-    - {label: systematic uncertainty, symerror: 2.1707e-05}
-    value: 0.0156045
-  - errors:
-    - {label: systematic uncertainty, symerror: 2.05628e-05}
-    value: 0.01318
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.94438e-05}
-    value: 0.0112073
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.84635e-05}
-    value: 0.00955676
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.47597e-05}
-    value: 0.00810287
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.42096e-05}
-    value: 0.00678809
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.34331e-05}
-    value: 0.00575628
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.26141e-05}
-    value: 0.00487686
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.18061e-05}
-    value: 0.00416884
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.11818e-05}
-    value: 0.00352131
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.05983e-05}
-    value: 0.00297507
-  - errors:
-    - {label: systematic uncertainty, symerror: 9.94376e-06}
-    value: 0.00254333
-  - errors:
-    - {label: systematic uncertainty, symerror: 9.34678e-06}
-    value: 0.00218319
-  - errors:
-    - {label: systematic uncertainty, symerror: 6.48633e-06}
-    value: 0.00187701
-  - errors:
-    - {label: systematic uncertainty, symerror: 6.1919e-06}
-    value: 0.0015932
-  - errors:
-    - {label: systematic uncertainty, symerror: 4.81784e-06}
-    value: 0.00135193
-  - errors:
-    - {label: systematic uncertainty, symerror: 4.66633e-06}
-    value: 0.0011323
-  - errors:
-    - {label: systematic uncertainty, symerror: 4.54424e-06}
-    value: 0.00095743
-  - errors:
-    - {label: systematic uncertainty, symerror: 4.37793e-06}
-    value: 0.000814977
-  - errors:
-    - {label: systematic uncertainty, symerror: 2.08447e-06}
-    value: 0.000653718
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.96961e-06}
-    value: 0.000484859
-  - errors:
-    - {label: systematic uncertainty, symerror: 9.09987e-07}
-    value: 0.000329051
-  - errors:
-    - {label: systematic uncertainty, symerror: 6.61538e-07}
-    value: 0.000186048
-  - errors:
-    - {label: systematic uncertainty, symerror: 5.88609e-07}
-    value: 0.000104998
-  - errors:
-    - {label: systematic uncertainty, symerror: 5.13346e-07}
-    value: 6.12794e-05
-  - errors:
-    - {label: systematic uncertainty, symerror: 2.1239e-07}
-    value: 3.0584e-05
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.7431e-07}
-    value: 1.22113e-05
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.36912e-07}
-    value: 5.90263e-06
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.07011e-07}
-    value: 2.77421e-06
-  - errors:
-    - {label: systematic uncertainty, symerror: 6.18513e-08}
-    value: 1.25134e-06
-  - errors:
-    - {label: systematic uncertainty, symerror: 4.41197e-08}
-    value: 5.5219e-07
-  - errors:
-    - {label: systematic uncertainty, symerror: 2.61233e-08}
-    value: 2.01646e-07
-  - errors:
-    - {label: systematic uncertainty, symerror: 8.10047e-09}
-    value: 5.11526e-08
-- header: {name: NNLOjet}
-  values:
-  - errors:
-    - asymerror: {minus: -0.000928396, plus: 0.000757317}
-      label: systematic uncertainty
-    value: 0.0380557
-  - errors:
-    - asymerror: {minus: -0.000575129, plus: 0.000476175}
-      label: systematic uncertainty
-    value: 0.031536
-  - errors:
-    - asymerror: {minus: -0.000464836, plus: 0.0003151}
-      label: systematic uncertainty
-    value: 0.0259986
-  - errors:
-    - asymerror: {minus: -0.000283612, plus: 0.000434038}
-      label: systematic uncertainty
-    value: 0.0220682
-  - errors:
-    - asymerror: {minus: -0.000258206, plus: 0.000224893}
-      label: systematic uncertainty
-    value: 0.0186252
-  - errors:
-    - asymerror: {minus: -0.000244722, plus: 0.000187336}
-      label: systematic uncertainty
-    value: 0.015662
-  - errors:
-    - asymerror: {minus: -0.000230139, plus: 0.000200008}
-      label: systematic uncertainty
-    value: 0.0131076
-  - errors:
-    - asymerror: {minus: -0.000197197, plus: 0.000216108}
-      label: systematic uncertainty
-    value: 0.0110405
-  - errors:
-    - asymerror: {minus: -0.000203926, plus: 0.000130179}
-      label: systematic uncertainty
-    value: 0.00942853
-  - errors:
-    - asymerror: {minus: -0.000175182, plus: 0.000134752}
-      label: systematic uncertainty
-    value: 0.00794182
-  - errors:
-    - asymerror: {minus: -0.000173028, plus: 0.000128132}
-      label: systematic uncertainty
-    value: 0.00670778
-  - errors:
-    - asymerror: {minus: -0.000134947, plus: 0.000101604}
-      label: systematic uncertainty
-    value: 0.00561435
-  - errors:
-    - asymerror: {minus: -0.000119747, plus: 8.12955e-05}
-      label: systematic uncertainty
-    value: 0.00476179
-  - errors:
-    - asymerror: {minus: -0.000102226, plus: 6.57718e-05}
-      label: systematic uncertainty
-    value: 0.00402768
-  - errors:
-    - asymerror: {minus: -8.71818e-05, plus: 6.7195e-05}
-      label: systematic uncertainty
-    value: 0.00341926
-  - errors:
-    - asymerror: {minus: -7.53593e-05, plus: 5.57137e-05}
-      label: systematic uncertainty
-    value: 0.00290031
-  - errors:
-    - asymerror: {minus: -6.68468e-05, plus: 4.51362e-05}
-      label: systematic uncertainty
-    value: 0.00247274
-  - errors:
-    - asymerror: {minus: -5.45131e-05, plus: 4.08951e-05}
-      label: systematic uncertainty
-    value: 0.00212562
-  - errors:
-    - asymerror: {minus: -4.50301e-05, plus: 3.57101e-05}
-      label: systematic uncertainty
-    value: 0.00182099
-  - errors:
-    - asymerror: {minus: -3.72217e-05, plus: 2.94437e-05}
-      label: systematic uncertainty
-    value: 0.00154111
-  - errors:
-    - asymerror: {minus: -3.52707e-05, plus: 2.44427e-05}
-      label: systematic uncertainty
-    value: 0.00131149
-  - errors:
-    - asymerror: {minus: -2.4515e-05, plus: 1.8892e-05}
-      label: systematic uncertainty
-    value: 0.0010889
-  - errors:
-    - asymerror: {minus: -2.36994e-05, plus: 1.56618e-05}
-      label: systematic uncertainty
-    value: 0.000923492
-  - errors:
-    - asymerror: {minus: -2.11701e-05, plus: 1.57592e-05}
-      label: systematic uncertainty
-    value: 0.000789281
-  - errors:
-    - asymerror: {minus: -1.62766e-05, plus: 1.12694e-05}
-      label: systematic uncertainty
-    value: 0.000628912
-  - errors:
-    - asymerror: {minus: -1.22076e-05, plus: 8.59844e-06}
-      label: systematic uncertainty
-    value: 0.000468642
-  - errors:
-    - asymerror: {minus: -8.41994e-06, plus: 5.78111e-06}
-      label: systematic uncertainty
-    value: 0.000315545
-  - errors:
-    - asymerror: {minus: -4.93492e-06, plus: 3.22534e-06}
-      label: systematic uncertainty
-    value: 0.000180595
-  - errors:
-    - asymerror: {minus: -2.82727e-06, plus: 1.83955e-06}
-      label: systematic uncertainty
-    value: 0.000101273
-  - errors:
-    - asymerror: {minus: -1.70885e-06, plus: 1.12646e-06}
-      label: systematic uncertainty
-    value: 5.96943e-05
-  - errors:
-    - asymerror: {minus: -9.51943e-07, plus: 5.02254e-07}
-      label: systematic uncertainty
-    value: 2.9846e-05
-  - errors:
-    - asymerror: {minus: -3.99519e-07, plus: 2.1409e-07}
-      label: systematic uncertainty
-    value: 1.2445e-05
-  - errors:
-    - asymerror: {minus: -2.01478e-07, plus: 1.03494e-07}
-      label: systematic uncertainty
-    value: 5.77334e-06
-  - errors:
-    - asymerror: {minus: -1.04598e-07, plus: 4.93272e-08}
-      label: systematic uncertainty
-    value: 2.88712e-06
-  - errors:
-    - asymerror: {minus: -5.01032e-08, plus: 2.2008e-08}
-      label: systematic uncertainty
-    value: 1.3699e-06
-  - errors:
-    - asymerror: {minus: -2.13344e-08, plus: 9.7127e-09}
-      label: systematic uncertainty
-    value: 5.7462e-07
-  - errors:
-    - asymerror: {minus: -9.69336e-09, plus: 4.25622e-09}
-      label: systematic uncertainty
-    value: 2.34077e-07
-  - errors:
-    - asymerror: {minus: -2.36051e-09, plus: 1.03647e-09}
-      label: systematic uncertainty
-    value: 5.70022e-08
-- header: {name: NNLOjet + NLO EWK}
-  values:
-  - errors:
-    - asymerror: {minus: -0.000927515, plus: 0.000758198}
-      label: systematic uncertainty
-    value: 0.0380757
-  - errors:
-    - asymerror: {minus: -0.000574398, plus: 0.000476905}
-      label: systematic uncertainty
-    value: 0.0315526
-  - errors:
-    - asymerror: {minus: -0.000464234, plus: 0.000315702}
-      label: systematic uncertainty
-    value: 0.0260123
-  - errors:
-    - asymerror: {minus: -0.000283101, plus: 0.000434549}
-      label: systematic uncertainty
-    value: 0.0220798
-  - errors:
-    - asymerror: {minus: -0.000257774, plus: 0.000225324}
-      label: systematic uncertainty
-    value: 0.018635
-  - errors:
-    - asymerror: {minus: -0.000244359, plus: 0.000187699}
-      label: systematic uncertainty
-    value: 0.0156702
-  - errors:
-    - asymerror: {minus: -0.000229836, plus: 0.000200311}
-      label: systematic uncertainty
-    value: 0.0131144
-  - errors:
-    - asymerror: {minus: -0.000196941, plus: 0.000216364}
-      label: systematic uncertainty
-    value: 0.0110463
-  - errors:
-    - asymerror: {minus: -0.000203708, plus: 0.000130397}
-      label: systematic uncertainty
-    value: 0.00943348
-  - errors:
-    - asymerror: {minus: -0.000174998, plus: 0.000134936}
-      label: systematic uncertainty
-    value: 0.00794599
-  - errors:
-    - asymerror: {minus: -0.000172872, plus: 0.000128288}
-      label: systematic uncertainty
-    value: 0.00671131
-  - errors:
-    - asymerror: {minus: -0.000134817, plus: 0.000101734}
-      label: systematic uncertainty
-    value: 0.0056173
-  - errors:
-    - asymerror: {minus: -0.000119637, plus: 8.14058e-05}
-      label: systematic uncertainty
-    value: 0.00476429
-  - errors:
-    - asymerror: {minus: -0.000102132, plus: 6.5865e-05}
-      label: systematic uncertainty
-    value: 0.0040298
-  - errors:
-    - asymerror: {minus: -8.71026e-05, plus: 6.72742e-05}
-      label: systematic uncertainty
-    value: 0.00342106
-  - errors:
-    - asymerror: {minus: -7.52922e-05, plus: 5.57809e-05}
-      label: systematic uncertainty
-    value: 0.00290184
-  - errors:
-    - asymerror: {minus: -6.67896e-05, plus: 4.51934e-05}
-      label: systematic uncertainty
-    value: 0.00247404
-  - errors:
-    - asymerror: {minus: -5.44639e-05, plus: 4.09444e-05}
-      label: systematic uncertainty
-    value: 0.00212673
-  - errors:
-    - asymerror: {minus: -4.49879e-05, plus: 3.57522e-05}
-      label: systematic uncertainty
-    value: 0.00182195
-  - errors:
-    - asymerror: {minus: -3.71861e-05, plus: 2.94794e-05}
-      label: systematic uncertainty
-    value: 0.00154192
-  - errors:
-    - asymerror: {minus: -3.52403e-05, plus: 2.44731e-05}
-      label: systematic uncertainty
-    value: 0.00131141
-  - errors:
-    - asymerror: {minus: -2.44898e-05, plus: 1.89173e-05}
-      label: systematic uncertainty
-    value: 0.0010881
-  - errors:
-    - asymerror: {minus: -2.3678e-05, plus: 1.56832e-05}
-      label: systematic uncertainty
-    value: 0.00092206
-  - errors:
-    - asymerror: {minus: -2.11518e-05, plus: 1.57775e-05}
-      label: systematic uncertainty
-    value: 0.00078722
-  - errors:
-    - asymerror: {minus: -1.6262e-05, plus: 1.12839e-05}
-      label: systematic uncertainty
-    value: 0.000626374
-  - errors:
-    - asymerror: {minus: -1.21967e-05, plus: 8.60929e-06}
-      label: systematic uncertainty
-    value: 0.000465713
-  - errors:
-    - asymerror: {minus: -8.41263e-06, plus: 5.78842e-06}
-      label: systematic uncertainty
-    value: 0.000312404
-  - errors:
-    - asymerror: {minus: -4.93073e-06, plus: 3.22952e-06}
-      label: systematic uncertainty
-    value: 0.000177558
-  - errors:
-    - asymerror: {minus: -2.82492e-06, plus: 1.8419e-06}
-      label: systematic uncertainty
-    value: 9.87101e-05
-  - errors:
-    - asymerror: {minus: -1.70747e-06, plus: 1.12785e-06}
-      label: systematic uncertainty
-    value: 5.7654e-05
-  - errors:
-    - asymerror: {minus: -9.51251e-07, plus: 5.02945e-07}
-      label: systematic uncertainty
-    value: 2.84579e-05
-  - errors:
-    - asymerror: {minus: -3.99231e-07, plus: 2.14378e-07}
-      label: systematic uncertainty
-    value: 1.16512e-05
-  - errors:
-    - asymerror: {minus: -2.01344e-07, plus: 1.03628e-07}
-      label: systematic uncertainty
-    value: 5.30888e-06
-  - errors:
-    - asymerror: {minus: -1.04531e-07, plus: 4.93941e-08}
-      label: systematic uncertainty
-    value: 2.60903e-06
-  - errors:
-    - asymerror: {minus: -5.00715e-08, plus: 2.20397e-08}
-      label: systematic uncertainty
-    value: 1.21529e-06
-  - errors:
-    - asymerror: {minus: -2.13211e-08, plus: 9.72601e-09}
-      label: systematic uncertainty
-    value: 4.98369e-07
-  - errors:
-    - asymerror: {minus: -9.68793e-09, plus: 4.26164e-09}
-      label: systematic uncertainty
-    value: 1.97998e-07
-  - errors:
-    - asymerror: {minus: -2.35919e-09, plus: 1.03779e-09}
-      label: systematic uncertainty
-    value: 4.6424e-08
-independent_variables:
-- header: {name: 'Bin $p_{T}^{ll}$', units: GEV}
-  values:
-  - {high: 12, low: 10}
-  - {high: 14, low: 12}
-  - {high: 16, low: 14}
-  - {high: 18, low: 16}
-  - {high: 20, low: 18}
-  - {high: 22.5, low: 20}
-  - {high: 25, low: 22.5}
-  - {high: 27.5, low: 25}
-  - {high: 30, low: 27.5}
-  - {high: 33, low: 30}
-  - {high: 36, low: 33}
-  - {high: 39, low: 36}
-  - {high: 42, low: 39}
-  - {high: 45, low: 42}
-  - {high: 48, low: 45}
-  - {high: 51, low: 48}
-  - {high: 54, low: 51}
-  - {high: 57, low: 54}
-  - {high: 61, low: 57}
-  - {high: 65, low: 61}
-  - {high: 70, low: 65}
-  - {high: 75, low: 70}
-  - {high: 80, low: 75}
-  - {high: 85, low: 80}
-  - {high: 95, low: 85}
-  - {high: 105, low: 95}
-  - {high: 125, low: 105}
-  - {high: 150, low: 125}
-  - {high: 175, low: 150}
-  - {high: 200, low: 175}
-  - {high: 250, low: 200}
-  - {high: 300, low: 250}
-  - {high: 350, low: 300}
-  - {high: 400, low: 350}
-  - {high: 470, low: 400}
-  - {high: 550, low: 470}
-  - {high: 650, low: 550}
-  - {high: 900, low: 650}
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/uncertainties.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/uncertainties.yaml
index 3e4edc38ff..985bd423e7 100644
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/uncertainties.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/uncertainties.yaml
@@ -1,590 +1,92 @@
 definitions:
-  Stat (Data):
-    description: Stat (Data) from HEPDATA
-    treatment: ADD
-    type: UNCORR
-  Stat (MC):
-    description: Stat (MC) from HEPDATA
-    treatment: ADD
-    type: UNCORR
-  Efficiencies (Uncorellated):
-    description: Efficiencies (Uncorellated) from HEPDATA
-    treatment: ADD
-    type: UNCORR
-  Scale:
-    description: Scale from HEPDATA
-    treatment: ADD
-    type: CORR
-  Resolution:
-    description: Resolution from HEPDATA
-    treatment: ADD
-    type: CORR
-  Muon Saggita:
-    description: Muon Saggita from HEPDATA
-    treatment: ADD
-    type: CORR
-  Efficiencies (Corellated):
-    description: Efficiencies (Corellated) from HEPDATA
-    treatment: ADD
-    type: CORR
-  Isolation:
-    description: Isolation from HEPDATA
-    treatment: ADD
-    type: CORR
-  Trigger:
-    description: Trigger from HEPDATA
-    treatment: ADD
-    type: CORR
-  Muon (TTVA):
-    description: Muon (TTVA) from HEPDATA
-    treatment: ADD
-    type: CORR
-  Z-vertex reweighting:
-    description: Z-vertex reweighting from HEPDATA
+  correlated uncertainty:
+    description: correlated uncertainty
     treatment: ADD
     type: CORR
-  Pile-Up:
-    description: Pile-Up from HEPDATA
+  uncorrelated uncertainty:
+    description: uncorrelated uncertainty
     treatment: ADD
-    type: CORR
-  Model:
-    description: Model from HEPDATA
-    treatment: ADD
-    type: CORR
-  Background:
-    description: Background from HEPDATA
-    treatment: ADD
-    type: CORR
+    type: UNCORR
 bins:
-- Stat (Data): 7.33895e-05
-  Stat (MC): 5.61428e-05
-  Efficiencies (Uncorellated): 7.62052e-06
-  Scale: 3.77564e-05
-  Resolution: 1.97555e-05
-  Muon Saggita: 1.3535e-06
-  Efficiencies (Corellated): 2.53077e-07
-  Isolation: -3.21406e-07
-  Trigger: 2.10548e-07
-  Muon (TTVA): 6.50403e-08
-  Z-vertex reweighting: 6.92879e-08
-  Pile-Up: -1.71301e-06
-  Model: 1.17742e-05
-  Background: 2.6144e-06
-- Stat (Data): 7.17653e-05
-  Stat (MC): 5.474e-05
-  Efficiencies (Uncorellated): 7.12003e-06
-  Scale: 1.98692e-05
-  Resolution: 5.84463e-05
-  Muon Saggita: 4.87774e-06
-  Efficiencies (Corellated): 1.95681e-07
-  Isolation: -2.92554e-07
-  Trigger: 1.15319e-07
-  Muon (TTVA): 3.40175e-08
-  Z-vertex reweighting: 1.45025e-07
-  Pile-Up: 5.05812e-07
-  Model: -1.11864e-05
-  Background: 2.53068e-06
-- Stat (Data): 6.94675e-05
-  Stat (MC): 5.2111e-05
-  Efficiencies (Uncorellated): 6.10127e-06
-  Scale: 6.02976e-06
-  Resolution: 6.11683e-05
-  Muon Saggita: 3.25268e-06
-  Efficiencies (Corellated): 1.52499e-07
-  Isolation: -2.18755e-07
-  Trigger: 9.71047e-08
-  Muon (TTVA): 2.47162e-08
-  Z-vertex reweighting: -1.00394e-07
-  Pile-Up: -7.96941e-06
-  Model: -1.47197e-05
-  Background: 2.40286e-06
-- Stat (Data): 6.63969e-05
-  Stat (MC): 4.86351e-05
-  Efficiencies (Uncorellated): 4.94684e-06
-  Scale: -2.79757e-06
-  Resolution: 4.96738e-05
-  Muon Saggita: 9.75616e-07
-  Efficiencies (Corellated): 1.32704e-07
-  Isolation: -1.42078e-07
-  Trigger: 8.05904e-08
-  Muon (TTVA): 2.73643e-08
-  Z-vertex reweighting: -1.59619e-07
-  Pile-Up: -6.7597e-06
-  Model: -3.52029e-06
-  Background: 2.39151e-06
-- Stat (Data): 6.17612e-05
-  Stat (MC): 4.51803e-05
-  Efficiencies (Uncorellated): 3.89108e-06
-  Scale: -6.10522e-06
-  Resolution: 3.30354e-05
-  Muon Saggita: 2.83518e-06
-  Efficiencies (Corellated): 1.27998e-07
-  Isolation: -7.13211e-08
-  Trigger: 8.29725e-08
-  Muon (TTVA): 3.07492e-08
-  Z-vertex reweighting: 1.00215e-07
-  Pile-Up: -5.00779e-07
-  Model: 8.49558e-06
-  Background: 2.44995e-06
-- Stat (Data): 5.77664e-05
-  Stat (MC): 4.23546e-05
-  Efficiencies (Uncorellated): 2.98307e-06
-  Scale: -1.10568e-05
-  Resolution: 2.60181e-05
-  Muon Saggita: 1.95059e-06
-  Efficiencies (Corellated): 1.23313e-07
-  Isolation: -1.24541e-08
-  Trigger: 5.55809e-08
-  Muon (TTVA): 3.15496e-08
-  Z-vertex reweighting: 2.27018e-08
-  Pile-Up: 3.02638e-06
-  Model: -5.49603e-06
-  Background: 2.43522e-06
-- Stat (Data): 5.39635e-05
-  Stat (MC): 3.97985e-05
-  Efficiencies (Uncorellated): 2.29224e-06
-  Scale: -1.23219e-05
-  Resolution: 2.03084e-05
-  Muon Saggita: 1.12455e-06
-  Efficiencies (Corellated): 1.21131e-07
-  Isolation: 3.40861e-08
-  Trigger: 8.62634e-08
-  Muon (TTVA): 4.03474e-08
-  Z-vertex reweighting: -1.27428e-07
-  Pile-Up: -2.07097e-06
-  Model: 2.01242e-06
-  Background: 2.50026e-06
-- Stat (Data): 5.06942e-05
-  Stat (MC): 3.74849e-05
-  Efficiencies (Uncorellated): 1.84072e-06
-  Scale: -1.52471e-05
-  Resolution: 1.38317e-05
-  Muon Saggita: 1.54483e-06
-  Efficiencies (Corellated): 1.17825e-07
-  Isolation: 7.36893e-08
-  Trigger: 9.41138e-08
-  Muon (TTVA): 4.85094e-08
-  Z-vertex reweighting: -1.52972e-07
-  Pile-Up: 7.05864e-07
-  Model: -6.19182e-06
-  Background: 2.64906e-06
-- Stat (Data): 4.75316e-05
-  Stat (MC): 3.53303e-05
-  Efficiencies (Uncorellated): 1.47619e-06
-  Scale: -1.60245e-05
-  Resolution: 1.20235e-05
-  Muon Saggita: 1.77062e-06
-  Efficiencies (Corellated): 1.21933e-07
-  Isolation: 1.05107e-07
-  Trigger: 9.55364e-08
-  Muon (TTVA): 6.22857e-08
-  Z-vertex reweighting: -2.7066e-07
-  Pile-Up: -1.85933e-06
-  Model: 1.60522e-06
-  Background: 2.75984e-06
-- Stat (Data): 4.48241e-05
-  Stat (MC): 3.3345e-05
-  Efficiencies (Uncorellated): 1.19656e-06
-  Scale: -1.56591e-05
-  Resolution: 8.07986e-06
-  Muon Saggita: 1.6488e-06
-  Efficiencies (Corellated): 1.27991e-07
-  Isolation: 1.3236e-07
-  Trigger: 9.55465e-08
-  Muon (TTVA): 6.6568e-08
-  Z-vertex reweighting: -1.97182e-08
-  Pile-Up: -2.63947e-06
-  Model: -2.45685e-06
-  Background: 2.92749e-06
-- Stat (Data): 4.20221e-05
-  Stat (MC): 3.14638e-05
-  Efficiencies (Uncorellated): 1.05868e-06
-  Scale: -1.70632e-05
-  Resolution: 4.19756e-06
-  Muon Saggita: 3.16e-06
-  Efficiencies (Corellated): 1.24853e-07
-  Isolation: 1.53502e-07
-  Trigger: 9.70565e-08
-  Muon (TTVA): 6.23622e-08
-  Z-vertex reweighting: 8.22088e-08
-  Pile-Up: -6.2528e-06
-  Model: -4.081e-07
-  Background: 3.035e-06
-- Stat (Data): 4.00194e-05
-  Stat (MC): 2.96676e-05
-  Efficiencies (Uncorellated): 1.01334e-06
-  Scale: -1.85262e-05
-  Resolution: 1.49509e-06
-  Muon Saggita: 2.9723e-06
-  Efficiencies (Corellated): 1.15733e-07
-  Isolation: 1.65516e-07
-  Trigger: 1.00412e-07
-  Muon (TTVA): 6.4541e-08
-  Z-vertex reweighting: 8.99594e-08
-  Pile-Up: 2.01307e-06
-  Model: -3.29613e-06
-  Background: 3.12866e-06
-- Stat (Data): 3.7446e-05
-  Stat (MC): 2.75656e-05
-  Efficiencies (Uncorellated): 9.52163e-07
-  Scale: -1.85507e-05
-  Resolution: 7.40895e-07
-  Muon Saggita: 1.76665e-06
-  Efficiencies (Corellated): 1.13246e-07
-  Isolation: 1.67276e-07
-  Trigger: 1.12278e-07
-  Muon (TTVA): 6.18923e-08
-  Z-vertex reweighting: 3.73921e-08
-  Pile-Up: 3.8748e-06
-  Model: 2.62187e-06
-  Background: 3.22543e-06
-- Stat (Data): 3.4088e-05
-  Stat (MC): 2.56061e-05
-  Efficiencies (Uncorellated): 9.32742e-07
-  Scale: -1.98298e-05
-  Resolution: 2.58524e-06
-  Muon Saggita: 6.17704e-07
-  Efficiencies (Corellated): 1.05721e-07
-  Isolation: 1.6175e-07
-  Trigger: 8.81191e-08
-  Muon (TTVA): 5.92534e-08
-  Z-vertex reweighting: 1.61865e-07
-  Pile-Up: 4.30215e-06
-  Model: 2.60744e-08
-  Background: 3.35076e-06
-- Stat (Data): 3.18739e-05
-  Stat (MC): 2.40094e-05
-  Efficiencies (Uncorellated): 1.0063e-06
-  Scale: -1.78683e-05
-  Resolution: 4.52804e-06
-  Muon Saggita: 5.04182e-07
-  Efficiencies (Corellated): 9.42208e-08
-  Isolation: 1.46781e-07
-  Trigger: 8.81487e-08
-  Muon (TTVA): 5.41781e-08
-  Z-vertex reweighting: 2.84696e-07
-  Pile-Up: 5.96245e-06
-  Model: 1.08053e-06
-  Background: 3.3264e-06
-- Stat (Data): 3.01246e-05
-  Stat (MC): 2.25086e-05
-  Efficiencies (Uncorellated): 1.12277e-06
-  Scale: -1.78014e-05
-  Resolution: 2.34797e-06
-  Muon Saggita: -1.57807e-07
-  Efficiencies (Corellated): 7.8914e-08
-  Isolation: 1.28402e-07
-  Trigger: 9.25549e-08
-  Muon (TTVA): 4.11462e-08
-  Z-vertex reweighting: 3.49903e-07
-  Pile-Up: 3.93887e-06
-  Model: 2.94885e-06
-  Background: 3.3412e-06
-- Stat (Data): 2.84876e-05
-  Stat (MC): 2.1003e-05
-  Efficiencies (Uncorellated): 1.26063e-06
-  Scale: -1.74292e-05
-  Resolution: 1.90124e-06
-  Muon Saggita: 7.91841e-07
-  Efficiencies (Corellated): 7.02334e-08
-  Isolation: 1.06839e-07
-  Trigger: 1.04588e-07
-  Muon (TTVA): 3.44895e-08
-  Z-vertex reweighting: 6.95854e-08
-  Pile-Up: 1.66478e-06
-  Model: 2.81772e-06
-  Background: 3.53285e-06
-- Stat (Data): 2.70051e-05
-  Stat (MC): 1.96268e-05
-  Efficiencies (Uncorellated): 1.33511e-06
-  Scale: -1.61827e-05
-  Resolution: 1.68493e-06
-  Muon Saggita: -5.67574e-07
-  Efficiencies (Corellated): 6.0653e-08
-  Isolation: 8.23239e-08
-  Trigger: 9.02184e-08
-  Muon (TTVA): 2.86764e-08
-  Z-vertex reweighting: -4.72017e-08
-  Pile-Up: 1.86437e-06
-  Model: 4.04169e-06
-  Background: 3.6471e-06
-- Stat (Data): 2.53968e-05
-  Stat (MC): 1.8331e-05
-  Efficiencies (Uncorellated): 1.37111e-06
-  Scale: -1.48547e-05
-  Resolution: 8.46977e-07
-  Muon Saggita: -1.53013e-06
-  Efficiencies (Corellated): 5.48623e-08
-  Isolation: 5.7094e-08
-  Trigger: 8.77286e-08
-  Muon (TTVA): 2.41059e-08
-  Z-vertex reweighting: -6.21159e-08
-  Pile-Up: -1.53326e-06
-  Model: 4.70821e-06
-  Background: 3.85463e-06
-- Stat (Data): 2.38027e-05
-  Stat (MC): 1.71423e-05
-  Efficiencies (Uncorellated): 1.39809e-06
-  Scale: -1.26621e-05
-  Resolution: 1.00756e-06
-  Muon Saggita: -7.67405e-07
-  Efficiencies (Corellated): 4.72786e-08
-  Isolation: 3.51944e-08
-  Trigger: 7.78705e-08
-  Muon (TTVA): 2.10892e-08
-  Z-vertex reweighting: 5.48967e-08
-  Pile-Up: -2.54874e-06
-  Model: 4.38535e-06
-  Background: 4.07802e-06
-- Stat (Data): 2.30294e-05
-  Stat (MC): 1.64036e-05
-  Efficiencies (Uncorellated): 1.50361e-06
-  Scale: -1.08967e-05
-  Resolution: 9.59722e-07
-  Muon Saggita: -5.12532e-07
-  Efficiencies (Corellated): 4.34535e-08
-  Isolation: 1.79093e-08
-  Trigger: 6.66279e-08
-  Muon (TTVA): 1.48838e-08
-  Z-vertex reweighting: 6.94822e-08
-  Pile-Up: -4.28194e-06
-  Model: 5.17698e-06
-  Background: 4.19639e-06
-- Stat (Data): 2.23957e-05
-  Stat (MC): 1.56341e-05
-  Efficiencies (Uncorellated): 1.6905e-06
-  Scale: -9.89894e-06
-  Resolution: -6.45403e-08
-  Muon Saggita: -8.38272e-08
-  Efficiencies (Corellated): 4.19056e-08
-  Isolation: 4.49587e-09
-  Trigger: 5.70898e-08
-  Muon (TTVA): 1.43036e-08
-  Z-vertex reweighting: 7.28613e-08
-  Pile-Up: -6.36055e-06
-  Model: 6.56265e-06
-  Background: 4.29432e-06
-- Stat (Data): 2.19764e-05
-  Stat (MC): 1.51939e-05
-  Efficiencies (Uncorellated): 2.25177e-06
-  Scale: -9.34883e-06
-  Resolution: -1.17319e-07
-  Muon Saggita: 1.17481e-07
-  Efficiencies (Corellated): 4.39376e-08
-  Isolation: -1.10006e-08
-  Trigger: 6.6948e-08
-  Muon (TTVA): 1.85314e-08
-  Z-vertex reweighting: 2.04456e-08
-  Pile-Up: -4.71622e-06
-  Model: 5.13726e-06
-  Background: 5.11883e-06
-- Stat (Data): 2.13142e-05
-  Stat (MC): 1.46701e-05
-  Efficiencies (Uncorellated): 2.9503e-06
-  Scale: -8.15195e-06
-  Resolution: 1.33488e-06
-  Muon Saggita: -6.24295e-07
-  Efficiencies (Corellated): 4.28303e-08
-  Isolation: -2.44197e-08
-  Trigger: 5.68307e-08
-  Muon (TTVA): 1.78049e-08
-  Z-vertex reweighting: 3.99906e-08
-  Pile-Up: -3.52917e-06
-  Model: 7.06317e-06
-  Background: 5.61711e-06
-- Stat (Data): 2.07709e-05
-  Stat (MC): 1.40044e-05
-  Efficiencies (Uncorellated): 3.4922e-06
-  Scale: -6.65262e-06
-  Resolution: 1.17755e-06
-  Muon Saggita: -1.88947e-07
-  Efficiencies (Corellated): 4.68971e-08
-  Isolation: -3.42587e-08
-  Trigger: 4.72464e-08
-  Muon (TTVA): 1.88156e-08
-  Z-vertex reweighting: 1.90233e-07
-  Pile-Up: -2.83033e-06
-  Model: 6.57973e-06
-  Background: 6.48474e-06
-- Stat (Data): 1.94042e-05
-  Stat (MC): 1.30219e-05
-  Efficiencies (Uncorellated): 3.90433e-06
-  Scale: -6.49504e-06
-  Resolution: 4.24838e-07
-  Muon Saggita: -5.19957e-07
-  Efficiencies (Corellated): 5.24325e-08
-  Isolation: -3.45687e-08
-  Trigger: 3.84579e-08
-  Muon (TTVA): 1.87857e-08
-  Z-vertex reweighting: 1.9247e-07
-  Pile-Up: -1.92523e-06
-  Model: 7.42633e-06
-  Background: 6.60558e-06
-- Stat (Data): 1.84027e-05
-  Stat (MC): 1.21705e-05
-  Efficiencies (Uncorellated): 4.5605e-06
-  Scale: -5.68654e-06
-  Resolution: 5.09838e-07
-  Muon Saggita: -1.45038e-07
-  Efficiencies (Corellated): 5.77501e-08
-  Isolation: -2.76893e-08
-  Trigger: 2.90513e-08
-  Muon (TTVA): 1.83084e-08
-  Z-vertex reweighting: 2.09709e-07
-  Pile-Up: -2.24286e-06
-  Model: 6.24654e-06
-  Background: 6.3272e-06
-- Stat (Data): 1.68795e-05
-  Stat (MC): 1.10661e-05
-  Efficiencies (Uncorellated): 4.88845e-06
-  Scale: -5.25178e-06
-  Resolution: 2.18449e-08
-  Muon Saggita: 1.67385e-07
-  Efficiencies (Corellated): 5.8729e-08
-  Isolation: -1.45591e-08
-  Trigger: 2.99702e-08
-  Muon (TTVA): 1.78685e-08
-  Z-vertex reweighting: 1.87948e-07
-  Pile-Up: -1.31029e-06
-  Model: 6.94908e-06
-  Background: 5.94929e-06
-- Stat (Data): 1.51898e-05
-  Stat (MC): 9.98235e-06
-  Efficiencies (Uncorellated): 5.02588e-06
-  Scale: -4.52099e-06
-  Resolution: 3.78211e-07
-  Muon Saggita: 1.90734e-07
-  Efficiencies (Corellated): 6.20607e-08
-  Isolation: 5.49643e-09
-  Trigger: 2.97613e-08
-  Muon (TTVA): 1.60882e-08
-  Z-vertex reweighting: 1.36273e-07
-  Pile-Up: -1.44537e-06
-  Model: 5.20604e-06
-  Background: 5.65289e-06
-- Stat (Data): 1.35198e-05
-  Stat (MC): 8.93984e-06
-  Efficiencies (Uncorellated): 5.0556e-06
-  Scale: -3.3474e-06
-  Resolution: 1.48667e-06
-  Muon Saggita: -1.2971e-07
-  Efficiencies (Corellated): 6.06227e-08
-  Isolation: 2.20514e-08
-  Trigger: 1.31443e-08
-  Muon (TTVA): 1.0181e-08
-  Z-vertex reweighting: 1.56472e-07
-  Pile-Up: -3.4362e-07
-  Model: 5.02928e-06
-  Background: 4.50194e-06
-- Stat (Data): 1.20941e-05
-  Stat (MC): 7.9546e-06
-  Efficiencies (Uncorellated): 5.01282e-06
-  Scale: -2.65642e-06
-  Resolution: 3.6665e-07
-  Muon Saggita: 2.11125e-07
-  Efficiencies (Corellated): 5.81755e-08
-  Isolation: 3.55273e-08
-  Trigger: 5.87751e-09
-  Muon (TTVA): 7.66417e-09
-  Z-vertex reweighting: 1.86299e-07
-  Pile-Up: 1.57331e-07
-  Model: 3.53347e-06
-  Background: 3.39571e-06
-- Stat (Data): 1.02064e-05
-  Stat (MC): 6.66204e-06
-  Efficiencies (Uncorellated): 4.83028e-06
-  Scale: -1.86636e-06
-  Resolution: 1.29541e-07
-  Muon Saggita: -7.20025e-09
-  Efficiencies (Corellated): 5.07157e-08
-  Isolation: 5.03334e-08
-  Trigger: 4.42277e-09
-  Muon (TTVA): 5.04696e-09
-  Z-vertex reweighting: 1.21902e-07
-  Pile-Up: -1.60957e-06
-  Model: 2.413e-06
-  Background: 1.95583e-06
-- Stat (Data): 8.57885e-06
-  Stat (MC): 5.54456e-06
-  Efficiencies (Uncorellated): 4.5748e-06
-  Scale: -1.01055e-06
-  Resolution: 3.58043e-07
-  Muon Saggita: 5.50235e-07
-  Efficiencies (Corellated): 4.06072e-08
-  Isolation: 5.54564e-08
-  Trigger: 3.94941e-09
-  Muon (TTVA): 3.29871e-09
-  Z-vertex reweighting: 7.91474e-08
-  Pile-Up: -4.53731e-07
-  Model: 1.38539e-06
-  Background: 1.1472e-06
-- Stat (Data): 6.71408e-06
-  Stat (MC): 4.25548e-06
-  Efficiencies (Uncorellated): 3.9375e-06
-  Scale: -7.28519e-07
-  Resolution: 7.01139e-08
-  Muon Saggita: -7.57883e-08
-  Efficiencies (Corellated): 3.23173e-08
-  Isolation: 5.67922e-08
-  Trigger: 3.41196e-09
-  Muon (TTVA): 2.47786e-09
-  Z-vertex reweighting: 1.98127e-08
-  Pile-Up: -2.60461e-08
-  Model: 1.11055e-06
-  Background: 7.45763e-07
-- Stat (Data): 5.30023e-06
-  Stat (MC): 3.18385e-06
-  Efficiencies (Uncorellated): 3.44839e-06
-  Scale: -4.23367e-07
-  Resolution: 1.97343e-07
-  Muon Saggita: 2.2637e-08
-  Efficiencies (Corellated): 2.60259e-08
-  Isolation: 6.69081e-08
-  Trigger: 1.96811e-09
-  Muon (TTVA): 1.53263e-09
-  Z-vertex reweighting: 1.32503e-08
-  Pile-Up: 2.11241e-07
-  Model: 4.41613e-07
-  Background: 5.08448e-07
-- Stat (Data): 4.3265e-06
-  Stat (MC): 2.61206e-06
-  Efficiencies (Uncorellated): 3.04439e-06
-  Scale: -2.73916e-07
-  Resolution: 1.35954e-07
-  Muon Saggita: 4.65252e-08
-  Efficiencies (Corellated): 1.76095e-08
-  Isolation: 6.70416e-08
-  Trigger: 1.48804e-09
-  Muon (TTVA): 7.49586e-10
-  Z-vertex reweighting: 3.37543e-08
-  Pile-Up: -3.27592e-07
-  Model: 4.21401e-07
-  Background: 2.68876e-07
-- Stat (Data): 3.51926e-06
-  Stat (MC): 2.15748e-06
-  Efficiencies (Uncorellated): 2.66722e-06
-  Scale: -1.28097e-07
-  Resolution: -3.82766e-08
-  Muon Saggita: -6.08179e-08
-  Efficiencies (Corellated): 1.34607e-08
-  Isolation: 6.52608e-08
-  Trigger: 1.47186e-09
-  Muon (TTVA): 3.26564e-10
-  Z-vertex reweighting: 1.28093e-08
-  Pile-Up: -4.9854e-07
-  Model: -1.26955e-08
-  Background: 1.52496e-07
-- Stat (Data): 2.7789e-06
-  Stat (MC): 1.6112e-06
-  Efficiencies (Uncorellated): 1.80584e-06
-  Scale: -9.40508e-08
-  Resolution: 3.78e-08
-  Muon Saggita: -8.05586e-08
-  Efficiencies (Corellated): 1.04764e-08
-  Isolation: 6.94277e-08
-  Trigger: 1.43169e-09
-  Muon (TTVA): 3.50994e-10
-  Z-vertex reweighting: 5.65969e-09
-  Pile-Up: 2.46545e-07
-  Model: 1.62069e-07
-  Background: 1.01672e-07
+- correlated uncertainty: 2.1603653922e-05
+  uncorrelated uncertainty: 3.8007584704500004e-05
+- correlated uncertainty: 1.7372605932e-05
+  uncorrelated uncertainty: 3.6609857233199994e-05
+- correlated uncertainty: 2.0601670559499998e-05
+  uncorrelated uncertainty: 3.6921465515e-05
+- correlated uncertainty: 2.0620072338800002e-05
+  uncorrelated uncertainty: 3.6262646552e-05
+- correlated uncertainty: 1.5129091226100001e-05
+  uncorrelated uncertainty: 3.3877389534e-05
+- correlated uncertainty: 9.809163156e-06
+  uncorrelated uncertainty: 3.091792964e-05
+- correlated uncertainty: 6.34723025e-06
+  uncorrelated uncertainty: 2.86540695e-05
+- correlated uncertainty: 4.02096756e-06
+  uncorrelated uncertainty: 2.1331351499999998e-05
+- correlated uncertainty: 4.4792757200000005e-06
+  uncorrelated uncertainty: 2.0069054199999998e-05
+- correlated uncertainty: 4.6069287745e-06
+  uncorrelated uncertainty: 1.8890240369e-05
+- correlated uncertainty: 4.864113693959999e-06
+  uncorrelated uncertainty: 1.78113158824e-05
+- correlated uncertainty: 4.82010565968e-06
+  uncorrelated uncertainty: 1.3950468192899997e-05
+- correlated uncertainty: 5.29285026334e-06
+  uncorrelated uncertainty: 1.31870866812e-05
+- correlated uncertainty: 5.38821770052e-06
+  uncorrelated uncertainty: 1.2305142193199999e-05
+- correlated uncertainty: 5.6341875894e-06
+  uncorrelated uncertainty: 1.12859318748e-05
+- correlated uncertainty: 5.203129204e-06
+  uncorrelated uncertainty: 1.05976915408e-05
+- correlated uncertainty: 5.1048783201e-06
+  uncorrelated uncertainty: 9.9485106513e-06
+- correlated uncertainty: 4.978987899899999e-06
+  uncorrelated uncertainty: 9.355940634599999e-06
+- correlated uncertainty: 4.634405059399999e-06
+  uncorrelated uncertainty: 8.7977599695e-06
+- correlated uncertainty: 4.3590881454e-06
+  uncorrelated uncertainty: 8.2680680085e-06
+- correlated uncertainty: 2.8712621969999995e-06
+  uncorrelated uncertainty: 5.816234576699999e-06
+- correlated uncertainty: 2.644600476e-06
+  uncorrelated uncertainty: 5.5987437799999994e-06
+- correlated uncertainty: 2.1053065118e-06
+  uncorrelated uncertainty: 4.3334899413e-06
+- correlated uncertainty: 1.9652425259999997e-06
+  uncorrelated uncertainty: 4.232322262999999e-06
+- correlated uncertainty: 1.928359763e-06
+  uncorrelated uncertainty: 4.1147947825e-06
+- correlated uncertainty: 1.8108055460700002e-06
+  uncorrelated uncertainty: 3.98588136183e-06
+- correlated uncertainty: 9.158850667200001e-07
+  uncorrelated uncertainty: 1.8724771533e-06
+- correlated uncertainty: 8.5726465213e-07
+  uncorrelated uncertainty: 1.7732602749300002e-06
+- correlated uncertainty: 4.0479524969e-07
+  uncorrelated uncertainty: 8.149935168000001e-07
+- correlated uncertainty: 2.9294001792e-07
+  uncorrelated uncertainty: 5.9314334976e-07
+- correlated uncertainty: 2.490762556e-07
+  uncorrelated uncertainty: 5.3331214148e-07
+- correlated uncertainty: 1.8549090541799996e-07
+  uncorrelated uncertainty: 4.78661972516e-07
+- correlated uncertainty: 6.707285288e-08
+  uncorrelated uncertainty: 2.0152103439999997e-07
+- correlated uncertainty: 4.2076964861999995e-08
+  uncorrelated uncertainty: 1.6915459099e-07
+- correlated uncertainty: 3.31609163137e-08
+  uncorrelated uncertainty: 1.32835146572e-07
+- correlated uncertainty: 2.49122116053e-08
+  uncorrelated uncertainty: 1.04070881677e-07
+- correlated uncertainty: 1.0319312957399998e-08
+  uncorrelated uncertainty: 6.0984180034e-08
+- correlated uncertainty: 6.3786227849999995e-09
+  uncorrelated uncertainty: 4.3656196619000005e-08
+- correlated uncertainty: 3.1147652682e-09
+  uncorrelated uncertainty: 2.5936918396e-08
+- correlated uncertainty: 9.321435992799998e-10
+  uncorrelated uncertainty: 8.0466620482e-09
+- correlated uncertainty: 1.5879976934700002e-07
+  uncorrelated uncertainty: 1.51827082282e-06
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/data.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/data.yaml
new file mode 100644
index 0000000000..ee309de4ae
--- /dev/null
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/data.yaml
@@ -0,0 +1,84 @@
+data_central:
+- 1.8444
+- 1.7141
+- 1.5243
+- 1.329
+- 1.1897
+- 0.99489
+- 0.75792
+- 0.49533
+- 0.26635
+- 0.12569
+- 0.046018
+- 0.0091988
+- 0.0011748
+- 3.5385e-05
+- 37.237
+- 36.608
+- 34.621
+- 32.542
+- 30.324
+- 28.162
+- 25.957
+- 24.036
+- 22.098
+- 20.7
+- 18.4
+- 15.824
+- 13.912
+- 12.011
+- 10.329
+- 8.5419
+- 7.0432
+- 5.547
+- 4.2406
+- 3.0556
+- 1.9436
+- 1.0362
+- 0.40703
+- 0.14152
+- 0.059995
+- 0.032086
+- 0.018046
+- 0.0090947
+- 0.0040887
+- 0.0019895
+- 0.0010353
+- 0.0005749
+- 8.2356e-05
+- 0.81127
+- 0.75465
+- 0.67379
+- 0.59073
+- 0.52103
+- 0.42299
+- 0.32974
+- 0.24939
+- 0.17329
+- 0.10268
+- 0.046168
+- 0.011162
+- 0.0017995
+- 6.0169e-05
+- 0.090178
+- 0.087088
+- 0.082663
+- 0.07576
+- 0.065335
+- 0.054814
+- 0.046471
+- 0.035346
+- 0.020531
+- 0.0043687
+- 0.00010193
+- 0.0069927
+- 0.0068868
+- 0.0061386
+- 0.0060243
+- 0.0052844
+- 0.0051086
+- 0.0045253
+- 0.004045
+- 0.0021176
+- 0.00057801
+- 2.4683e-05
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/filter.py b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/filter.py
new file mode 100644
index 0000000000..c30978098e
--- /dev/null
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/filter.py
@@ -0,0 +1,130 @@
+"""
+This file contains the piece of code needed to implement the CMS ZpT measurement
+at 13 TeV. Systematic uncertainties are implemented starting from the breakdown
+available on HepData. The correlation treatment follows the approach mentioned
+in the paper (see the lines immediately before Sect. 6): "The systematic
+and statistical uncertainties are obtained using the linear combination method 
+described in Ref. [77], considering as fully correlated the uncertainties in 
+the jet energy scale and resolution, the pileup, the background subtraction, 
+b tagging, and the integrated luminosity. Other uncertainties are considered 
+as uncorrelated." Note that correlations are kept not only across different 
+pT(ll) bins, but also across different m(ll) bins. Covariance matrices, albeit 
+only for covariances across pT(ll) bins, are available on HepData. These are
+disregarded, because they do not include any correlations in m(ll). Their 
+inspection confirms that indeed the aforementioned uncertainties are fully
+correlated. The other uncertainties are weakly correlated or anti-correlated. 
+"""
+
+import yaml, re
+
+def get_tables():
+    """
+    Get the Hepdata tables, given the tables and version specified in metadata 
+    """
+    prefix = "rawdata/HEPData-ins2079374"
+    with open("metadata.yaml", "r") as file:
+        metadata = yaml.safe_load(file)
+        
+    version = metadata["hepdata"]["version"]
+    tables = metadata["implemented_observables"][0]["tables"]
+    hepdata_tables = []
+    
+    for table in tables:
+        hepdata_tables.append(f"{prefix}-v{version}-pT_ll_mass_{table}.yaml")
+
+    return hepdata_tables
+
+def get_all():
+    """
+    Returns data, kinematics and uncertainties for dumping in the .yaml files
+    """
+    data_central = []
+    kinematics = []
+    uncertainties = []
+
+    hepdata_tables = get_tables()
+    for table in hepdata_tables:
+        if (table=="rawdata/HEPData-ins2079374-v1-pT_ll_mass_76-106.yaml"):
+            n = 4
+        else:
+            n=2
+        with open(table, 'r') as f:
+            input = yaml.safe_load(f)
+        ranges = list(map(int, re.search(r"mass_(\d+)-(\d+)", table).groups()))
+        
+        min_mll = ranges[0]
+        mid_mll = 0.5 * (ranges[0] + ranges[1])
+        max_mll = ranges[1]
+            
+        # Central values
+        data_values = input["dependent_variables"][0]["values"]
+        for data_value in data_values[n:]:
+            data_central.append(data_value["value"])
+            
+        # Kinematic bins
+        kin_values = input["independent_variables"][0]["values"]
+        for kin_value in kin_values[n:]:
+            kin = {
+                'pT': {'min': kin_value['low'],
+                       'mid': 0.5 * (kin_value['low'] + kin_value['high']),
+                       'max': kin_value['high']},
+                'm_ll': {'min': min_mll, 'mid': mid_mll, 'max': max_mll},}
+            kinematics.append(kin)
+        # Uncertainties
+        for data_value in data_values[n:]:
+            errors = data_value["errors"]
+            uncertainty = {}
+            for error in errors:
+                uncertainty[error["label"]] = error["symerror"]
+                uncertainty.update(uncertainty)
+
+            uncertainties.append(uncertainty)
+        
+    return (data_central, kinematics, uncertainties)
+
+def filter_CMS_Z0J_13TEV_PT():
+    """
+    Dumps data, kinematics, and uncertainties on .yaml files
+    """
+    central_values, kinematics, uncertainties = get_all()
+    # Central values
+    data_central_yaml = {"data_central": central_values}
+    # Kinematics
+    kinematics_yaml = {"bins": kinematics}
+    # Uncertainties
+    treatment = {"Data stat.": "ADD",
+                 "Unfolding stat.": "ADD",
+                 "Unfolding model": "ADD",
+                 "Int. luminosity": "MULT",
+                 "Lepton energy": "ADD",
+                 "Efficiency": "ADD",
+                 "Backgrounds": "MULT",
+                 "Jet energy": "MULT",
+                 "Others": "MULT"}
+    correlation = {"Data stat.": "UNCORR",
+                   "Unfolding stat.": "UNCORR",
+                   "Unfolding model": "UNCORR",
+                   "Int. luminosity": "CMSLUMI16",
+                   "Lepton energy": "UNCORR",
+                   "Efficiency": "UNCORR",
+                   "Backgrounds": "CORR",
+                   "Jet energy": "CORR",
+                   "Others": "CORR"}
+    definitions = {}
+    for key,value in uncertainties[0].items():
+        definition = {key :
+                      {"description": key + " unc. from HepData",
+                       "treatment": treatment[key],
+                       "type": correlation[key]}}
+        definitions.update(definition)
+    uncertainties_yaml = {"definitions": definitions,"bins": uncertainties}
+
+    with open("data.yaml", "w") as file:
+        yaml.dump(data_central_yaml, file, sort_keys=False)
+    with open("kinematics.yaml", "w") as file:
+        yaml.dump(kinematics_yaml, file, sort_keys=False)
+    with open("uncertainties.yaml", "w") as file:
+        yaml.dump(uncertainties_yaml, file, sort_keys=False)
+        
+if __name__ == "__main__":
+    filter_CMS_Z0J_13TEV_PT()
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/kinematics.yaml
new file mode 100644
index 0000000000..32ffc770f0
--- /dev/null
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/kinematics.yaml
@@ -0,0 +1,665 @@
+bins:
+- pT:
+    min: 4.0
+    mid: 5.0
+    max: 6.0
+  m_ll:
+    min: 50
+    mid: 63.0
+    max: 76
+- pT:
+    min: 6.0
+    mid: 7.0
+    max: 8.0
+  m_ll:
+    min: 50
+    mid: 63.0
+    max: 76
+- pT:
+    min: 8.0
+    mid: 9.0
+    max: 10.0
+  m_ll:
+    min: 50
+    mid: 63.0
+    max: 76
+- pT:
+    min: 10.0
+    mid: 11.0
+    max: 12.0
+  m_ll:
+    min: 50
+    mid: 63.0
+    max: 76
+- pT:
+    min: 12.0
+    mid: 13.0
+    max: 14.0
+  m_ll:
+    min: 50
+    mid: 63.0
+    max: 76
+- pT:
+    min: 14.0
+    mid: 16.0
+    max: 18.0
+  m_ll:
+    min: 50
+    mid: 63.0
+    max: 76
+- pT:
+    min: 18.0
+    mid: 20.0
+    max: 22.0
+  m_ll:
+    min: 50
+    mid: 63.0
+    max: 76
+- pT:
+    min: 22.0
+    mid: 25.0
+    max: 28.0
+  m_ll:
+    min: 50
+    mid: 63.0
+    max: 76
+- pT:
+    min: 28.0
+    mid: 32.5
+    max: 37.0
+  m_ll:
+    min: 50
+    mid: 63.0
+    max: 76
+- pT:
+    min: 37.0
+    mid: 44.5
+    max: 52.0
+  m_ll:
+    min: 50
+    mid: 63.0
+    max: 76
+- pT:
+    min: 52.0
+    mid: 68.5
+    max: 85.0
+  m_ll:
+    min: 50
+    mid: 63.0
+    max: 76
+- pT:
+    min: 85.0
+    mid: 122.5
+    max: 160.0
+  m_ll:
+    min: 50
+    mid: 63.0
+    max: 76
+- pT:
+    min: 160.0
+    mid: 205.0
+    max: 250.0
+  m_ll:
+    min: 50
+    mid: 63.0
+    max: 76
+- pT:
+    min: 250.0
+    mid: 625.0
+    max: 1000.0
+  m_ll:
+    min: 50
+    mid: 63.0
+    max: 76
+- pT:
+    min: 4.0
+    mid: 4.5
+    max: 5.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 5.0
+    mid: 5.5
+    max: 6.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 6.0
+    mid: 6.5
+    max: 7.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 7.0
+    mid: 7.5
+    max: 8.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 8.0
+    mid: 8.5
+    max: 9.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 9.0
+    mid: 9.5
+    max: 10.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 10.0
+    mid: 10.5
+    max: 11.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 11.0
+    mid: 11.5
+    max: 12.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 12.0
+    mid: 12.5
+    max: 13.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 13.0
+    mid: 13.5
+    max: 14.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 14.0
+    mid: 15.0
+    max: 16.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 16.0
+    mid: 17.0
+    max: 18.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 18.0
+    mid: 19.0
+    max: 20.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 20.0
+    mid: 21.0
+    max: 22.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 22.0
+    mid: 23.5
+    max: 25.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 25.0
+    mid: 26.5
+    max: 28.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 28.0
+    mid: 30.0
+    max: 32.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 32.0
+    mid: 34.5
+    max: 37.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 37.0
+    mid: 40.0
+    max: 43.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 43.0
+    mid: 47.5
+    max: 52.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 52.0
+    mid: 58.5
+    max: 65.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 65.0
+    mid: 75.0
+    max: 85.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 85.0
+    mid: 102.5
+    max: 120.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 120.0
+    mid: 140.0
+    max: 160.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 160.0
+    mid: 175.0
+    max: 190.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 190.0
+    mid: 205.0
+    max: 220.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 220.0
+    mid: 235.0
+    max: 250.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 250.0
+    mid: 275.0
+    max: 300.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 300.0
+    mid: 325.0
+    max: 350.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 350.0
+    mid: 375.0
+    max: 400.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 400.0
+    mid: 425.0
+    max: 450.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 450.0
+    mid: 475.0
+    max: 500.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 500.0
+    mid: 750.0
+    max: 1000.0
+  m_ll:
+    min: 76
+    mid: 91.0
+    max: 106
+- pT:
+    min: 4.0
+    mid: 5.0
+    max: 6.0
+  m_ll:
+    min: 106
+    mid: 138.0
+    max: 170
+- pT:
+    min: 6.0
+    mid: 7.0
+    max: 8.0
+  m_ll:
+    min: 106
+    mid: 138.0
+    max: 170
+- pT:
+    min: 8.0
+    mid: 9.0
+    max: 10.0
+  m_ll:
+    min: 106
+    mid: 138.0
+    max: 170
+- pT:
+    min: 10.0
+    mid: 11.0
+    max: 12.0
+  m_ll:
+    min: 106
+    mid: 138.0
+    max: 170
+- pT:
+    min: 12.0
+    mid: 13.0
+    max: 14.0
+  m_ll:
+    min: 106
+    mid: 138.0
+    max: 170
+- pT:
+    min: 14.0
+    mid: 16.0
+    max: 18.0
+  m_ll:
+    min: 106
+    mid: 138.0
+    max: 170
+- pT:
+    min: 18.0
+    mid: 20.0
+    max: 22.0
+  m_ll:
+    min: 106
+    mid: 138.0
+    max: 170
+- pT:
+    min: 22.0
+    mid: 25.0
+    max: 28.0
+  m_ll:
+    min: 106
+    mid: 138.0
+    max: 170
+- pT:
+    min: 28.0
+    mid: 32.5
+    max: 37.0
+  m_ll:
+    min: 106
+    mid: 138.0
+    max: 170
+- pT:
+    min: 37.0
+    mid: 44.5
+    max: 52.0
+  m_ll:
+    min: 106
+    mid: 138.0
+    max: 170
+- pT:
+    min: 52.0
+    mid: 68.5
+    max: 85.0
+  m_ll:
+    min: 106
+    mid: 138.0
+    max: 170
+- pT:
+    min: 85.0
+    mid: 122.5
+    max: 160.0
+  m_ll:
+    min: 106
+    mid: 138.0
+    max: 170
+- pT:
+    min: 160.0
+    mid: 205.0
+    max: 250.0
+  m_ll:
+    min: 106
+    mid: 138.0
+    max: 170
+- pT:
+    min: 250.0
+    mid: 625.0
+    max: 1000.0
+  m_ll:
+    min: 106
+    mid: 138.0
+    max: 170
+- pT:
+    min: 4.0
+    mid: 5.0
+    max: 6.0
+  m_ll:
+    min: 170
+    mid: 260.0
+    max: 350
+- pT:
+    min: 6.0
+    mid: 7.0
+    max: 8.0
+  m_ll:
+    min: 170
+    mid: 260.0
+    max: 350
+- pT:
+    min: 8.0
+    mid: 9.0
+    max: 10.0
+  m_ll:
+    min: 170
+    mid: 260.0
+    max: 350
+- pT:
+    min: 10.0
+    mid: 11.0
+    max: 12.0
+  m_ll:
+    min: 170
+    mid: 260.0
+    max: 350
+- pT:
+    min: 12.0
+    mid: 13.0
+    max: 14.0
+  m_ll:
+    min: 170
+    mid: 260.0
+    max: 350
+- pT:
+    min: 14.0
+    mid: 16.0
+    max: 18.0
+  m_ll:
+    min: 170
+    mid: 260.0
+    max: 350
+- pT:
+    min: 18.0
+    mid: 20.0
+    max: 22.0
+  m_ll:
+    min: 170
+    mid: 260.0
+    max: 350
+- pT:
+    min: 22.0
+    mid: 25.0
+    max: 28.0
+  m_ll:
+    min: 170
+    mid: 260.0
+    max: 350
+- pT:
+    min: 28.0
+    mid: 40.0
+    max: 52.0
+  m_ll:
+    min: 170
+    mid: 260.0
+    max: 350
+- pT:
+    min: 52.0
+    mid: 106.0
+    max: 160.0
+  m_ll:
+    min: 170
+    mid: 260.0
+    max: 350
+- pT:
+    min: 160.0
+    mid: 580.0
+    max: 1000.0
+  m_ll:
+    min: 170
+    mid: 260.0
+    max: 350
+- pT:
+    min: 4.0
+    mid: 5.0
+    max: 6.0
+  m_ll:
+    min: 350
+    mid: 675.0
+    max: 1000
+- pT:
+    min: 6.0
+    mid: 7.0
+    max: 8.0
+  m_ll:
+    min: 350
+    mid: 675.0
+    max: 1000
+- pT:
+    min: 8.0
+    mid: 9.0
+    max: 10.0
+  m_ll:
+    min: 350
+    mid: 675.0
+    max: 1000
+- pT:
+    min: 10.0
+    mid: 11.0
+    max: 12.0
+  m_ll:
+    min: 350
+    mid: 675.0
+    max: 1000
+- pT:
+    min: 12.0
+    mid: 13.0
+    max: 14.0
+  m_ll:
+    min: 350
+    mid: 675.0
+    max: 1000
+- pT:
+    min: 14.0
+    mid: 16.0
+    max: 18.0
+  m_ll:
+    min: 350
+    mid: 675.0
+    max: 1000
+- pT:
+    min: 18.0
+    mid: 20.0
+    max: 22.0
+  m_ll:
+    min: 350
+    mid: 675.0
+    max: 1000
+- pT:
+    min: 22.0
+    mid: 25.0
+    max: 28.0
+  m_ll:
+    min: 350
+    mid: 675.0
+    max: 1000
+- pT:
+    min: 28.0
+    mid: 40.0
+    max: 52.0
+  m_ll:
+    min: 350
+    mid: 675.0
+    max: 1000
+- pT:
+    min: 52.0
+    mid: 106.0
+    max: 160.0
+  m_ll:
+    min: 350
+    mid: 675.0
+    max: 1000
+- pT:
+    min: 160.0
+    mid: 580.0
+    max: 1000.0
+  m_ll:
+    min: 350
+    mid: 675.0
+    max: 1000
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/metadata.yaml
new file mode 100644
index 0000000000..ad22992cc0
--- /dev/null
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/metadata.yaml
@@ -0,0 +1,63 @@
+setname: "CMS_Z0J_13TEV"
+
+version: 1
+version_comment: "Initial implementation"
+
+# References
+arXiv:
+  url: "https://arxiv.org/pdf/2205.04897.pdf"
+  journal: Eur.Phys.J.C 83 (2023) 628
+iNSPIRE:
+  url: "https://inspirehep.net/literature/2079374"
+hepdata:
+  url: "https://www.hepdata.net/record/ins2079374"
+  version: 1
+
+nnpdf_metadata:
+  nnpdf31_process: "DY NC"
+  experiment: "CMS"
+
+implemented_observables:
+- observable_name: "PT-M"
+  observable:
+    description: "CMS 13 TeV, Drell-Yan Transverse Momentum Distribution"
+    label: CMS $Z$ $p_T$ 13 TeV $(p_T^{ll},m_{ll})$
+    units: "[pb/GeV]"
+
+  ndata: 83
+  tables: ["50-76","76-106","106-170","170-350","350-1000"]
+  process_type: DY_NC_PT
+
+  plotting:
+    dataset_label: CMS $Z$ $p_T$ 13 TeV $(p_T^{ll},M_{ll})$
+    y_label: $d\sigma/dp_T(\ell\ell)$ (pb/GeV)
+    figure_by:
+    - m_ll
+    x_scale: log
+    plot_x: pT
+  kinematic_coverage: [pT, m_ll]
+  kinematics:
+    variables:
+      pT:
+         description: "lepton pair transverse momentum"
+         label: '$p_T$'
+         units: "GeV"
+      m_ll:
+         description: "Z boson mass squared"
+         label: '$m^2_{\ell \ell}$'
+         units: "GeV^2"
+    file: kinematics.yaml
+
+  data_central: data.yaml
+  data_uncertainties:
+  - uncertainties.yaml
+
+  theory:
+    conversion_factor: 1e-3
+    operation: 'null'
+    FK_tables:
+      - - CMS_Z0J_13TEV_PT-MLLBIN1
+        - CMS_Z0J_13TEV_PT-MLLBIN2
+        - CMS_Z0J_13TEV_PT-MLLBIN3
+        - CMS_Z0J_13TEV_PT-MLLBIN4
+        - CMS_Z0J_13TEV_PT-MLLBIN5
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/rawdata/HEPData-ins2079374-v1-pT_ll_mass_106-170.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/rawdata/HEPData-ins2079374-v1-pT_ll_mass_106-170.yaml
new file mode 100644
index 0000000000..af92077806
--- /dev/null
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/rawdata/HEPData-ins2079374-v1-pT_ll_mass_106-170.yaml
@@ -0,0 +1,362 @@
+dependent_variables:
+- header:
+    name: $\mathrm{d}\sigma/\mathrm{d}p_T(ll)$
+    units: pb/GeV
+  values:
+  - errors:
+    - label: Data stat.
+      symerror: 0.0024144
+    - label: Unfolding stat.
+      symerror: 0.0016044
+    - label: Unfolding model
+      symerror: 0.0009968
+    - label: Int. luminosity
+      symerror: 0.0042776
+    - label: Lepton energy
+      symerror: 0.0025046
+    - label: Efficiency
+      symerror: 0.0033588
+    - label: Backgrounds
+      symerror: 0.0022937
+    - label: Jet energy
+      symerror: 6.8547e-05
+    - label: Others
+      symerror: 0.0010266
+    value: 0.33161
+  - errors:
+    - label: Data stat.
+      symerror: 0.0032749
+    - label: Unfolding stat.
+      symerror: 0.0022634
+    - label: Unfolding model
+      symerror: 0.00067199
+    - label: Int. luminosity
+      symerror: 0.0090521
+    - label: Lepton energy
+      symerror: 0.005342
+    - label: Efficiency
+      symerror: 0.007863
+    - label: Backgrounds
+      symerror: 0.0014098
+    - label: Jet energy
+      symerror: 0.00014384
+    - label: Others
+      symerror: 0.0028117
+    value: 0.74306
+  - errors:
+    - label: Data stat.
+      symerror: 0.0035125
+    - label: Unfolding stat.
+      symerror: 0.002462
+    - label: Unfolding model
+      symerror: 0.0018979
+    - label: Int. luminosity
+      symerror: 0.0097947
+    - label: Lepton energy
+      symerror: 0.0051728
+    - label: Efficiency
+      symerror: 0.008657
+    - label: Backgrounds
+      symerror: 0.0010456
+    - label: Jet energy
+      symerror: 8.9214e-05
+    - label: Others
+      symerror: 0.0031866
+    value: 0.81127
+  - errors:
+    - label: Data stat.
+      symerror: 0.003395
+    - label: Unfolding stat.
+      symerror: 0.0024032
+    - label: Unfolding model
+      symerror: 0.0021942
+    - label: Int. luminosity
+      symerror: 0.0091268
+    - label: Lepton energy
+      symerror: 0.0052122
+    - label: Efficiency
+      symerror: 0.0081917
+    - label: Backgrounds
+      symerror: 0.0012183
+    - label: Jet energy
+      symerror: 0.00013846
+    - label: Others
+      symerror: 0.0026279
+    value: 0.75465
+  - errors:
+    - label: Data stat.
+      symerror: 0.0032096
+    - label: Unfolding stat.
+      symerror: 0.0022813
+    - label: Unfolding model
+      symerror: 0.001903
+    - label: Int. luminosity
+      symerror: 0.0081601
+    - label: Lepton energy
+      symerror: 0.0047889
+    - label: Efficiency
+      symerror: 0.0073849
+    - label: Backgrounds
+      symerror: 0.0010033
+    - label: Jet energy
+      symerror: 6.9431e-05
+    - label: Others
+      symerror: 0.0021957
+    value: 0.67379
+  - errors:
+    - label: Data stat.
+      symerror: 0.0030141
+    - label: Unfolding stat.
+      symerror: 0.0021434
+    - label: Unfolding model
+      symerror: 0.0014933
+    - label: Int. luminosity
+      symerror: 0.007173
+    - label: Lepton energy
+      symerror: 0.0050791
+    - label: Efficiency
+      symerror: 0.0064786
+    - label: Backgrounds
+      symerror: 0.0012061
+    - label: Jet energy
+      symerror: 0.0002903
+    - label: Others
+      symerror: 0.0020411
+    value: 0.59073
+  - errors:
+    - label: Data stat.
+      symerror: 0.002918
+    - label: Unfolding stat.
+      symerror: 0.0020711
+    - label: Unfolding model
+      symerror: 0.0010854
+    - label: Int. luminosity
+      symerror: 0.0063346
+    - label: Lepton energy
+      symerror: 0.0040648
+    - label: Efficiency
+      symerror: 0.0058424
+    - label: Backgrounds
+      symerror: 0.0011499
+    - label: Jet energy
+      symerror: 8.0622e-05
+    - label: Others
+      symerror: 0.0010741
+    value: 0.52103
+  - errors:
+    - label: Data stat.
+      symerror: 0.0018603
+    - label: Unfolding stat.
+      symerror: 0.0013177
+    - label: Unfolding model
+      symerror: 0.0014108
+    - label: Int. luminosity
+      symerror: 0.0051661
+    - label: Lepton energy
+      symerror: 0.0031033
+    - label: Efficiency
+      symerror: 0.0048475
+    - label: Backgrounds
+      symerror: 0.0011655
+    - label: Jet energy
+      symerror: 7.955e-05
+    - label: Others
+      symerror: 0.0015099
+    value: 0.42299
+  - errors:
+    - label: Data stat.
+      symerror: 0.0016925
+    - label: Unfolding stat.
+      symerror: 0.0012155
+    - label: Unfolding model
+      symerror: 0.00054787
+    - label: Int. luminosity
+      symerror: 0.0040487
+    - label: Lepton energy
+      symerror: 0.0026776
+    - label: Efficiency
+      symerror: 0.0039587
+    - label: Backgrounds
+      symerror: 0.00098403
+    - label: Jet energy
+      symerror: 0.00015217
+    - label: Others
+      symerror: 0.0013108
+    value: 0.32974
+  - errors:
+    - label: Data stat.
+      symerror: 0.0011715
+    - label: Unfolding stat.
+      symerror: 0.00085867
+    - label: Unfolding model
+      symerror: 0.0012856
+    - label: Int. luminosity
+      symerror: 0.00309
+    - label: Lepton energy
+      symerror: 0.0021439
+    - label: Efficiency
+      symerror: 0.003014
+    - label: Backgrounds
+      symerror: 0.00096891
+    - label: Jet energy
+      symerror: 0.00012765
+    - label: Others
+      symerror: 0.00078747
+    value: 0.24939
+  - errors:
+    - label: Data stat.
+      symerror: 0.00077314
+    - label: Unfolding stat.
+      symerror: 0.00061538
+    - label: Unfolding model
+      symerror: 0.00010483
+    - label: Int. luminosity
+      symerror: 0.0021829
+    - label: Lepton energy
+      symerror: 0.0015795
+    - label: Efficiency
+      symerror: 0.0022071
+    - label: Backgrounds
+      symerror: 0.00085223
+    - label: Jet energy
+      symerror: 0.00017585
+    - label: Others
+      symerror: 0.00060373
+    value: 0.17329
+  - errors:
+    - label: Data stat.
+      symerror: 0.00045268
+    - label: Unfolding stat.
+      symerror: 0.00038664
+    - label: Unfolding model
+      symerror: 6.5023e-05
+    - label: Int. luminosity
+      symerror: 0.0013372
+    - label: Lepton energy
+      symerror: 0.00083764
+    - label: Efficiency
+      symerror: 0.00137
+    - label: Backgrounds
+      symerror: 0.00075773
+    - label: Jet energy
+      symerror: 0.00016154
+    - label: Others
+      symerror: 0.00046909
+    value: 0.10268
+  - errors:
+    - label: Data stat.
+      symerror: 0.00020336
+    - label: Unfolding stat.
+      symerror: 0.00018013
+    - label: Unfolding model
+      symerror: 1.3056e-05
+    - label: Int. luminosity
+      symerror: 0.00064033
+    - label: Lepton energy
+      symerror: 0.00039516
+    - label: Efficiency
+      symerror: 0.00064869
+    - label: Backgrounds
+      symerror: 0.00055543
+    - label: Jet energy
+      symerror: 9.1407e-05
+    - label: Others
+      symerror: 0.00022932
+    value: 0.046168
+  - errors:
+    - label: Data stat.
+      symerror: 6.3898e-05
+    - label: Unfolding stat.
+      symerror: 5.9021e-05
+    - label: Unfolding model
+      symerror: 1.635e-05
+    - label: Int. luminosity
+      symerror: 0.00015966
+    - label: Lepton energy
+      symerror: 0.00011835
+    - label: Efficiency
+      symerror: 0.00017497
+    - label: Backgrounds
+      symerror: 0.00016467
+    - label: Jet energy
+      symerror: 2.9876e-05
+    - label: Others
+      symerror: 6.5856e-05
+    value: 0.011162
+  - errors:
+    - label: Data stat.
+      symerror: 2.1684e-05
+    - label: Unfolding stat.
+      symerror: 2.2155e-05
+    - label: Unfolding model
+      symerror: 1.4152e-06
+    - label: Int. luminosity
+      symerror: 2.3677e-05
+    - label: Lepton energy
+      symerror: 1.5605e-05
+    - label: Efficiency
+      symerror: 3.2013e-05
+    - label: Backgrounds
+      symerror: 1.4748e-05
+    - label: Jet energy
+      symerror: 2.305e-06
+    - label: Others
+      symerror: 6.4909e-06
+    value: 0.0017995
+  - errors:
+    - label: Data stat.
+      symerror: 1.3557e-06
+    - label: Unfolding stat.
+      symerror: 1.3899e-06
+    - label: Unfolding model
+      symerror: 2.5271e-07
+    - label: Int. luminosity
+      symerror: 7.6493e-07
+    - label: Lepton energy
+      symerror: 4.9106e-07
+    - label: Efficiency
+      symerror: 1.1311e-06
+    - label: Backgrounds
+      symerror: 4.7202e-07
+    - label: Jet energy
+      symerror: 7.0224e-08
+    - label: Others
+      symerror: 2.7446e-07
+    value: 6.0169e-05
+independent_variables:
+- header:
+    name: $p_T(ll)$
+    units: GeV
+  values:
+  - high: 2.0
+    low: 0.0
+  - high: 4.0
+    low: 2.0
+  - high: 6.0
+    low: 4.0
+  - high: 8.0
+    low: 6.0
+  - high: 10.0
+    low: 8.0
+  - high: 12.0
+    low: 10.0
+  - high: 14.0
+    low: 12.0
+  - high: 18.0
+    low: 14.0
+  - high: 22.0
+    low: 18.0
+  - high: 28.0
+    low: 22.0
+  - high: 37.0
+    low: 28.0
+  - high: 52.0
+    low: 37.0
+  - high: 85.0
+    low: 52.0
+  - high: 160.0
+    low: 85.0
+  - high: 250.0
+    low: 160.0
+  - high: 1000.0
+    low: 250.0
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/rawdata/HEPData-ins2079374-v1-pT_ll_mass_170-350.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/rawdata/HEPData-ins2079374-v1-pT_ll_mass_170-350.yaml
new file mode 100644
index 0000000000..048686c3ad
--- /dev/null
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/rawdata/HEPData-ins2079374-v1-pT_ll_mass_170-350.yaml
@@ -0,0 +1,296 @@
+dependent_variables:
+- header:
+    name: $\mathrm{d}\sigma/\mathrm{d}p_T(ll)$
+    units: pb/GeV
+  values:
+  - errors:
+    - label: Data stat.
+      symerror: 0.00092483
+    - label: Unfolding stat.
+      symerror: 0.0004549
+    - label: Unfolding model
+      symerror: 0.00051431
+    - label: Int. luminosity
+      symerror: 0.00050336
+    - label: Lepton energy
+      symerror: 0.00044193
+    - label: Efficiency
+      symerror: 0.00058632
+    - label: Backgrounds
+      symerror: 0.00065072
+    - label: Jet energy
+      symerror: 2.9174e-05
+    - label: Others
+      symerror: 0.00025561
+    value: 0.034442
+  - errors:
+    - label: Data stat.
+      symerror: 0.0011511
+    - label: Unfolding stat.
+      symerror: 0.00058874
+    - label: Unfolding model
+      symerror: 0.00062821
+    - label: Int. luminosity
+      symerror: 0.001006
+    - label: Lepton energy
+      symerror: 0.00070283
+    - label: Efficiency
+      symerror: 0.0013597
+    - label: Backgrounds
+      symerror: 0.00062716
+    - label: Jet energy
+      symerror: 2.4119e-05
+    - label: Others
+      symerror: 0.00039271
+    value: 0.078093
+  - errors:
+    - label: Data stat.
+      symerror: 0.0012611
+    - label: Unfolding stat.
+      symerror: 0.0006568
+    - label: Unfolding model
+      symerror: 0.00047534
+    - label: Int. luminosity
+      symerror: 0.0011088
+    - label: Lepton energy
+      symerror: 0.0006086
+    - label: Efficiency
+      symerror: 0.0016157
+    - label: Backgrounds
+      symerror: 0.0004039
+    - label: Jet energy
+      symerror: 6.8974e-06
+    - label: Others
+      symerror: 0.00035657
+    value: 0.090178
+  - errors:
+    - label: Data stat.
+      symerror: 0.0012514
+    - label: Unfolding stat.
+      symerror: 0.00065743
+    - label: Unfolding model
+      symerror: 0.0007246
+    - label: Int. luminosity
+      symerror: 0.0010703
+    - label: Lepton energy
+      symerror: 0.0003358
+    - label: Efficiency
+      symerror: 0.0015886
+    - label: Backgrounds
+      symerror: 0.00039192
+    - label: Jet energy
+      symerror: 6.88e-05
+    - label: Others
+      symerror: 0.00024013
+    value: 0.087088
+  - errors:
+    - label: Data stat.
+      symerror: 0.001224
+    - label: Unfolding stat.
+      symerror: 0.00064179
+    - label: Unfolding model
+      symerror: 0.00080475
+    - label: Int. luminosity
+      symerror: 0.0010225
+    - label: Lepton energy
+      symerror: 0.00040152
+    - label: Efficiency
+      symerror: 0.0015112
+    - label: Backgrounds
+      symerror: 0.00042687
+    - label: Jet energy
+      symerror: 6.3008e-05
+    - label: Others
+      symerror: 0.00039858
+    value: 0.082663
+  - errors:
+    - label: Data stat.
+      symerror: 0.0011651
+    - label: Unfolding stat.
+      symerror: 0.00060914
+    - label: Unfolding model
+      symerror: 0.00074283
+    - label: Int. luminosity
+      symerror: 0.00094498
+    - label: Lepton energy
+      symerror: 0.0003748
+    - label: Efficiency
+      symerror: 0.0013599
+    - label: Backgrounds
+      symerror: 0.00043673
+    - label: Jet energy
+      symerror: 6.7589e-05
+    - label: Others
+      symerror: 0.00034801
+    value: 0.07576
+  - errors:
+    - label: Data stat.
+      symerror: 0.0011197
+    - label: Unfolding stat.
+      symerror: 0.00057219
+    - label: Unfolding model
+      symerror: 0.00060529
+    - label: Int. luminosity
+      symerror: 0.0008226
+    - label: Lepton energy
+      symerror: 0.00040727
+    - label: Efficiency
+      symerror: 0.001158
+    - label: Backgrounds
+      symerror: 0.00042671
+    - label: Jet energy
+      symerror: 3.4674e-05
+    - label: Others
+      symerror: 0.00034298
+    value: 0.065335
+  - errors:
+    - label: Data stat.
+      symerror: 0.00077699
+    - label: Unfolding stat.
+      symerror: 0.00039603
+    - label: Unfolding model
+      symerror: 0.00066502
+    - label: Int. luminosity
+      symerror: 0.00070013
+    - label: Lepton energy
+      symerror: 0.00031098
+    - label: Efficiency
+      symerror: 0.0010348
+    - label: Backgrounds
+      symerror: 0.00036453
+    - label: Jet energy
+      symerror: 4.7007e-05
+    - label: Others
+      symerror: 6.4583e-05
+    value: 0.054814
+  - errors:
+    - label: Data stat.
+      symerror: 0.00077003
+    - label: Unfolding stat.
+      symerror: 0.00038884
+    - label: Unfolding model
+      symerror: 0.00037507
+    - label: Int. luminosity
+      symerror: 0.0006001
+    - label: Lepton energy
+      symerror: 0.00018669
+    - label: Efficiency
+      symerror: 0.00083552
+    - label: Backgrounds
+      symerror: 0.00038119
+    - label: Jet energy
+      symerror: 2.7276e-05
+    - label: Others
+      symerror: 0.00014025
+    value: 0.046471
+  - errors:
+    - label: Data stat.
+      symerror: 0.00056202
+    - label: Unfolding stat.
+      symerror: 0.00028358
+    - label: Unfolding model
+      symerror: 0.0003867
+    - label: Int. luminosity
+      symerror: 0.0004745
+    - label: Lepton energy
+      symerror: 0.00021588
+    - label: Efficiency
+      symerror: 0.00063479
+    - label: Backgrounds
+      symerror: 0.0003707
+    - label: Jet energy
+      symerror: 4.1372e-05
+    - label: Others
+      symerror: 0.00015137
+    value: 0.035346
+  - errors:
+    - label: Data stat.
+      symerror: 0.0001809
+    - label: Unfolding stat.
+      symerror: 9.9836e-05
+    - label: Unfolding model
+      symerror: 1.8559e-05
+    - label: Int. luminosity
+      symerror: 0.00030247
+    - label: Lepton energy
+      symerror: 0.00010341
+    - label: Efficiency
+      symerror: 0.00038343
+    - label: Backgrounds
+      symerror: 0.00037165
+    - label: Jet energy
+      symerror: 5.2634e-05
+    - label: Others
+      symerror: 0.00010144
+    value: 0.020531
+  - errors:
+    - label: Data stat.
+      symerror: 4.2161e-05
+    - label: Unfolding stat.
+      symerror: 2.1622e-05
+    - label: Unfolding model
+      symerror: 1.5143e-05
+    - label: Int. luminosity
+      symerror: 8.246e-05
+    - label: Lepton energy
+      symerror: 4.4444e-05
+    - label: Efficiency
+      symerror: 8.1294e-05
+    - label: Backgrounds
+      symerror: 0.00017629
+    - label: Jet energy
+      symerror: 2.9165e-05
+    - label: Others
+      symerror: 1.6188e-05
+    value: 0.0043687
+  - errors:
+    - label: Data stat.
+      symerror: 2.0181e-06
+    - label: Unfolding stat.
+      symerror: 1.1279e-06
+    - label: Unfolding model
+      symerror: 6.2356e-08
+    - label: Int. luminosity
+      symerror: 1.6154e-06
+    - label: Lepton energy
+      symerror: 3.4583e-06
+    - label: Efficiency
+      symerror: 2.3021e-06
+    - label: Backgrounds
+      symerror: 2.395e-06
+    - label: Jet energy
+      symerror: 3.8535e-07
+    - label: Others
+      symerror: 1.5562e-07
+    value: 0.00010193
+independent_variables:
+- header:
+    name: $p_T(ll)$
+    units: GeV
+  values:
+  - high: 2.0
+    low: 0.0
+  - high: 4.0
+    low: 2.0
+  - high: 6.0
+    low: 4.0
+  - high: 8.0
+    low: 6.0
+  - high: 10.0
+    low: 8.0
+  - high: 12.0
+    low: 10.0
+  - high: 14.0
+    low: 12.0
+  - high: 18.0
+    low: 14.0
+  - high: 22.0
+    low: 18.0
+  - high: 28.0
+    low: 22.0
+  - high: 52.0
+    low: 28.0
+  - high: 160.0
+    low: 52.0
+  - high: 1000.0
+    low: 160.0
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/rawdata/HEPData-ins2079374-v1-pT_ll_mass_350-1000.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/rawdata/HEPData-ins2079374-v1-pT_ll_mass_350-1000.yaml
new file mode 100644
index 0000000000..5c40a9175e
--- /dev/null
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/rawdata/HEPData-ins2079374-v1-pT_ll_mass_350-1000.yaml
@@ -0,0 +1,296 @@
+dependent_variables:
+- header:
+    name: $\mathrm{d}\sigma/\mathrm{d}p_T(ll)$
+    units: pb/GeV
+  values:
+  - errors:
+    - label: Data stat.
+      symerror: 0.00025654
+    - label: Unfolding stat.
+      symerror: 7.3288e-05
+    - label: Unfolding model
+      symerror: 0.00011534
+    - label: Int. luminosity
+      symerror: 3.5644e-05
+    - label: Lepton energy
+      symerror: 7.6262e-05
+    - label: Efficiency
+      symerror: 5.3118e-05
+    - label: Backgrounds
+      symerror: 4.7014e-05
+    - label: Jet energy
+      symerror: 2.8126e-07
+    - label: Others
+      symerror: 1.0691e-05
+    value: 0.0023774
+  - errors:
+    - label: Data stat.
+      symerror: 0.00037499
+    - label: Unfolding stat.
+      symerror: 0.00011066
+    - label: Unfolding model
+      symerror: 0.00018716
+    - label: Int. luminosity
+      symerror: 7.8404e-05
+    - label: Lepton energy
+      symerror: 4.9356e-05
+    - label: Efficiency
+      symerror: 0.00012792
+    - label: Backgrounds
+      symerror: 8.2519e-05
+    - label: Jet energy
+      symerror: 4.1687e-07
+    - label: Others
+      symerror: 2.671e-05
+    value: 0.0056498
+  - errors:
+    - label: Data stat.
+      symerror: 0.00037839
+    - label: Unfolding stat.
+      symerror: 0.00011649
+    - label: Unfolding model
+      symerror: 0.00014386
+    - label: Int. luminosity
+      symerror: 9.0336e-05
+    - label: Lepton energy
+      symerror: 0.00014317
+    - label: Efficiency
+      symerror: 0.00015637
+    - label: Backgrounds
+      symerror: 4.397e-05
+    - label: Jet energy
+      symerror: 4.5782e-07
+    - label: Others
+      symerror: 4.0138e-05
+    value: 0.0069927
+  - errors:
+    - label: Data stat.
+      symerror: 0.00036654
+    - label: Unfolding stat.
+      symerror: 0.0001121
+    - label: Unfolding model
+      symerror: 3.0691e-05
+    - label: Int. luminosity
+      symerror: 8.6017e-05
+    - label: Lepton energy
+      symerror: 0.0001234
+    - label: Efficiency
+      symerror: 0.00015053
+    - label: Backgrounds
+      symerror: 2.2779e-05
+    - label: Jet energy
+      symerror: 3.5745e-06
+    - label: Others
+      symerror: 3.9597e-05
+    value: 0.0068868
+  - errors:
+    - label: Data stat.
+      symerror: 0.00033726
+    - label: Unfolding stat.
+      symerror: 0.00010504
+    - label: Unfolding model
+      symerror: 0.00011385
+    - label: Int. luminosity
+      symerror: 7.5391e-05
+    - label: Lepton energy
+      symerror: 6.3459e-05
+    - label: Efficiency
+      symerror: 0.00013504
+    - label: Backgrounds
+      symerror: 1.9512e-05
+    - label: Jet energy
+      symerror: 8.4474e-06
+    - label: Others
+      symerror: 4.0985e-05
+    value: 0.0061386
+  - errors:
+    - label: Data stat.
+      symerror: 0.00035578
+    - label: Unfolding stat.
+      symerror: 0.0001074
+    - label: Unfolding model
+      symerror: 0.00018158
+    - label: Int. luminosity
+      symerror: 7.4391e-05
+    - label: Lepton energy
+      symerror: 3.4407e-05
+    - label: Efficiency
+      symerror: 0.00012618
+    - label: Backgrounds
+      symerror: 4.0363e-05
+    - label: Jet energy
+      symerror: 1.4749e-06
+    - label: Others
+      symerror: 3.648e-05
+    value: 0.0060243
+  - errors:
+    - label: Data stat.
+      symerror: 0.00032693
+    - label: Unfolding stat.
+      symerror: 9.937e-05
+    - label: Unfolding model
+      symerror: 0.0001435
+    - label: Int. luminosity
+      symerror: 6.6968e-05
+    - label: Lepton energy
+      symerror: 2.8957e-05
+    - label: Efficiency
+      symerror: 0.00011085
+    - label: Backgrounds
+      symerror: 6.9448e-05
+    - label: Jet energy
+      symerror: 1.4751e-06
+    - label: Others
+      symerror: 3.2506e-05
+    value: 0.0052844
+  - errors:
+    - label: Data stat.
+      symerror: 0.00029204
+    - label: Unfolding stat.
+      symerror: 8.8605e-05
+    - label: Unfolding model
+      symerror: 3.5417e-05
+    - label: Int. luminosity
+      symerror: 6.492e-05
+    - label: Lepton energy
+      symerror: 1.6724e-05
+    - label: Efficiency
+      symerror: 0.00010783
+    - label: Backgrounds
+      symerror: 7.2037e-05
+    - label: Jet energy
+      symerror: 8.0529e-07
+    - label: Others
+      symerror: 2.7093e-05
+    value: 0.0051086
+  - errors:
+    - label: Data stat.
+      symerror: 0.00028087
+    - label: Unfolding stat.
+      symerror: 9.0018e-05
+    - label: Unfolding model
+      symerror: 6.5164e-05
+    - label: Int. luminosity
+      symerror: 5.8385e-05
+    - label: Lepton energy
+      symerror: 1.855e-05
+    - label: Efficiency
+      symerror: 9.6505e-05
+    - label: Backgrounds
+      symerror: 5.7071e-05
+    - label: Jet energy
+      symerror: 6.448e-06
+    - label: Others
+      symerror: 2.3351e-05
+    value: 0.0045253
+  - errors:
+    - label: Data stat.
+      symerror: 0.00025308
+    - label: Unfolding stat.
+      symerror: 8.3498e-05
+    - label: Unfolding model
+      symerror: 0.00014292
+    - label: Int. luminosity
+      symerror: 5.2936e-05
+    - label: Lepton energy
+      symerror: 4.8075e-05
+    - label: Efficiency
+      symerror: 8.3615e-05
+    - label: Backgrounds
+      symerror: 5.2583e-05
+    - label: Jet energy
+      symerror: 9.2384e-06
+    - label: Others
+      symerror: 1.3277e-05
+    value: 0.004045
+  - errors:
+    - label: Data stat.
+      symerror: 9.1275e-05
+    - label: Unfolding stat.
+      symerror: 3.0305e-05
+    - label: Unfolding model
+      symerror: 5.1798e-05
+    - label: Int. luminosity
+      symerror: 3.1416e-05
+    - label: Lepton energy
+      symerror: 2.411e-05
+    - label: Efficiency
+      symerror: 3.9469e-05
+    - label: Backgrounds
+      symerror: 5.1012e-05
+    - label: Jet energy
+      symerror: 5.1131e-06
+    - label: Others
+      symerror: 1.5135e-05
+    value: 0.0021176
+  - errors:
+    - label: Data stat.
+      symerror: 2.4725e-05
+    - label: Unfolding stat.
+      symerror: 7.8213e-06
+    - label: Unfolding model
+      symerror: 3.964e-07
+    - label: Int. luminosity
+      symerror: 1.1015e-05
+    - label: Lepton energy
+      symerror: 6.2416e-06
+    - label: Efficiency
+      symerror: 1.0517e-05
+    - label: Backgrounds
+      symerror: 2.6267e-05
+    - label: Jet energy
+      symerror: 2.2636e-06
+    - label: Others
+      symerror: 1.5407e-06
+    value: 0.00057801
+  - errors:
+    - label: Data stat.
+      symerror: 1.6817e-06
+    - label: Unfolding stat.
+      symerror: 6.0878e-07
+    - label: Unfolding model
+      symerror: 1.0253e-08
+    - label: Int. luminosity
+      symerror: 4.3891e-07
+    - label: Lepton energy
+      symerror: 8.2358e-07
+    - label: Efficiency
+      symerror: 4.5956e-07
+    - label: Backgrounds
+      symerror: 9.6731e-07
+    - label: Jet energy
+      symerror: 2.9718e-08
+    - label: Others
+      symerror: 1.0503e-07
+    value: 2.4683e-05
+independent_variables:
+- header:
+    name: $p_T(ll)$
+    units: GeV
+  values:
+  - high: 2.0
+    low: 0.0
+  - high: 4.0
+    low: 2.0
+  - high: 6.0
+    low: 4.0
+  - high: 8.0
+    low: 6.0
+  - high: 10.0
+    low: 8.0
+  - high: 12.0
+    low: 10.0
+  - high: 14.0
+    low: 12.0
+  - high: 18.0
+    low: 14.0
+  - high: 22.0
+    low: 18.0
+  - high: 28.0
+    low: 22.0
+  - high: 52.0
+    low: 28.0
+  - high: 160.0
+    low: 52.0
+  - high: 1000.0
+    low: 160.0
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/rawdata/HEPData-ins2079374-v1-pT_ll_mass_50-76.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/rawdata/HEPData-ins2079374-v1-pT_ll_mass_50-76.yaml
new file mode 100644
index 0000000000..23a5d3e21e
--- /dev/null
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/rawdata/HEPData-ins2079374-v1-pT_ll_mass_50-76.yaml
@@ -0,0 +1,362 @@
+dependent_variables:
+- header:
+    name: $\mathrm{d}\sigma/\mathrm{d}p_T(ll)$
+    units: pb/GeV
+  values:
+  - errors:
+    - label: Data stat.
+      symerror: 0.0038014
+    - label: Unfolding stat.
+      symerror: 0.0054221
+    - label: Unfolding model
+      symerror: 0.0022625
+    - label: Int. luminosity
+      symerror: 0.0097317
+    - label: Lepton energy
+      symerror: 0.0038791
+    - label: Efficiency
+      symerror: 0.0075232
+    - label: Backgrounds
+      symerror: 0.0070066
+    - label: Jet energy
+      symerror: 2.5797e-05
+    - label: Others
+      symerror: 0.003445
+    value: 0.74187
+  - errors:
+    - label: Data stat.
+      symerror: 0.00537
+    - label: Unfolding stat.
+      symerror: 0.0080736
+    - label: Unfolding model
+      symerror: 0.00083117
+    - label: Int. luminosity
+      symerror: 0.020417
+    - label: Lepton energy
+      symerror: 0.0057278
+    - label: Efficiency
+      symerror: 0.017875
+    - label: Backgrounds
+      symerror: 0.0023014
+    - label: Jet energy
+      symerror: 0.00010122
+    - label: Others
+      symerror: 0.010074
+    value: 1.6828
+  - errors:
+    - label: Data stat.
+      symerror: 0.0057125
+    - label: Unfolding stat.
+      symerror: 0.0088198
+    - label: Unfolding model
+      symerror: 0.0038192
+    - label: Int. luminosity
+      symerror: 0.022279
+    - label: Lepton energy
+      symerror: 0.0079839
+    - label: Efficiency
+      symerror: 0.020061
+    - label: Backgrounds
+      symerror: 0.001984
+    - label: Jet energy
+      symerror: 0.00011559
+    - label: Others
+      symerror: 0.0097883
+    value: 1.8444
+  - errors:
+    - label: Data stat.
+      symerror: 0.0055197
+    - label: Unfolding stat.
+      symerror: 0.0086923
+    - label: Unfolding model
+      symerror: 0.0068249
+    - label: Int. luminosity
+      symerror: 0.020764
+    - label: Lepton energy
+      symerror: 0.0083974
+    - label: Efficiency
+      symerror: 0.018495
+    - label: Backgrounds
+      symerror: 0.0026772
+    - label: Jet energy
+      symerror: 0.00013606
+    - label: Others
+      symerror: 0.0071378
+    value: 1.7141
+  - errors:
+    - label: Data stat.
+      symerror: 0.0052008
+    - label: Unfolding stat.
+      symerror: 0.0082775
+    - label: Unfolding model
+      symerror: 0.0037473
+    - label: Int. luminosity
+      symerror: 0.018459
+    - label: Lepton energy
+      symerror: 0.0084026
+    - label: Efficiency
+      symerror: 0.016089
+    - label: Backgrounds
+      symerror: 0.0021803
+    - label: Jet energy
+      symerror: 0.00023056
+    - label: Others
+      symerror: 0.0075679
+    value: 1.5243
+  - errors:
+    - label: Data stat.
+      symerror: 0.00487
+    - label: Unfolding stat.
+      symerror: 0.0076956
+    - label: Unfolding model
+      symerror: 0.0058648
+    - label: Int. luminosity
+      symerror: 0.016103
+    - label: Lepton energy
+      symerror: 0.0098802
+    - label: Efficiency
+      symerror: 0.013768
+    - label: Backgrounds
+      symerror: 0.0019599
+    - label: Jet energy
+      symerror: 0.00013179
+    - label: Others
+      symerror: 0.0062771
+    value: 1.329
+  - errors:
+    - label: Data stat.
+      symerror: 0.0046928
+    - label: Unfolding stat.
+      symerror: 0.0074619
+    - label: Unfolding model
+      symerror: 0.0015152
+    - label: Int. luminosity
+      symerror: 0.014413
+    - label: Lepton energy
+      symerror: 0.009072
+    - label: Efficiency
+      symerror: 0.012221
+    - label: Backgrounds
+      symerror: 0.001651
+    - label: Jet energy
+      symerror: 0.00013892
+    - label: Others
+      symerror: 0.0049796
+    value: 1.1897
+  - errors:
+    - label: Data stat.
+      symerror: 0.0028642
+    - label: Unfolding stat.
+      symerror: 0.0045117
+    - label: Unfolding model
+      symerror: 0.00060917
+    - label: Int. luminosity
+      symerror: 0.012073
+    - label: Lepton energy
+      symerror: 0.0067553
+    - label: Efficiency
+      symerror: 0.010092
+    - label: Backgrounds
+      symerror: 0.0016073
+    - label: Jet energy
+      symerror: 0.00020317
+    - label: Others
+      symerror: 0.0041648
+    value: 0.99489
+  - errors:
+    - label: Data stat.
+      symerror: 0.0025705
+    - label: Unfolding stat.
+      symerror: 0.0039563
+    - label: Unfolding model
+      symerror: 0.0015169
+    - label: Int. luminosity
+      symerror: 0.009217
+    - label: Lepton energy
+      symerror: 0.0063187
+    - label: Efficiency
+      symerror: 0.0077073
+    - label: Backgrounds
+      symerror: 0.0013384
+    - label: Jet energy
+      symerror: 0.00027595
+    - label: Others
+      symerror: 0.0033647
+    value: 0.75792
+  - errors:
+    - label: Data stat.
+      symerror: 0.0016535
+    - label: Unfolding stat.
+      symerror: 0.0024674
+    - label: Unfolding model
+      symerror: 0.00082758
+    - label: Int. luminosity
+      symerror: 0.0060517
+    - label: Lepton energy
+      symerror: 0.0033217
+    - label: Efficiency
+      symerror: 0.0051051
+    - label: Backgrounds
+      symerror: 0.0010744
+    - label: Jet energy
+      symerror: 0.00026236
+    - label: Others
+      symerror: 0.0021031
+    value: 0.49533
+  - errors:
+    - label: Data stat.
+      symerror: 0.00094488
+    - label: Unfolding stat.
+      symerror: 0.0013733
+    - label: Unfolding model
+      symerror: 0.00031945
+    - label: Int. luminosity
+      symerror: 0.0032889
+    - label: Lepton energy
+      symerror: 0.0017132
+    - label: Efficiency
+      symerror: 0.0027951
+    - label: Backgrounds
+      symerror: 0.00076544
+    - label: Jet energy
+      symerror: 0.00021967
+    - label: Others
+      symerror: 0.0010113
+    value: 0.26635
+  - errors:
+    - label: Data stat.
+      symerror: 0.00049909
+    - label: Unfolding stat.
+      symerror: 0.00070254
+    - label: Unfolding model
+      symerror: 3.5509e-05
+    - label: Int. luminosity
+      symerror: 0.0015949
+    - label: Lepton energy
+      symerror: 0.00072915
+    - label: Efficiency
+      symerror: 0.001337
+    - label: Backgrounds
+      symerror: 0.00062067
+    - label: Jet energy
+      symerror: 0.00013966
+    - label: Others
+      symerror: 0.00068028
+    value: 0.12569
+  - errors:
+    - label: Data stat.
+      symerror: 0.00020921
+    - label: Unfolding stat.
+      symerror: 0.00027274
+    - label: Unfolding model
+      symerror: 5.421e-05
+    - label: Int. luminosity
+      symerror: 0.00062395
+    - label: Lepton energy
+      symerror: 0.00018451
+    - label: Efficiency
+      symerror: 0.00051094
+    - label: Backgrounds
+      symerror: 0.00044164
+    - label: Jet energy
+      symerror: 9.0224e-05
+    - label: Others
+      symerror: 0.00023594
+    value: 0.046018
+  - errors:
+    - label: Data stat.
+      symerror: 6.3868e-05
+    - label: Unfolding stat.
+      symerror: 7.7704e-05
+    - label: Unfolding model
+      symerror: 6.4613e-06
+    - label: Int. luminosity
+      symerror: 0.00012773
+    - label: Lepton energy
+      symerror: 3.2666e-05
+    - label: Efficiency
+      symerror: 0.00013236
+    - label: Backgrounds
+      symerror: 0.00010587
+    - label: Jet energy
+      symerror: 1.9157e-05
+    - label: Others
+      symerror: 5.1992e-05
+    value: 0.0091988
+  - errors:
+    - label: Data stat.
+      symerror: 2.097e-05
+    - label: Unfolding stat.
+      symerror: 2.5344e-05
+    - label: Unfolding model
+      symerror: 1.3915e-06
+    - label: Int. luminosity
+      symerror: 1.5086e-05
+    - label: Lepton energy
+      symerror: 2.5554e-06
+    - label: Efficiency
+      symerror: 1.9937e-05
+    - label: Backgrounds
+      symerror: 7.8527e-06
+    - label: Jet energy
+      symerror: 1.3685e-06
+    - label: Others
+      symerror: 4.2492e-06
+    value: 0.0011748
+  - errors:
+    - label: Data stat.
+      symerror: 1.2692e-06
+    - label: Unfolding stat.
+      symerror: 1.4913e-06
+    - label: Unfolding model
+      symerror: 1.1188e-07
+    - label: Int. luminosity
+      symerror: 4.4301e-07
+    - label: Lepton energy
+      symerror: 2.8268e-07
+    - label: Efficiency
+      symerror: 6.6062e-07
+    - label: Backgrounds
+      symerror: 2.2307e-07
+    - label: Jet energy
+      symerror: 1.5048e-09
+    - label: Others
+      symerror: 2.5187e-07
+    value: 3.5385e-05
+independent_variables:
+- header:
+    name: $p_T(ll)$
+    units: GeV
+  values:
+  - high: 2.0
+    low: 0.0
+  - high: 4.0
+    low: 2.0
+  - high: 6.0
+    low: 4.0
+  - high: 8.0
+    low: 6.0
+  - high: 10.0
+    low: 8.0
+  - high: 12.0
+    low: 10.0
+  - high: 14.0
+    low: 12.0
+  - high: 18.0
+    low: 14.0
+  - high: 22.0
+    low: 18.0
+  - high: 28.0
+    low: 22.0
+  - high: 37.0
+    low: 28.0
+  - high: 52.0
+    low: 37.0
+  - high: 85.0
+    low: 52.0
+  - high: 160.0
+    low: 85.0
+  - high: 250.0
+    low: 160.0
+  - high: 1000.0
+    low: 250.0
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/rawdata/HEPData-ins2079374-v1-pT_ll_mass_76-106.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/rawdata/HEPData-ins2079374-v1-pT_ll_mass_76-106.yaml
new file mode 100644
index 0000000000..d0325139a5
--- /dev/null
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/rawdata/HEPData-ins2079374-v1-pT_ll_mass_76-106.yaml
@@ -0,0 +1,824 @@
+dependent_variables:
+- header:
+    name: $\mathrm{d}\sigma/\mathrm{d}p_T(ll)$
+    units: pb/GeV
+  values:
+  - errors:
+    - label: Data stat.
+      symerror: 0.033758
+    - label: Unfolding stat.
+      symerror: 0.04768
+    - label: Unfolding model
+      symerror: 0.14415
+    - label: Int. luminosity
+      symerror: 0.10357
+    - label: Lepton energy
+      symerror: 0.060863
+    - label: Efficiency
+      symerror: 0.065207
+    - label: Backgrounds
+      symerror: 0.0079841
+    - label: Jet energy
+      symerror: 0.00023528
+    - label: Others
+      symerror: 0.0145
+    value: 8.5535
+  - errors:
+    - label: Data stat.
+      symerror: 0.050774
+    - label: Unfolding stat.
+      symerror: 0.071665
+    - label: Unfolding model
+      symerror: 0.075111
+    - label: Int. luminosity
+      symerror: 0.27698
+    - label: Lepton energy
+      symerror: 0.11393
+    - label: Efficiency
+      symerror: 0.15961
+    - label: Backgrounds
+      symerror: 0.0013584
+    - label: Jet energy
+      symerror: 0.00084474
+    - label: Others
+      symerror: 0.10611
+    value: 23.064
+  - errors:
+    - label: Data stat.
+      symerror: 0.05936
+    - label: Unfolding stat.
+      symerror: 0.083694
+    - label: Unfolding model
+      symerror: 0.043083
+    - label: Int. luminosity
+      symerror: 0.38526
+    - label: Lepton energy
+      symerror: 0.14786
+    - label: Efficiency
+      symerror: 0.22292
+    - label: Backgrounds
+      symerror: 0.00052205
+    - label: Jet energy
+      symerror: 0.0013554
+    - label: Others
+      symerror: 0.093684
+    value: 32.092
+  - errors:
+    - label: Data stat.
+      symerror: 0.064057
+    - label: Unfolding stat.
+      symerror: 0.090387
+    - label: Unfolding model
+      symerror: 0.14566
+    - label: Int. luminosity
+      symerror: 0.43835
+    - label: Lepton energy
+      symerror: 0.10023
+    - label: Efficiency
+      symerror: 0.24028
+    - label: Backgrounds
+      symerror: 0.0013208
+    - label: Jet energy
+      symerror: 0.001982
+    - label: Others
+      symerror: 0.17601
+    value: 36.51
+  - errors:
+    - label: Data stat.
+      symerror: 0.065327
+    - label: Unfolding stat.
+      symerror: 0.092835
+    - label: Unfolding model
+      symerror: 0.056038
+    - label: Int. luminosity
+      symerror: 0.44702
+    - label: Lepton energy
+      symerror: 0.045855
+    - label: Efficiency
+      symerror: 0.24876
+    - label: Backgrounds
+      symerror: 0.00085426
+    - label: Jet energy
+      symerror: 0.0018579
+    - label: Others
+      symerror: 0.18142
+    value: 37.237
+  - errors:
+    - label: Data stat.
+      symerror: 0.065709
+    - label: Unfolding stat.
+      symerror: 0.093976
+    - label: Unfolding model
+      symerror: 0.1291
+    - label: Int. luminosity
+      symerror: 0.43947
+    - label: Lepton energy
+      symerror: 0.018395
+    - label: Efficiency
+      symerror: 0.24734
+    - label: Backgrounds
+      symerror: 0.00077069
+    - label: Jet energy
+      symerror: 0.0016439
+    - label: Others
+      symerror: 0.16346
+    value: 36.608
+  - errors:
+    - label: Data stat.
+      symerror: 0.06387
+    - label: Unfolding stat.
+      symerror: 0.091705
+    - label: Unfolding model
+      symerror: 0.16721
+    - label: Int. luminosity
+      symerror: 0.41565
+    - label: Lepton energy
+      symerror: 0.020582
+    - label: Efficiency
+      symerror: 0.23356
+    - label: Backgrounds
+      symerror: 0.00088846
+    - label: Jet energy
+      symerror: 0.001866
+    - label: Others
+      symerror: 0.16794
+    value: 34.621
+  - errors:
+    - label: Data stat.
+      symerror: 0.060994
+    - label: Unfolding stat.
+      symerror: 0.087822
+    - label: Unfolding model
+      symerror: 0.094639
+    - label: Int. luminosity
+      symerror: 0.39069
+    - label: Lepton energy
+      symerror: 0.028046
+    - label: Efficiency
+      symerror: 0.22185
+    - label: Backgrounds
+      symerror: 0.00097163
+    - label: Jet energy
+      symerror: 0.0016019
+    - label: Others
+      symerror: 0.14579
+    value: 32.542
+  - errors:
+    - label: Data stat.
+      symerror: 0.059369
+    - label: Unfolding stat.
+      symerror: 0.085425
+    - label: Unfolding model
+      symerror: 0.092046
+    - label: Int. luminosity
+      symerror: 0.36407
+    - label: Lepton energy
+      symerror: 0.022795
+    - label: Efficiency
+      symerror: 0.20696
+    - label: Backgrounds
+      symerror: 0.0010185
+    - label: Jet energy
+      symerror: 0.0026102
+    - label: Others
+      symerror: 0.13837
+    value: 30.324
+  - errors:
+    - label: Data stat.
+      symerror: 0.057497
+    - label: Unfolding stat.
+      symerror: 0.082438
+    - label: Unfolding model
+      symerror: 0.030508
+    - label: Int. luminosity
+      symerror: 0.33814
+    - label: Lepton energy
+      symerror: 0.0058044
+    - label: Efficiency
+      symerror: 0.193
+    - label: Backgrounds
+      symerror: 0.00096301
+    - label: Jet energy
+      symerror: 0.0020601
+    - label: Others
+      symerror: 0.12627
+    value: 28.162
+  - errors:
+    - label: Data stat.
+      symerror: 0.055053
+    - label: Unfolding stat.
+      symerror: 0.078593
+    - label: Unfolding model
+      symerror: 0.014853
+    - label: Int. luminosity
+      symerror: 0.31166
+    - label: Lepton energy
+      symerror: 0.0046923
+    - label: Efficiency
+      symerror: 0.17942
+    - label: Backgrounds
+      symerror: 0.00075375
+    - label: Jet energy
+      symerror: 0.0024913
+    - label: Others
+      symerror: 0.11475
+    value: 25.957
+  - errors:
+    - label: Data stat.
+      symerror: 0.052656
+    - label: Unfolding stat.
+      symerror: 0.074894
+    - label: Unfolding model
+      symerror: 0.060071
+    - label: Int. luminosity
+      symerror: 0.28862
+    - label: Lepton energy
+      symerror: 0.031485
+    - label: Efficiency
+      symerror: 0.16765
+    - label: Backgrounds
+      symerror: 0.001274
+    - label: Jet energy
+      symerror: 0.0028201
+    - label: Others
+      symerror: 0.10038
+    value: 24.036
+  - errors:
+    - label: Data stat.
+      symerror: 0.050667
+    - label: Unfolding stat.
+      symerror: 0.071595
+    - label: Unfolding model
+      symerror: 0.038583
+    - label: Int. luminosity
+      symerror: 0.26536
+    - label: Lepton energy
+      symerror: 0.0065499
+    - label: Efficiency
+      symerror: 0.15525
+    - label: Backgrounds
+      symerror: 0.00086455
+    - label: Jet energy
+      symerror: 0.0037332
+    - label: Others
+      symerror: 0.094207
+    value: 22.098
+  - errors:
+    - label: Data stat.
+      symerror: 0.050758
+    - label: Unfolding stat.
+      symerror: 0.071454
+    - label: Unfolding model
+      symerror: 0.013902
+    - label: Int. luminosity
+      symerror: 0.24859
+    - label: Lepton energy
+      symerror: 0.031499
+    - label: Efficiency
+      symerror: 0.14621
+    - label: Backgrounds
+      symerror: 0.0011358
+    - label: Jet energy
+      symerror: 0.0027214
+    - label: Others
+      symerror: 0.088161
+    value: 20.7
+  - errors:
+    - label: Data stat.
+      symerror: 0.026944
+    - label: Unfolding stat.
+      symerror: 0.037668
+    - label: Unfolding model
+      symerror: 0.035982
+    - label: Int. luminosity
+      symerror: 0.22099
+    - label: Lepton energy
+      symerror: 0.013953
+    - label: Efficiency
+      symerror: 0.1322
+    - label: Backgrounds
+      symerror: 0.00098906
+    - label: Jet energy
+      symerror: 0.0030156
+    - label: Others
+      symerror: 0.081746
+    value: 18.4
+  - errors:
+    - label: Data stat.
+      symerror: 0.024714
+    - label: Unfolding stat.
+      symerror: 0.034232
+    - label: Unfolding model
+      symerror: 0.024391
+    - label: Int. luminosity
+      symerror: 0.19008
+    - label: Lepton energy
+      symerror: 0.010449
+    - label: Efficiency
+      symerror: 0.11577
+    - label: Backgrounds
+      symerror: 0.0011118
+    - label: Jet energy
+      symerror: 0.0034782
+    - label: Others
+      symerror: 0.072398
+    value: 15.824
+  - errors:
+    - label: Data stat.
+      symerror: 0.023891
+    - label: Unfolding stat.
+      symerror: 0.032914
+    - label: Unfolding model
+      symerror: 0.027744
+    - label: Int. luminosity
+      symerror: 0.16715
+    - label: Lepton energy
+      symerror: 0.010484
+    - label: Efficiency
+      symerror: 0.10461
+    - label: Backgrounds
+      symerror: 0.0012889
+    - label: Jet energy
+      symerror: 0.003858
+    - label: Others
+      symerror: 0.05701
+    value: 13.912
+  - errors:
+    - label: Data stat.
+      symerror: 0.021838
+    - label: Unfolding stat.
+      symerror: 0.029816
+    - label: Unfolding model
+      symerror: 0.0021999
+    - label: Int. luminosity
+      symerror: 0.14433
+    - label: Lepton energy
+      symerror: 0.017794
+    - label: Efficiency
+      symerror: 0.093142
+    - label: Backgrounds
+      symerror: 0.0011862
+    - label: Jet energy
+      symerror: 0.0041217
+    - label: Others
+      symerror: 0.052502
+    value: 12.011
+  - errors:
+    - label: Data stat.
+      symerror: 0.013919
+    - label: Unfolding stat.
+      symerror: 0.018888
+    - label: Unfolding model
+      symerror: 0.028383
+    - label: Int. luminosity
+      symerror: 0.12416
+    - label: Lepton energy
+      symerror: 0.0080526
+    - label: Efficiency
+      symerror: 0.08335
+    - label: Backgrounds
+      symerror: 0.0013364
+    - label: Jet energy
+      symerror: 0.0044605
+    - label: Others
+      symerror: 0.045418
+    value: 10.329
+  - errors:
+    - label: Data stat.
+      symerror: 0.012477
+    - label: Unfolding stat.
+      symerror: 0.016775
+    - label: Unfolding model
+      symerror: 0.016757
+    - label: Int. luminosity
+      symerror: 0.10271
+    - label: Lepton energy
+      symerror: 0.0088207
+    - label: Efficiency
+      symerror: 0.073039
+    - label: Backgrounds
+      symerror: 0.0012982
+    - label: Jet energy
+      symerror: 0.0050783
+    - label: Others
+      symerror: 0.038022
+    value: 8.5419
+  - errors:
+    - label: Data stat.
+      symerror: 0.0088995
+    - label: Unfolding stat.
+      symerror: 0.011934
+    - label: Unfolding model
+      symerror: 0.0090412
+    - label: Int. luminosity
+      symerror: 0.084729
+    - label: Lepton energy
+      symerror: 0.01013
+    - label: Efficiency
+      symerror: 0.064788
+    - label: Backgrounds
+      symerror: 0.0012955
+    - label: Jet energy
+      symerror: 0.0044856
+    - label: Others
+      symerror: 0.030639
+    value: 7.0432
+  - errors:
+    - label: Data stat.
+      symerror: 0.0067182
+    - label: Unfolding stat.
+      symerror: 0.0089663
+    - label: Unfolding model
+      symerror: 0.0054684
+    - label: Int. luminosity
+      symerror: 0.06677
+    - label: Lepton energy
+      symerror: 0.0063484
+    - label: Efficiency
+      symerror: 0.055744
+    - label: Backgrounds
+      symerror: 0.0012776
+    - label: Jet energy
+      symerror: 0.0044753
+    - label: Others
+      symerror: 0.026124
+    value: 5.547
+  - errors:
+    - label: Data stat.
+      symerror: 0.0052125
+    - label: Unfolding stat.
+      symerror: 0.0069518
+    - label: Unfolding model
+      symerror: 0.0044179
+    - label: Int. luminosity
+      symerror: 0.051094
+    - label: Lepton energy
+      symerror: 0.0065383
+    - label: Efficiency
+      symerror: 0.046533
+    - label: Backgrounds
+      symerror: 0.0012882
+    - label: Jet energy
+      symerror: 0.0039303
+    - label: Others
+      symerror: 0.019161
+    value: 4.2406
+  - errors:
+    - label: Data stat.
+      symerror: 0.0034334
+    - label: Unfolding stat.
+      symerror: 0.0045665
+    - label: Unfolding model
+      symerror: 0.0031866
+    - label: Int. luminosity
+      symerror: 0.036863
+    - label: Lepton energy
+      symerror: 0.0051767
+    - label: Efficiency
+      symerror: 0.036091
+    - label: Backgrounds
+      symerror: 0.001196
+    - label: Jet energy
+      symerror: 0.0028311
+    - label: Others
+      symerror: 0.016417
+    value: 3.0556
+  - errors:
+    - label: Data stat.
+      symerror: 0.0022385
+    - label: Unfolding stat.
+      symerror: 0.0029407
+    - label: Unfolding model
+      symerror: 0.0032742
+    - label: Int. luminosity
+      symerror: 0.023495
+    - label: Lepton energy
+      symerror: 0.0043227
+    - label: Efficiency
+      symerror: 0.024361
+    - label: Backgrounds
+      symerror: 0.0010382
+    - label: Jet energy
+      symerror: 0.0017547
+    - label: Others
+      symerror: 0.0096716
+    value: 1.9436
+  - errors:
+    - label: Data stat.
+      symerror: 0.0012904
+    - label: Unfolding stat.
+      symerror: 0.0016509
+    - label: Unfolding model
+      symerror: 8.6213e-05
+    - label: Int. luminosity
+      symerror: 0.012562
+    - label: Lepton energy
+      symerror: 0.002997
+    - label: Efficiency
+      symerror: 0.013652
+    - label: Backgrounds
+      symerror: 0.00076131
+    - label: Jet energy
+      symerror: 0.00082697
+    - label: Others
+      symerror: 0.005194
+    value: 1.0362
+  - errors:
+    - label: Data stat.
+      symerror: 0.00060506
+    - label: Unfolding stat.
+      symerror: 0.00074694
+    - label: Unfolding model
+      symerror: 0.0003411
+    - label: Int. luminosity
+      symerror: 0.0049477
+    - label: Lepton energy
+      symerror: 0.0011815
+    - label: Efficiency
+      symerror: 0.0057956
+    - label: Backgrounds
+      symerror: 0.0003669
+    - label: Jet energy
+      symerror: 0.00032683
+    - label: Others
+      symerror: 0.0020863
+    value: 0.40703
+  - errors:
+    - label: Data stat.
+      symerror: 0.00034131
+    - label: Unfolding stat.
+      symerror: 0.00040569
+    - label: Unfolding model
+      symerror: 1.2319e-05
+    - label: Int. luminosity
+      symerror: 0.0017206
+    - label: Lepton energy
+      symerror: 0.00046436
+    - label: Efficiency
+      symerror: 0.0022036
+    - label: Backgrounds
+      symerror: 0.00012672
+    - label: Jet energy
+      symerror: 8.8875e-05
+    - label: Others
+      symerror: 0.00065344
+    value: 0.14152
+  - errors:
+    - label: Data stat.
+      symerror: 0.00026481
+    - label: Unfolding stat.
+      symerror: 0.00030702
+    - label: Unfolding model
+      symerror: 3.6831e-05
+    - label: Int. luminosity
+      symerror: 0.00072907
+    - label: Lepton energy
+      symerror: 0.00027189
+    - label: Efficiency
+      symerror: 0.00098989
+    - label: Backgrounds
+      symerror: 5.2589e-05
+    - label: Jet energy
+      symerror: 4.4076e-05
+    - label: Others
+      symerror: 0.00030636
+    value: 0.059995
+  - errors:
+    - label: Data stat.
+      symerror: 0.00020295
+    - label: Unfolding stat.
+      symerror: 0.00023086
+    - label: Unfolding model
+      symerror: 4.619e-06
+    - label: Int. luminosity
+      symerror: 0.00039008
+    - label: Lepton energy
+      symerror: 0.0001288
+    - label: Efficiency
+      symerror: 0.00053697
+    - label: Backgrounds
+      symerror: 3.1412e-05
+    - label: Jet energy
+      symerror: 2.7045e-05
+    - label: Others
+      symerror: 0.00013984
+    value: 0.032086
+  - errors:
+    - label: Data stat.
+      symerror: 0.00015611
+    - label: Unfolding stat.
+      symerror: 0.0001756
+    - label: Unfolding model
+      symerror: 3.1516e-05
+    - label: Int. luminosity
+      symerror: 0.0002194
+    - label: Lepton energy
+      symerror: 7.6189e-05
+    - label: Efficiency
+      symerror: 0.0003119
+    - label: Backgrounds
+      symerror: 1.8268e-05
+    - label: Jet energy
+      symerror: 9.8254e-06
+    - label: Others
+      symerror: 0.0001014
+    value: 0.018046
+  - errors:
+    - label: Data stat.
+      symerror: 8.2748e-05
+    - label: Unfolding stat.
+      symerror: 9.1161e-05
+    - label: Unfolding model
+      symerror: 2.1202e-05
+    - label: Int. luminosity
+      symerror: 0.00011068
+    - label: Lepton energy
+      symerror: 1.5935e-05
+    - label: Efficiency
+      symerror: 0.00016042
+    - label: Backgrounds
+      symerror: 9.5781e-06
+    - label: Jet energy
+      symerror: 8.0409e-06
+    - label: Others
+      symerror: 3.1899e-05
+    value: 0.0090947
+  - errors:
+    - label: Data stat.
+      symerror: 5.6816e-05
+    - label: Unfolding stat.
+      symerror: 6.0913e-05
+    - label: Unfolding model
+      symerror: 2.2359e-07
+    - label: Int. luminosity
+      symerror: 4.9871e-05
+    - label: Lepton energy
+      symerror: 1.9473e-05
+    - label: Efficiency
+      symerror: 7.4082e-05
+    - label: Backgrounds
+      symerror: 5.2384e-06
+    - label: Jet energy
+      symerror: 1.8275e-06
+    - label: Others
+      symerror: 2.2848e-05
+    value: 0.0040887
+  - errors:
+    - label: Data stat.
+      symerror: 4.0305e-05
+    - label: Unfolding stat.
+      symerror: 4.2119e-05
+    - label: Unfolding model
+      symerror: 1.9097e-08
+    - label: Int. luminosity
+      symerror: 2.4226e-05
+    - label: Lepton energy
+      symerror: 7.9502e-06
+    - label: Efficiency
+      symerror: 3.6029e-05
+    - label: Backgrounds
+      symerror: 2.7328e-06
+    - label: Jet energy
+      symerror: 4.2588e-07
+    - label: Others
+      symerror: 9.2155e-06
+    value: 0.0019895
+  - errors:
+    - label: Data stat.
+      symerror: 3.077e-05
+    - label: Unfolding stat.
+      symerror: 3.1497e-05
+    - label: Unfolding model
+      symerror: 4.9058e-08
+    - label: Int. luminosity
+      symerror: 1.2682e-05
+    - label: Lepton energy
+      symerror: 2.2524e-05
+    - label: Efficiency
+      symerror: 1.9428e-05
+    - label: Backgrounds
+      symerror: 2.6023e-06
+    - label: Jet energy
+      symerror: 1.1797e-06
+    - label: Others
+      symerror: 7.3675e-06
+    value: 0.0010353
+  - errors:
+    - label: Data stat.
+      symerror: 2.366e-05
+    - label: Unfolding stat.
+      symerror: 2.3845e-05
+    - label: Unfolding model
+      symerror: 3.4427e-07
+    - label: Int. luminosity
+      symerror: 7.0419e-06
+    - label: Lepton energy
+      symerror: 3.9535e-06
+    - label: Efficiency
+      symerror: 1.0483e-05
+    - label: Backgrounds
+      symerror: 6.1221e-07
+    - label: Jet energy
+      symerror: 3.9763e-07
+    - label: Others
+      symerror: 2.718e-06
+    value: 0.0005749
+  - errors:
+    - label: Data stat.
+      symerror: 2.4365e-06
+    - label: Unfolding stat.
+      symerror: 2.4514e-06
+    - label: Unfolding model
+      symerror: 2.3093e-07
+    - label: Int. luminosity
+      symerror: 1.0092e-06
+    - label: Lepton energy
+      symerror: 1.3544e-06
+    - label: Efficiency
+      symerror: 1.6442e-06
+    - label: Backgrounds
+      symerror: 2.0173e-07
+    - label: Jet energy
+      symerror: 5.681e-08
+    - label: Others
+      symerror: 4.0387e-07
+    value: 8.2356e-05
+independent_variables:
+- header:
+    name: $p_T(ll)$
+    units: GeV
+  values:
+  - high: 1.0
+    low: 0.0
+  - high: 2.0
+    low: 1.0
+  - high: 3.0
+    low: 2.0
+  - high: 4.0
+    low: 3.0
+  - high: 5.0
+    low: 4.0
+  - high: 6.0
+    low: 5.0
+  - high: 7.0
+    low: 6.0
+  - high: 8.0
+    low: 7.0
+  - high: 9.0
+    low: 8.0
+  - high: 10.0
+    low: 9.0
+  - high: 11.0
+    low: 10.0
+  - high: 12.0
+    low: 11.0
+  - high: 13.0
+    low: 12.0
+  - high: 14.0
+    low: 13.0
+  - high: 16.0
+    low: 14.0
+  - high: 18.0
+    low: 16.0
+  - high: 20.0
+    low: 18.0
+  - high: 22.0
+    low: 20.0
+  - high: 25.0
+    low: 22.0
+  - high: 28.0
+    low: 25.0
+  - high: 32.0
+    low: 28.0
+  - high: 37.0
+    low: 32.0
+  - high: 43.0
+    low: 37.0
+  - high: 52.0
+    low: 43.0
+  - high: 65.0
+    low: 52.0
+  - high: 85.0
+    low: 65.0
+  - high: 120.0
+    low: 85.0
+  - high: 160.0
+    low: 120.0
+  - high: 190.0
+    low: 160.0
+  - high: 220.0
+    low: 190.0
+  - high: 250.0
+    low: 220.0
+  - high: 300.0
+    low: 250.0
+  - high: 350.0
+    low: 300.0
+  - high: 400.0
+    low: 350.0
+  - high: 450.0
+    low: 400.0
+  - high: 500.0
+    low: 450.0
+  - high: 1000.0
+    low: 500.0
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/uncertainties.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/uncertainties.yaml
new file mode 100644
index 0000000000..6da676668d
--- /dev/null
+++ b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_13TEV/uncertainties.yaml
@@ -0,0 +1,785 @@
+definitions:
+  Data stat.:
+    description: Data stat. unc. from HepData
+    treatment: ADD
+    type: UNCORR
+  Unfolding stat.:
+    description: Unfolding stat. unc. from HepData
+    treatment: ADD
+    type: UNCORR
+  Unfolding model:
+    description: Unfolding model unc. from HepData
+    treatment: ADD
+    type: UNCORR
+  Int. luminosity:
+    description: Int. luminosity unc. from HepData
+    treatment: MULT
+    type: CMSLUMI16
+  Lepton energy:
+    description: Lepton energy unc. from HepData
+    treatment: ADD
+    type: UNCORR
+  Efficiency:
+    description: Efficiency unc. from HepData
+    treatment: ADD
+    type: UNCORR
+  Backgrounds:
+    description: Backgrounds unc. from HepData
+    treatment: MULT
+    type: CORR
+  Jet energy:
+    description: Jet energy unc. from HepData
+    treatment: MULT
+    type: CORR
+  Others:
+    description: Others unc. from HepData
+    treatment: MULT
+    type: CORR
+bins:
+- Data stat.: 0.0057125
+  Unfolding stat.: 0.0088198
+  Unfolding model: 0.0038192
+  Int. luminosity: 0.022279
+  Lepton energy: 0.0079839
+  Efficiency: 0.020061
+  Backgrounds: 0.001984
+  Jet energy: 0.00011559
+  Others: 0.0097883
+- Data stat.: 0.0055197
+  Unfolding stat.: 0.0086923
+  Unfolding model: 0.0068249
+  Int. luminosity: 0.020764
+  Lepton energy: 0.0083974
+  Efficiency: 0.018495
+  Backgrounds: 0.0026772
+  Jet energy: 0.00013606
+  Others: 0.0071378
+- Data stat.: 0.0052008
+  Unfolding stat.: 0.0082775
+  Unfolding model: 0.0037473
+  Int. luminosity: 0.018459
+  Lepton energy: 0.0084026
+  Efficiency: 0.016089
+  Backgrounds: 0.0021803
+  Jet energy: 0.00023056
+  Others: 0.0075679
+- Data stat.: 0.00487
+  Unfolding stat.: 0.0076956
+  Unfolding model: 0.0058648
+  Int. luminosity: 0.016103
+  Lepton energy: 0.0098802
+  Efficiency: 0.013768
+  Backgrounds: 0.0019599
+  Jet energy: 0.00013179
+  Others: 0.0062771
+- Data stat.: 0.0046928
+  Unfolding stat.: 0.0074619
+  Unfolding model: 0.0015152
+  Int. luminosity: 0.014413
+  Lepton energy: 0.009072
+  Efficiency: 0.012221
+  Backgrounds: 0.001651
+  Jet energy: 0.00013892
+  Others: 0.0049796
+- Data stat.: 0.0028642
+  Unfolding stat.: 0.0045117
+  Unfolding model: 0.00060917
+  Int. luminosity: 0.012073
+  Lepton energy: 0.0067553
+  Efficiency: 0.010092
+  Backgrounds: 0.0016073
+  Jet energy: 0.00020317
+  Others: 0.0041648
+- Data stat.: 0.0025705
+  Unfolding stat.: 0.0039563
+  Unfolding model: 0.0015169
+  Int. luminosity: 0.009217
+  Lepton energy: 0.0063187
+  Efficiency: 0.0077073
+  Backgrounds: 0.0013384
+  Jet energy: 0.00027595
+  Others: 0.0033647
+- Data stat.: 0.0016535
+  Unfolding stat.: 0.0024674
+  Unfolding model: 0.00082758
+  Int. luminosity: 0.0060517
+  Lepton energy: 0.0033217
+  Efficiency: 0.0051051
+  Backgrounds: 0.0010744
+  Jet energy: 0.00026236
+  Others: 0.0021031
+- Data stat.: 0.00094488
+  Unfolding stat.: 0.0013733
+  Unfolding model: 0.00031945
+  Int. luminosity: 0.0032889
+  Lepton energy: 0.0017132
+  Efficiency: 0.0027951
+  Backgrounds: 0.00076544
+  Jet energy: 0.00021967
+  Others: 0.0010113
+- Data stat.: 0.00049909
+  Unfolding stat.: 0.00070254
+  Unfolding model: 3.5509e-05
+  Int. luminosity: 0.0015949
+  Lepton energy: 0.00072915
+  Efficiency: 0.001337
+  Backgrounds: 0.00062067
+  Jet energy: 0.00013966
+  Others: 0.00068028
+- Data stat.: 0.00020921
+  Unfolding stat.: 0.00027274
+  Unfolding model: 5.421e-05
+  Int. luminosity: 0.00062395
+  Lepton energy: 0.00018451
+  Efficiency: 0.00051094
+  Backgrounds: 0.00044164
+  Jet energy: 9.0224e-05
+  Others: 0.00023594
+- Data stat.: 6.3868e-05
+  Unfolding stat.: 7.7704e-05
+  Unfolding model: 6.4613e-06
+  Int. luminosity: 0.00012773
+  Lepton energy: 3.2666e-05
+  Efficiency: 0.00013236
+  Backgrounds: 0.00010587
+  Jet energy: 1.9157e-05
+  Others: 5.1992e-05
+- Data stat.: 2.097e-05
+  Unfolding stat.: 2.5344e-05
+  Unfolding model: 1.3915e-06
+  Int. luminosity: 1.5086e-05
+  Lepton energy: 2.5554e-06
+  Efficiency: 1.9937e-05
+  Backgrounds: 7.8527e-06
+  Jet energy: 1.3685e-06
+  Others: 4.2492e-06
+- Data stat.: 1.2692e-06
+  Unfolding stat.: 1.4913e-06
+  Unfolding model: 1.1188e-07
+  Int. luminosity: 4.4301e-07
+  Lepton energy: 2.8268e-07
+  Efficiency: 6.6062e-07
+  Backgrounds: 2.2307e-07
+  Jet energy: 1.5048e-09
+  Others: 2.5187e-07
+- Data stat.: 0.065327
+  Unfolding stat.: 0.092835
+  Unfolding model: 0.056038
+  Int. luminosity: 0.44702
+  Lepton energy: 0.045855
+  Efficiency: 0.24876
+  Backgrounds: 0.00085426
+  Jet energy: 0.0018579
+  Others: 0.18142
+- Data stat.: 0.065709
+  Unfolding stat.: 0.093976
+  Unfolding model: 0.1291
+  Int. luminosity: 0.43947
+  Lepton energy: 0.018395
+  Efficiency: 0.24734
+  Backgrounds: 0.00077069
+  Jet energy: 0.0016439
+  Others: 0.16346
+- Data stat.: 0.06387
+  Unfolding stat.: 0.091705
+  Unfolding model: 0.16721
+  Int. luminosity: 0.41565
+  Lepton energy: 0.020582
+  Efficiency: 0.23356
+  Backgrounds: 0.00088846
+  Jet energy: 0.001866
+  Others: 0.16794
+- Data stat.: 0.060994
+  Unfolding stat.: 0.087822
+  Unfolding model: 0.094639
+  Int. luminosity: 0.39069
+  Lepton energy: 0.028046
+  Efficiency: 0.22185
+  Backgrounds: 0.00097163
+  Jet energy: 0.0016019
+  Others: 0.14579
+- Data stat.: 0.059369
+  Unfolding stat.: 0.085425
+  Unfolding model: 0.092046
+  Int. luminosity: 0.36407
+  Lepton energy: 0.022795
+  Efficiency: 0.20696
+  Backgrounds: 0.0010185
+  Jet energy: 0.0026102
+  Others: 0.13837
+- Data stat.: 0.057497
+  Unfolding stat.: 0.082438
+  Unfolding model: 0.030508
+  Int. luminosity: 0.33814
+  Lepton energy: 0.0058044
+  Efficiency: 0.193
+  Backgrounds: 0.00096301
+  Jet energy: 0.0020601
+  Others: 0.12627
+- Data stat.: 0.055053
+  Unfolding stat.: 0.078593
+  Unfolding model: 0.014853
+  Int. luminosity: 0.31166
+  Lepton energy: 0.0046923
+  Efficiency: 0.17942
+  Backgrounds: 0.00075375
+  Jet energy: 0.0024913
+  Others: 0.11475
+- Data stat.: 0.052656
+  Unfolding stat.: 0.074894
+  Unfolding model: 0.060071
+  Int. luminosity: 0.28862
+  Lepton energy: 0.031485
+  Efficiency: 0.16765
+  Backgrounds: 0.001274
+  Jet energy: 0.0028201
+  Others: 0.10038
+- Data stat.: 0.050667
+  Unfolding stat.: 0.071595
+  Unfolding model: 0.038583
+  Int. luminosity: 0.26536
+  Lepton energy: 0.0065499
+  Efficiency: 0.15525
+  Backgrounds: 0.00086455
+  Jet energy: 0.0037332
+  Others: 0.094207
+- Data stat.: 0.050758
+  Unfolding stat.: 0.071454
+  Unfolding model: 0.013902
+  Int. luminosity: 0.24859
+  Lepton energy: 0.031499
+  Efficiency: 0.14621
+  Backgrounds: 0.0011358
+  Jet energy: 0.0027214
+  Others: 0.088161
+- Data stat.: 0.026944
+  Unfolding stat.: 0.037668
+  Unfolding model: 0.035982
+  Int. luminosity: 0.22099
+  Lepton energy: 0.013953
+  Efficiency: 0.1322
+  Backgrounds: 0.00098906
+  Jet energy: 0.0030156
+  Others: 0.081746
+- Data stat.: 0.024714
+  Unfolding stat.: 0.034232
+  Unfolding model: 0.024391
+  Int. luminosity: 0.19008
+  Lepton energy: 0.010449
+  Efficiency: 0.11577
+  Backgrounds: 0.0011118
+  Jet energy: 0.0034782
+  Others: 0.072398
+- Data stat.: 0.023891
+  Unfolding stat.: 0.032914
+  Unfolding model: 0.027744
+  Int. luminosity: 0.16715
+  Lepton energy: 0.010484
+  Efficiency: 0.10461
+  Backgrounds: 0.0012889
+  Jet energy: 0.003858
+  Others: 0.05701
+- Data stat.: 0.021838
+  Unfolding stat.: 0.029816
+  Unfolding model: 0.0021999
+  Int. luminosity: 0.14433
+  Lepton energy: 0.017794
+  Efficiency: 0.093142
+  Backgrounds: 0.0011862
+  Jet energy: 0.0041217
+  Others: 0.052502
+- Data stat.: 0.013919
+  Unfolding stat.: 0.018888
+  Unfolding model: 0.028383
+  Int. luminosity: 0.12416
+  Lepton energy: 0.0080526
+  Efficiency: 0.08335
+  Backgrounds: 0.0013364
+  Jet energy: 0.0044605
+  Others: 0.045418
+- Data stat.: 0.012477
+  Unfolding stat.: 0.016775
+  Unfolding model: 0.016757
+  Int. luminosity: 0.10271
+  Lepton energy: 0.0088207
+  Efficiency: 0.073039
+  Backgrounds: 0.0012982
+  Jet energy: 0.0050783
+  Others: 0.038022
+- Data stat.: 0.0088995
+  Unfolding stat.: 0.011934
+  Unfolding model: 0.0090412
+  Int. luminosity: 0.084729
+  Lepton energy: 0.01013
+  Efficiency: 0.064788
+  Backgrounds: 0.0012955
+  Jet energy: 0.0044856
+  Others: 0.030639
+- Data stat.: 0.0067182
+  Unfolding stat.: 0.0089663
+  Unfolding model: 0.0054684
+  Int. luminosity: 0.06677
+  Lepton energy: 0.0063484
+  Efficiency: 0.055744
+  Backgrounds: 0.0012776
+  Jet energy: 0.0044753
+  Others: 0.026124
+- Data stat.: 0.0052125
+  Unfolding stat.: 0.0069518
+  Unfolding model: 0.0044179
+  Int. luminosity: 0.051094
+  Lepton energy: 0.0065383
+  Efficiency: 0.046533
+  Backgrounds: 0.0012882
+  Jet energy: 0.0039303
+  Others: 0.019161
+- Data stat.: 0.0034334
+  Unfolding stat.: 0.0045665
+  Unfolding model: 0.0031866
+  Int. luminosity: 0.036863
+  Lepton energy: 0.0051767
+  Efficiency: 0.036091
+  Backgrounds: 0.001196
+  Jet energy: 0.0028311
+  Others: 0.016417
+- Data stat.: 0.0022385
+  Unfolding stat.: 0.0029407
+  Unfolding model: 0.0032742
+  Int. luminosity: 0.023495
+  Lepton energy: 0.0043227
+  Efficiency: 0.024361
+  Backgrounds: 0.0010382
+  Jet energy: 0.0017547
+  Others: 0.0096716
+- Data stat.: 0.0012904
+  Unfolding stat.: 0.0016509
+  Unfolding model: 8.6213e-05
+  Int. luminosity: 0.012562
+  Lepton energy: 0.002997
+  Efficiency: 0.013652
+  Backgrounds: 0.00076131
+  Jet energy: 0.00082697
+  Others: 0.005194
+- Data stat.: 0.00060506
+  Unfolding stat.: 0.00074694
+  Unfolding model: 0.0003411
+  Int. luminosity: 0.0049477
+  Lepton energy: 0.0011815
+  Efficiency: 0.0057956
+  Backgrounds: 0.0003669
+  Jet energy: 0.00032683
+  Others: 0.0020863
+- Data stat.: 0.00034131
+  Unfolding stat.: 0.00040569
+  Unfolding model: 1.2319e-05
+  Int. luminosity: 0.0017206
+  Lepton energy: 0.00046436
+  Efficiency: 0.0022036
+  Backgrounds: 0.00012672
+  Jet energy: 8.8875e-05
+  Others: 0.00065344
+- Data stat.: 0.00026481
+  Unfolding stat.: 0.00030702
+  Unfolding model: 3.6831e-05
+  Int. luminosity: 0.00072907
+  Lepton energy: 0.00027189
+  Efficiency: 0.00098989
+  Backgrounds: 5.2589e-05
+  Jet energy: 4.4076e-05
+  Others: 0.00030636
+- Data stat.: 0.00020295
+  Unfolding stat.: 0.00023086
+  Unfolding model: 4.619e-06
+  Int. luminosity: 0.00039008
+  Lepton energy: 0.0001288
+  Efficiency: 0.00053697
+  Backgrounds: 3.1412e-05
+  Jet energy: 2.7045e-05
+  Others: 0.00013984
+- Data stat.: 0.00015611
+  Unfolding stat.: 0.0001756
+  Unfolding model: 3.1516e-05
+  Int. luminosity: 0.0002194
+  Lepton energy: 7.6189e-05
+  Efficiency: 0.0003119
+  Backgrounds: 1.8268e-05
+  Jet energy: 9.8254e-06
+  Others: 0.0001014
+- Data stat.: 8.2748e-05
+  Unfolding stat.: 9.1161e-05
+  Unfolding model: 2.1202e-05
+  Int. luminosity: 0.00011068
+  Lepton energy: 1.5935e-05
+  Efficiency: 0.00016042
+  Backgrounds: 9.5781e-06
+  Jet energy: 8.0409e-06
+  Others: 3.1899e-05
+- Data stat.: 5.6816e-05
+  Unfolding stat.: 6.0913e-05
+  Unfolding model: 2.2359e-07
+  Int. luminosity: 4.9871e-05
+  Lepton energy: 1.9473e-05
+  Efficiency: 7.4082e-05
+  Backgrounds: 5.2384e-06
+  Jet energy: 1.8275e-06
+  Others: 2.2848e-05
+- Data stat.: 4.0305e-05
+  Unfolding stat.: 4.2119e-05
+  Unfolding model: 1.9097e-08
+  Int. luminosity: 2.4226e-05
+  Lepton energy: 7.9502e-06
+  Efficiency: 3.6029e-05
+  Backgrounds: 2.7328e-06
+  Jet energy: 4.2588e-07
+  Others: 9.2155e-06
+- Data stat.: 3.077e-05
+  Unfolding stat.: 3.1497e-05
+  Unfolding model: 4.9058e-08
+  Int. luminosity: 1.2682e-05
+  Lepton energy: 2.2524e-05
+  Efficiency: 1.9428e-05
+  Backgrounds: 2.6023e-06
+  Jet energy: 1.1797e-06
+  Others: 7.3675e-06
+- Data stat.: 2.366e-05
+  Unfolding stat.: 2.3845e-05
+  Unfolding model: 3.4427e-07
+  Int. luminosity: 7.0419e-06
+  Lepton energy: 3.9535e-06
+  Efficiency: 1.0483e-05
+  Backgrounds: 6.1221e-07
+  Jet energy: 3.9763e-07
+  Others: 2.718e-06
+- Data stat.: 2.4365e-06
+  Unfolding stat.: 2.4514e-06
+  Unfolding model: 2.3093e-07
+  Int. luminosity: 1.0092e-06
+  Lepton energy: 1.3544e-06
+  Efficiency: 1.6442e-06
+  Backgrounds: 2.0173e-07
+  Jet energy: 5.681e-08
+  Others: 4.0387e-07
+- Data stat.: 0.0035125
+  Unfolding stat.: 0.002462
+  Unfolding model: 0.0018979
+  Int. luminosity: 0.0097947
+  Lepton energy: 0.0051728
+  Efficiency: 0.008657
+  Backgrounds: 0.0010456
+  Jet energy: 8.9214e-05
+  Others: 0.0031866
+- Data stat.: 0.003395
+  Unfolding stat.: 0.0024032
+  Unfolding model: 0.0021942
+  Int. luminosity: 0.0091268
+  Lepton energy: 0.0052122
+  Efficiency: 0.0081917
+  Backgrounds: 0.0012183
+  Jet energy: 0.00013846
+  Others: 0.0026279
+- Data stat.: 0.0032096
+  Unfolding stat.: 0.0022813
+  Unfolding model: 0.001903
+  Int. luminosity: 0.0081601
+  Lepton energy: 0.0047889
+  Efficiency: 0.0073849
+  Backgrounds: 0.0010033
+  Jet energy: 6.9431e-05
+  Others: 0.0021957
+- Data stat.: 0.0030141
+  Unfolding stat.: 0.0021434
+  Unfolding model: 0.0014933
+  Int. luminosity: 0.007173
+  Lepton energy: 0.0050791
+  Efficiency: 0.0064786
+  Backgrounds: 0.0012061
+  Jet energy: 0.0002903
+  Others: 0.0020411
+- Data stat.: 0.002918
+  Unfolding stat.: 0.0020711
+  Unfolding model: 0.0010854
+  Int. luminosity: 0.0063346
+  Lepton energy: 0.0040648
+  Efficiency: 0.0058424
+  Backgrounds: 0.0011499
+  Jet energy: 8.0622e-05
+  Others: 0.0010741
+- Data stat.: 0.0018603
+  Unfolding stat.: 0.0013177
+  Unfolding model: 0.0014108
+  Int. luminosity: 0.0051661
+  Lepton energy: 0.0031033
+  Efficiency: 0.0048475
+  Backgrounds: 0.0011655
+  Jet energy: 7.955e-05
+  Others: 0.0015099
+- Data stat.: 0.0016925
+  Unfolding stat.: 0.0012155
+  Unfolding model: 0.00054787
+  Int. luminosity: 0.0040487
+  Lepton energy: 0.0026776
+  Efficiency: 0.0039587
+  Backgrounds: 0.00098403
+  Jet energy: 0.00015217
+  Others: 0.0013108
+- Data stat.: 0.0011715
+  Unfolding stat.: 0.00085867
+  Unfolding model: 0.0012856
+  Int. luminosity: 0.00309
+  Lepton energy: 0.0021439
+  Efficiency: 0.003014
+  Backgrounds: 0.00096891
+  Jet energy: 0.00012765
+  Others: 0.00078747
+- Data stat.: 0.00077314
+  Unfolding stat.: 0.00061538
+  Unfolding model: 0.00010483
+  Int. luminosity: 0.0021829
+  Lepton energy: 0.0015795
+  Efficiency: 0.0022071
+  Backgrounds: 0.00085223
+  Jet energy: 0.00017585
+  Others: 0.00060373
+- Data stat.: 0.00045268
+  Unfolding stat.: 0.00038664
+  Unfolding model: 6.5023e-05
+  Int. luminosity: 0.0013372
+  Lepton energy: 0.00083764
+  Efficiency: 0.00137
+  Backgrounds: 0.00075773
+  Jet energy: 0.00016154
+  Others: 0.00046909
+- Data stat.: 0.00020336
+  Unfolding stat.: 0.00018013
+  Unfolding model: 1.3056e-05
+  Int. luminosity: 0.00064033
+  Lepton energy: 0.00039516
+  Efficiency: 0.00064869
+  Backgrounds: 0.00055543
+  Jet energy: 9.1407e-05
+  Others: 0.00022932
+- Data stat.: 6.3898e-05
+  Unfolding stat.: 5.9021e-05
+  Unfolding model: 1.635e-05
+  Int. luminosity: 0.00015966
+  Lepton energy: 0.00011835
+  Efficiency: 0.00017497
+  Backgrounds: 0.00016467
+  Jet energy: 2.9876e-05
+  Others: 6.5856e-05
+- Data stat.: 2.1684e-05
+  Unfolding stat.: 2.2155e-05
+  Unfolding model: 1.4152e-06
+  Int. luminosity: 2.3677e-05
+  Lepton energy: 1.5605e-05
+  Efficiency: 3.2013e-05
+  Backgrounds: 1.4748e-05
+  Jet energy: 2.305e-06
+  Others: 6.4909e-06
+- Data stat.: 1.3557e-06
+  Unfolding stat.: 1.3899e-06
+  Unfolding model: 2.5271e-07
+  Int. luminosity: 7.6493e-07
+  Lepton energy: 4.9106e-07
+  Efficiency: 1.1311e-06
+  Backgrounds: 4.7202e-07
+  Jet energy: 7.0224e-08
+  Others: 2.7446e-07
+- Data stat.: 0.0012611
+  Unfolding stat.: 0.0006568
+  Unfolding model: 0.00047534
+  Int. luminosity: 0.0011088
+  Lepton energy: 0.0006086
+  Efficiency: 0.0016157
+  Backgrounds: 0.0004039
+  Jet energy: 6.8974e-06
+  Others: 0.00035657
+- Data stat.: 0.0012514
+  Unfolding stat.: 0.00065743
+  Unfolding model: 0.0007246
+  Int. luminosity: 0.0010703
+  Lepton energy: 0.0003358
+  Efficiency: 0.0015886
+  Backgrounds: 0.00039192
+  Jet energy: 6.88e-05
+  Others: 0.00024013
+- Data stat.: 0.001224
+  Unfolding stat.: 0.00064179
+  Unfolding model: 0.00080475
+  Int. luminosity: 0.0010225
+  Lepton energy: 0.00040152
+  Efficiency: 0.0015112
+  Backgrounds: 0.00042687
+  Jet energy: 6.3008e-05
+  Others: 0.00039858
+- Data stat.: 0.0011651
+  Unfolding stat.: 0.00060914
+  Unfolding model: 0.00074283
+  Int. luminosity: 0.00094498
+  Lepton energy: 0.0003748
+  Efficiency: 0.0013599
+  Backgrounds: 0.00043673
+  Jet energy: 6.7589e-05
+  Others: 0.00034801
+- Data stat.: 0.0011197
+  Unfolding stat.: 0.00057219
+  Unfolding model: 0.00060529
+  Int. luminosity: 0.0008226
+  Lepton energy: 0.00040727
+  Efficiency: 0.001158
+  Backgrounds: 0.00042671
+  Jet energy: 3.4674e-05
+  Others: 0.00034298
+- Data stat.: 0.00077699
+  Unfolding stat.: 0.00039603
+  Unfolding model: 0.00066502
+  Int. luminosity: 0.00070013
+  Lepton energy: 0.00031098
+  Efficiency: 0.0010348
+  Backgrounds: 0.00036453
+  Jet energy: 4.7007e-05
+  Others: 6.4583e-05
+- Data stat.: 0.00077003
+  Unfolding stat.: 0.00038884
+  Unfolding model: 0.00037507
+  Int. luminosity: 0.0006001
+  Lepton energy: 0.00018669
+  Efficiency: 0.00083552
+  Backgrounds: 0.00038119
+  Jet energy: 2.7276e-05
+  Others: 0.00014025
+- Data stat.: 0.00056202
+  Unfolding stat.: 0.00028358
+  Unfolding model: 0.0003867
+  Int. luminosity: 0.0004745
+  Lepton energy: 0.00021588
+  Efficiency: 0.00063479
+  Backgrounds: 0.0003707
+  Jet energy: 4.1372e-05
+  Others: 0.00015137
+- Data stat.: 0.0001809
+  Unfolding stat.: 9.9836e-05
+  Unfolding model: 1.8559e-05
+  Int. luminosity: 0.00030247
+  Lepton energy: 0.00010341
+  Efficiency: 0.00038343
+  Backgrounds: 0.00037165
+  Jet energy: 5.2634e-05
+  Others: 0.00010144
+- Data stat.: 4.2161e-05
+  Unfolding stat.: 2.1622e-05
+  Unfolding model: 1.5143e-05
+  Int. luminosity: 8.246e-05
+  Lepton energy: 4.4444e-05
+  Efficiency: 8.1294e-05
+  Backgrounds: 0.00017629
+  Jet energy: 2.9165e-05
+  Others: 1.6188e-05
+- Data stat.: 2.0181e-06
+  Unfolding stat.: 1.1279e-06
+  Unfolding model: 6.2356e-08
+  Int. luminosity: 1.6154e-06
+  Lepton energy: 3.4583e-06
+  Efficiency: 2.3021e-06
+  Backgrounds: 2.395e-06
+  Jet energy: 3.8535e-07
+  Others: 1.5562e-07
+- Data stat.: 0.00037839
+  Unfolding stat.: 0.00011649
+  Unfolding model: 0.00014386
+  Int. luminosity: 9.0336e-05
+  Lepton energy: 0.00014317
+  Efficiency: 0.00015637
+  Backgrounds: 4.397e-05
+  Jet energy: 4.5782e-07
+  Others: 4.0138e-05
+- Data stat.: 0.00036654
+  Unfolding stat.: 0.0001121
+  Unfolding model: 3.0691e-05
+  Int. luminosity: 8.6017e-05
+  Lepton energy: 0.0001234
+  Efficiency: 0.00015053
+  Backgrounds: 2.2779e-05
+  Jet energy: 3.5745e-06
+  Others: 3.9597e-05
+- Data stat.: 0.00033726
+  Unfolding stat.: 0.00010504
+  Unfolding model: 0.00011385
+  Int. luminosity: 7.5391e-05
+  Lepton energy: 6.3459e-05
+  Efficiency: 0.00013504
+  Backgrounds: 1.9512e-05
+  Jet energy: 8.4474e-06
+  Others: 4.0985e-05
+- Data stat.: 0.00035578
+  Unfolding stat.: 0.0001074
+  Unfolding model: 0.00018158
+  Int. luminosity: 7.4391e-05
+  Lepton energy: 3.4407e-05
+  Efficiency: 0.00012618
+  Backgrounds: 4.0363e-05
+  Jet energy: 1.4749e-06
+  Others: 3.648e-05
+- Data stat.: 0.00032693
+  Unfolding stat.: 9.937e-05
+  Unfolding model: 0.0001435
+  Int. luminosity: 6.6968e-05
+  Lepton energy: 2.8957e-05
+  Efficiency: 0.00011085
+  Backgrounds: 6.9448e-05
+  Jet energy: 1.4751e-06
+  Others: 3.2506e-05
+- Data stat.: 0.00029204
+  Unfolding stat.: 8.8605e-05
+  Unfolding model: 3.5417e-05
+  Int. luminosity: 6.492e-05
+  Lepton energy: 1.6724e-05
+  Efficiency: 0.00010783
+  Backgrounds: 7.2037e-05
+  Jet energy: 8.0529e-07
+  Others: 2.7093e-05
+- Data stat.: 0.00028087
+  Unfolding stat.: 9.0018e-05
+  Unfolding model: 6.5164e-05
+  Int. luminosity: 5.8385e-05
+  Lepton energy: 1.855e-05
+  Efficiency: 9.6505e-05
+  Backgrounds: 5.7071e-05
+  Jet energy: 6.448e-06
+  Others: 2.3351e-05
+- Data stat.: 0.00025308
+  Unfolding stat.: 8.3498e-05
+  Unfolding model: 0.00014292
+  Int. luminosity: 5.2936e-05
+  Lepton energy: 4.8075e-05
+  Efficiency: 8.3615e-05
+  Backgrounds: 5.2583e-05
+  Jet energy: 9.2384e-06
+  Others: 1.3277e-05
+- Data stat.: 9.1275e-05
+  Unfolding stat.: 3.0305e-05
+  Unfolding model: 5.1798e-05
+  Int. luminosity: 3.1416e-05
+  Lepton energy: 2.411e-05
+  Efficiency: 3.9469e-05
+  Backgrounds: 5.1012e-05
+  Jet energy: 5.1131e-06
+  Others: 1.5135e-05
+- Data stat.: 2.4725e-05
+  Unfolding stat.: 7.8213e-06
+  Unfolding model: 3.964e-07
+  Int. luminosity: 1.1015e-05
+  Lepton energy: 6.2416e-06
+  Efficiency: 1.0517e-05
+  Backgrounds: 2.6267e-05
+  Jet energy: 2.2636e-06
+  Others: 1.5407e-06
+- Data stat.: 1.6817e-06
+  Unfolding stat.: 6.0878e-07
+  Unfolding model: 1.0253e-08
+  Int. luminosity: 4.3891e-07
+  Lepton energy: 8.2358e-07
+  Efficiency: 4.5956e-07
+  Backgrounds: 9.6731e-07
+  Jet energy: 2.9718e-08
+  Others: 1.0503e-07
diff --git a/nnpdf_data/nnpdf_data/process_options.py b/nnpdf_data/nnpdf_data/process_options.py
index 73e3dba6fe..189b1a65e3 100644
--- a/nnpdf_data/nnpdf_data/process_options.py
+++ b/nnpdf_data/nnpdf_data/process_options.py
@@ -279,8 +279,10 @@ def _dybosonpt_xq2map(kin_dict):
     Here pT refers to the transverse momentum of the boson.
     """
     pT = kin_dict[_Vars.pT]
-    m_Z2 = kin_dict.get_one_of(_Vars.m_Z2, _Vars.m_W2, _Vars.m_ll2)
-
+    try:
+        m_Z2 = kin_dict.get_one_of(_Vars.m_ll, _Vars.m_Z, _Vars.m_W) ** 2
+    except KeyError:
+        m_Z2 = kin_dict.get_one_of(_Vars.m_ll2, _Vars.m_Z2, _Vars.m_W2)
     sqrts = kin_dict[_Vars.sqrts]
     ET2 = m_Z2 + pT * pT
     x = (np.sqrt(ET2) + pT) / sqrts
@@ -294,7 +296,10 @@ def _dybosonptrap_xq2map(kin_info):
     """
     pT = kin_info[_Vars.pT]
     eta = kin_info.get_one_of(_Vars.eta, _Vars.y, _Vars.abs_y)
-    m_ll2 = kin_info.get_one_of(_Vars.m_ll2, _Vars.m_Z2)
+    try:
+        m_ll2 = kin_info.get_one_of(_Vars.m_ll, _Vars.m_Z, _Vars.m_W) ** 2
+    except KeyError:
+        m_ll2 = kin_info.get_one_of(_Vars.m_ll2, _Vars.m_Z2, _Vars.m_W2)
     sqrts = kin_info[_Vars.sqrts]
     ET2 = m_ll2 + pT * pT
     x1 = (np.sqrt(ET2) + pT) / sqrts * np.exp(-eta)
@@ -460,7 +465,17 @@ def _dymll_xq2map(kin_info):
 DY_PT = _Process(
     "DY_PT",
     "DY W or Z (2 leptons) + j boson transverse momentum",
-    accepted_variables=(_Vars.pT, _Vars.m_W2, _Vars.m_Z2, _Vars.sqrts, _Vars.y, _Vars.m_ll2),
+    accepted_variables=(
+        _Vars.pT,
+        _Vars.m_W2,
+        _Vars.m_Z2,
+        _Vars.m_Z,
+        _Vars.m_W,
+        _Vars.sqrts,
+        _Vars.y,
+        _Vars.m_ll2,
+        _Vars.m_ll,
+    ),
     xq2map_function=_dybosonpt_xq2map,
 )
 
@@ -471,11 +486,14 @@ def _dymll_xq2map(kin_info):
         _Vars.pT,
         _Vars.m_W2,
         _Vars.m_Z2,
+        _Vars.m_W,
+        _Vars.m_Z,
         _Vars.sqrts,
         _Vars.y,
         _Vars.abs_y,
         _Vars.eta,
         _Vars.m_ll2,
+        _Vars.m_ll,
     ),
     xq2map_function=_dybosonptrap_xq2map,
 )
diff --git a/validphys2/src/validphys/cuts/filters.yaml b/validphys2/src/validphys/cuts/filters.yaml
index ffb44c674d..b147702542 100644
--- a/validphys2/src/validphys/cuts/filters.yaml
+++ b/validphys2/src/validphys/cuts/filters.yaml
@@ -254,7 +254,7 @@
 
 - dataset: ATLAS_Z0J_13TEV_PT_LL
   reason: Avoid the large pT region where the statistics are not very good.
-  rule: "pT <= 600"
+  rule: "pT <= 1000"
 
 - dataset: CMS_Z0J_8TEV_PT-Y
   reason: Avoid the region where resummation effects become important.
@@ -270,6 +270,10 @@
     description due to unknown reasons.
   rule: "abs_y <= 1.6"
 
+- dataset: CMS_Z0J_13TEV_PT-M
+  reason: Avoid the region where resummation effects become important.
+  rule: "pT >= 30 and m_ll >= 76"
+
 - dataset: ATLAS_Z0_8TEV_LOWMASS_M-Y
   reason: Avoid overlap with the high mass ATLAS2DDY8TEV dataset.
   local_variables: