diff --git a/n3fit/runcards/examples/nnpdfpol20_hyperopt.yml b/n3fit/runcards/examples/nnpdfpol20_hyperopt.yml
index 8345810818..a6c96776a6 100644
--- a/n3fit/runcards/examples/nnpdfpol20_hyperopt.yml
+++ b/n3fit/runcards/examples/nnpdfpol20_hyperopt.yml
@@ -34,31 +34,31 @@ dataset_inputs:
 - {dataset: STAR_WMWP_510GEV_WM-AL, frac: 0.60, cfac: []}
 - {dataset: STAR_WMWP_510GEV_WP-AL, frac: 0.60, cfac: []}
 # Polarized Jet datasets
-- {dataset: STAR_2005_1JET_200GEV_ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2006_1JET_200GEV_ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2009_1JET_200GEV_CC-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2009_1JET_200GEV_CF-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2012_1JET_510GEV_ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2013_1JET_510GEV_ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2015_1JET_200GEV_CC-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2015_1JET_200GEV_CF-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2005_1JET_200GEV_ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2006_1JET_200GEV_ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2009_1JET_200GEV_CC-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2009_1JET_200GEV_CF-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2012_1JET_510GEV_ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2013_1JET_510GEV_ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2015_1JET_200GEV_CC-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2015_1JET_200GEV_CF-ALL, frac: 0.60, cfac: []}
 - {dataset: PHENIX_1JET_200GEV_ALL, frac: 0.60, cfac: []}
 # Poalrized Dijet datasets
-- {dataset: STAR_2009_2JET_200GEV_A-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2009_2JET_200GEV_B-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2009_2JET_200GEV_C-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2009_2JET_MIDRAP_200GEV_OS-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2009_2JET_MIDRAP_200GEV_SS-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2012_2JET_510GEV_A-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2012_2JET_510GEV_B-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2012_2JET_510GEV_C-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2012_2JET_510GEV_D-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2013_2JET_510GEV_A-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2013_2JET_510GEV_B-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2013_2JET_510GEV_C-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2013_2JET_510GEV_D-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2015_2JET_MIDRAP_200GEV_OS-ALL, frac: 0.60, cfac: []}
-- {dataset: STAR_2015_2JET_MIDRAP_200GEV_SS-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2009_2JET_200GEV_A-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2009_2JET_200GEV_B-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2009_2JET_200GEV_C-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2009_2JET_200GEV_MIDRAP_OS-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2009_2JET_200GEV_MIDRAP_SS-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2012_2JET_510GEV_A-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2012_2JET_510GEV_B-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2012_2JET_510GEV_C-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2012_2JET_510GEV_D-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2013_2JET_510GEV_A-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2013_2JET_510GEV_B-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2013_2JET_510GEV_C-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2013_2JET_510GEV_D-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2015_2JET_200GEV_MIDRAP_OS-ALL, frac: 0.60, cfac: []}
+- {dataset: STAR-2015_2JET_200GEV_MIDRAP_SS-ALL, frac: 0.60, cfac: []}
 
 ############################################################
 datacuts:
@@ -133,47 +133,47 @@ kfold:
     - E142_NC_NOTFIXED_EN_G1
     - E155_NC_9GEV_EN_G1F1RATIO
     - HERMES_NC_7GEV_ED_G1
-    - STAR_2005_1JET_200GEV_ALL
-    - STAR_2012_1JET_510GEV_ALL
-    - STAR_2009_2JET_200GEV_A-ALL
-    - STAR_2009_2JET_MIDRAP_200GEV_SS-ALL
-    - STAR_2012_2JET_510GEV_A-ALL
-    - STAR_2013_2JET_510GEV_D-ALL
+    - STAR-2005_1JET_200GEV_ALL
+    - STAR-2012_1JET_510GEV_ALL
+    - STAR-2009_2JET_200GEV_A-ALL
+    - STAR-2009_2JET_200GEV_MIDRAP_SS-ALL
+    - STAR-2012_2JET_510GEV_A-ALL
+    - STAR-2013_2JET_510GEV_D-ALL
     - STAR_WMWP_510GEV_WM-AL # W-
   - datasets:
     - COMPASS15_NC_NOTFIXED_MUD_G1
     - E155_NC_9GEV_EP_G1F1RATIO
     - EMC_NC_NOTFIXED_MUP_G1
     - HERMES_NC_7GEV_EP_G1
-    - STAR_2006_1JET_200GEV_ALL
-    - STAR_2013_1JET_510GEV_ALL
-    - STAR_2009_2JET_200GEV_B-ALL
-    - STAR_2012_2JET_510GEV_B-ALL
-    - STAR_2013_2JET_510GEV_C-ALL
-    - STAR_2015_2JET_MIDRAP_200GEV_OS-ALL
+    - STAR-2006_1JET_200GEV_ALL
+    - STAR-2013_1JET_510GEV_ALL
+    - STAR-2009_2JET_200GEV_B-ALL
+    - STAR-2012_2JET_510GEV_B-ALL
+    - STAR-2013_2JET_510GEV_C-ALL
+    - STAR-2015_2JET_200GEV_MIDRAP_OS-ALL
     - STAR_WMWP_510GEV_WP-AL # W+
   - datasets:
     - E143_NC_NOTFIXED_EP_G1
     - HERMES97_NC_7GEV_EN_G1
     - SMC_NC_NOTFIXED_MUD_G1
     - SMCSX_NC_17GEV_MUP_G1F1RATIO
-    - STAR_2009_1JET_200GEV_CC-ALL
-    - STAR_2015_1JET_200GEV_CC-ALL
-    - STAR_2009_2JET_200GEV_C-ALL
-    - STAR_2012_2JET_510GEV_C-ALL
-    - STAR_2013_2JET_510GEV_B-ALL
-    - STAR_2015_2JET_MIDRAP_200GEV_SS-ALL
+    - STAR-2009_1JET_200GEV_CC-ALL
+    - STAR-2015_1JET_200GEV_CC-ALL
+    - STAR-2009_2JET_200GEV_C-ALL
+    - STAR-2012_2JET_510GEV_C-ALL
+    - STAR-2013_2JET_510GEV_B-ALL
+    - STAR-2015_2JET_200GEV_MIDRAP_SS-ALL
     - STAR_WMWP_510GEV_WM-AL # W-
   - datasets:
     - E143_NC_NOTFIXED_ED_G1
     - E154_NC_9GEV_EN_G1
     - SMC_NC_NOTFIXED_MUP_G1
     - SMCSX_NC_24GEV_MUD_G1F1RATIO
-    - STAR_2009_1JET_200GEV_CF-ALL
-    - STAR_2015_1JET_200GEV_CF-ALL
-    - STAR_2009_2JET_MIDRAP_200GEV_OS-ALL
-    - STAR_2012_2JET_510GEV_D-ALL
-    - STAR_2013_2JET_510GEV_A-ALL
+    - STAR-2009_1JET_200GEV_CF-ALL
+    - STAR-2015_1JET_200GEV_CF-ALL
+    - STAR-2009_2JET_200GEV_MIDRAP_OS-ALL
+    - STAR-2012_2JET_510GEV_D-ALL
+    - STAR-2013_2JET_510GEV_A-ALL
     - PHENIX_1JET_200GEV_ALL
     - STAR_WMWP_510GEV_WP-AL # W+
 
diff --git a/nnpdf_data/nnpdf_data/theory_cards/41100001.yaml b/nnpdf_data/nnpdf_data/theory_cards/41100001.yaml
index 5964952472..6c748d2cde 100644
--- a/nnpdf_data/nnpdf_data/theory_cards/41100001.yaml
+++ b/nnpdf_data/nnpdf_data/theory_cards/41100001.yaml
@@ -22,7 +22,7 @@ MW: 80.398
 MZ: 91.1876
 MaxNfPdf: 5
 ModEv: TRN
-ModSV: null
+ModSV: expanded
 NfFF: 4
 PTO: 2
 Q0: 1.0
diff --git a/nnpdf_data/nnpdf_data/theory_cards/41100002.yaml b/nnpdf_data/nnpdf_data/theory_cards/41100002.yaml
index bbfc4ed69e..a96f025339 100644
--- a/nnpdf_data/nnpdf_data/theory_cards/41100002.yaml
+++ b/nnpdf_data/nnpdf_data/theory_cards/41100002.yaml
@@ -22,7 +22,7 @@ MW: 80.398
 MZ: 91.1876
 MaxNfPdf: 5
 ModEv: TRN
-ModSV: null
+ModSV: expanded
 NfFF: 4
 PTO: 2
 Q0: 1.0
diff --git a/nnpdf_data/nnpdf_data/theory_cards/41100003.yaml b/nnpdf_data/nnpdf_data/theory_cards/41100003.yaml
index ff5d050587..ab9b45e5b2 100644
--- a/nnpdf_data/nnpdf_data/theory_cards/41100003.yaml
+++ b/nnpdf_data/nnpdf_data/theory_cards/41100003.yaml
@@ -22,7 +22,7 @@ MW: 80.398
 MZ: 91.1876
 MaxNfPdf: 5
 ModEv: TRN
-ModSV: null
+ModSV: expanded
 NfFF: 4
 PTO: 2
 Q0: 1.0
diff --git a/nnpdf_data/nnpdf_data/theory_cards/41100006.yaml b/nnpdf_data/nnpdf_data/theory_cards/41100006.yaml
index ddbb47c133..c3ba183b5a 100644
--- a/nnpdf_data/nnpdf_data/theory_cards/41100006.yaml
+++ b/nnpdf_data/nnpdf_data/theory_cards/41100006.yaml
@@ -22,7 +22,7 @@ MW: 80.398
 MZ: 91.1876
 MaxNfPdf: 5
 ModEv: TRN
-ModSV: null
+ModSV: expanded
 NfFF: 4
 PTO: 2
 Q0: 1.0
diff --git a/nnpdf_data/nnpdf_data/theory_cards/41100007.yaml b/nnpdf_data/nnpdf_data/theory_cards/41100007.yaml
index 24b123771c..9bbf23b175 100644
--- a/nnpdf_data/nnpdf_data/theory_cards/41100007.yaml
+++ b/nnpdf_data/nnpdf_data/theory_cards/41100007.yaml
@@ -22,7 +22,7 @@ MW: 80.398
 MZ: 91.1876
 MaxNfPdf: 5
 ModEv: TRN
-ModSV: null
+ModSV: expanded
 NfFF: 4
 PTO: 2
 Q0: 1.0
diff --git a/nnpdf_data/nnpdf_data/theory_cards/41100008.yaml b/nnpdf_data/nnpdf_data/theory_cards/41100008.yaml
index e0ed833898..e50b299676 100644
--- a/nnpdf_data/nnpdf_data/theory_cards/41100008.yaml
+++ b/nnpdf_data/nnpdf_data/theory_cards/41100008.yaml
@@ -22,7 +22,7 @@ MW: 80.398
 MZ: 91.1876
 MaxNfPdf: 5
 ModEv: TRN
-ModSV: null
+ModSV: expanded
 NfFF: 4
 PTO: 2
 Q0: 1.0
diff --git a/nnpdf_data/nnpdf_data/theory_cards/41100011.yaml b/nnpdf_data/nnpdf_data/theory_cards/41100011.yaml
index e058463c3b..76c97e5a35 100644
--- a/nnpdf_data/nnpdf_data/theory_cards/41100011.yaml
+++ b/nnpdf_data/nnpdf_data/theory_cards/41100011.yaml
@@ -22,7 +22,7 @@ MW: 80.398
 MZ: 91.1876
 MaxNfPdf: 5
 ModEv: TRN
-ModSV: null
+ModSV: expanded
 NfFF: 4
 PTO: 1
 Q0: 1.0
diff --git a/nnpdf_data/nnpdf_data/theory_cards/41100012.yaml b/nnpdf_data/nnpdf_data/theory_cards/41100012.yaml
index c0ec3cd6f6..6b8226afc1 100644
--- a/nnpdf_data/nnpdf_data/theory_cards/41100012.yaml
+++ b/nnpdf_data/nnpdf_data/theory_cards/41100012.yaml
@@ -22,7 +22,7 @@ MW: 80.398
 MZ: 91.1876
 MaxNfPdf: 5
 ModEv: TRN
-ModSV: null
+ModSV: expanded
 NfFF: 4
 PTO: 1
 Q0: 1.0
diff --git a/nnpdf_data/nnpdf_data/theory_cards/41100013.yaml b/nnpdf_data/nnpdf_data/theory_cards/41100013.yaml
index f84868e04e..084539bea6 100644
--- a/nnpdf_data/nnpdf_data/theory_cards/41100013.yaml
+++ b/nnpdf_data/nnpdf_data/theory_cards/41100013.yaml
@@ -22,7 +22,7 @@ MW: 80.398
 MZ: 91.1876
 MaxNfPdf: 5
 ModEv: TRN
-ModSV: null
+ModSV: expanded
 NfFF: 4
 PTO: 1
 Q0: 1.0
diff --git a/nnpdf_data/nnpdf_data/theory_cards/41100016.yaml b/nnpdf_data/nnpdf_data/theory_cards/41100016.yaml
index 2c5257c0d9..ca7024b874 100644
--- a/nnpdf_data/nnpdf_data/theory_cards/41100016.yaml
+++ b/nnpdf_data/nnpdf_data/theory_cards/41100016.yaml
@@ -22,7 +22,7 @@ MW: 80.398
 MZ: 91.1876
 MaxNfPdf: 5
 ModEv: TRN
-ModSV: null
+ModSV: expanded
 NfFF: 4
 PTO: 1
 Q0: 1.0
diff --git a/nnpdf_data/nnpdf_data/theory_cards/41100017.yaml b/nnpdf_data/nnpdf_data/theory_cards/41100017.yaml
index f309abba87..14d45c5d35 100644
--- a/nnpdf_data/nnpdf_data/theory_cards/41100017.yaml
+++ b/nnpdf_data/nnpdf_data/theory_cards/41100017.yaml
@@ -22,7 +22,7 @@ MW: 80.398
 MZ: 91.1876
 MaxNfPdf: 5
 ModEv: TRN
-ModSV: null
+ModSV: expanded
 NfFF: 4
 PTO: 1
 Q0: 1.0
diff --git a/nnpdf_data/nnpdf_data/theory_cards/41100018.yaml b/nnpdf_data/nnpdf_data/theory_cards/41100018.yaml
index c65f612483..d52f412626 100644
--- a/nnpdf_data/nnpdf_data/theory_cards/41100018.yaml
+++ b/nnpdf_data/nnpdf_data/theory_cards/41100018.yaml
@@ -22,7 +22,7 @@ MW: 80.398
 MZ: 91.1876
 MaxNfPdf: 5
 ModEv: TRN
-ModSV: null
+ModSV: expanded
 NfFF: 4
 PTO: 1
 Q0: 1.0