diff --git a/extras/data/ATHENA/ATHENA_ALL_EP.xlsx b/extras/data/ATHENA/ATHENA_ALL_EP.xlsx
new file mode 100644
index 00000000..c1a45449
Binary files /dev/null and b/extras/data/ATHENA/ATHENA_ALL_EP.xlsx differ
diff --git a/extras/data/ATHENA/athena_105gev_ep b/extras/data/ATHENA/athena_105gev_ep
new file mode 100644
index 00000000..442c79fe
--- /dev/null
+++ b/extras/data/ATHENA/athena_105gev_ep
@@ -0,0 +1,123 @@
+0.000205	1.29	0.574
+0.000325	1.29	0.362
+0.000325	2.05	0.574
+0.000515	1.29	0.228
+0.000515	2.05	0.362
+0.000515	3.25	0.574
+0.000815	1.29	0.144
+0.000815	2.05	0.228
+0.000815	3.25	0.362
+0.000815	5.15	0.574
+0.00129	1.29	0.0909
+0.00129	2.05	0.144
+0.00129	3.25	0.228
+0.00129	5.15	0.362
+0.00129	8.15	0.574
+0.00205	1.29	0.0574
+0.00205	2.05	0.0909
+0.00205	3.25	0.144
+0.00205	5.15	0.228
+0.00205	8.15	0.362
+0.00205	12.9	0.574
+0.00325	1.29	0.0362
+0.00325	2.05	0.0574
+0.00325	3.25	0.0909
+0.00325	5.15	0.144
+0.00325	8.15	0.228
+0.00325	12.9	0.362
+0.00325	20.5	0.574
+0.00515	1.29	0.0228
+0.00515	2.05	0.0362
+0.00515	3.25	0.0574
+0.00515	5.15	0.0909
+0.00515	8.15	0.144
+0.00515	12.9	0.228
+0.00515	20.5	0.362
+0.00515	32.5	0.574
+0.00815	2.05	0.0228
+0.00815	3.25	0.0362
+0.00815	5.15	0.0574
+0.00815	8.15	0.0909
+0.00815	12.9	0.144
+0.00815	20.5	0.228
+0.00815	32.5	0.362
+0.00815	51.5	0.574
+0.0129	3.25	0.0228
+0.0129	5.15	0.0362
+0.0129	8.15	0.0574
+0.0129	12.9	0.0909
+0.0129	20.5	0.144
+0.0129	32.5	0.228
+0.0129	51.5	0.362
+0.0129	81.5	0.574
+0.0205	5.15	0.0228
+0.0205	8.15	0.0362
+0.0205	12.9	0.0574
+0.0205	20.5	0.0909
+0.0205	32.5	0.144
+0.0205	51.5	0.228
+0.0205	81.5	0.362
+0.0205	129	0.574
+0.0325	8.15	0.0228
+0.0325	12.9	0.0362
+0.0325	20.5	0.0574
+0.0325	32.5	0.0909
+0.0325	51.5	0.144
+0.0325	81.5	0.228
+0.0325	129	0.362
+0.0325	205	0.574
+0.0515	12.9	0.0228
+0.0515	20.5	0.0362
+0.0515	32.5	0.0574
+0.0515	51.5	0.0909
+0.0515	81.5	0.144
+0.0515	129	0.228
+0.0515	205	0.362
+0.0515	325	0.574
+0.0815	20.5	0.0228
+0.0815	32.5	0.0362
+0.0815	51.5	0.0574
+0.0815	81.5	0.0909
+0.0815	129	0.144
+0.0815	205	0.228
+0.0815	325	0.362
+0.0815	515	0.574
+0.129	32.5	0.0228
+0.129	51.5	0.0362
+0.129	81.5	0.0574
+0.129	129	0.0909
+0.129	205	0.144
+0.129	325	0.228
+0.129	515	0.362
+0.129	815	0.574
+0.205	51.5	0.0228
+0.205	81.5	0.0362
+0.205	129	0.0574
+0.205	205	0.0909
+0.205	325	0.144
+0.205	515	0.228
+0.205	815	0.362
+0.205	1.29E+03	0.574
+0.325	81.5	0.0228
+0.325	129	0.0362
+0.325	205	0.0574
+0.325	325	0.0909
+0.325	515	0.144
+0.325	815	0.228
+0.325	1.29E+03	0.362
+0.325	2.05E+03	0.574
+0.515	129	0.0228
+0.515	205	0.0362
+0.515	325	0.0574
+0.515	515	0.0909
+0.515	815	0.144
+0.515	1.29E+03	0.228
+0.515	2.05E+03	0.362
+0.515	3.25E+03	0.574
+0.815	205	0.0228
+0.815	325	0.0362
+0.815	515	0.0574
+0.815	815	0.0909
+0.815	1.29E+03	0.144
+0.815	2.05E+03	0.228
+0.815	3.25E+03	0.362
diff --git a/extras/data/ATHENA/athena_140gev_ep b/extras/data/ATHENA/athena_140gev_ep
new file mode 100644
index 00000000..d95a7591
--- /dev/null
+++ b/extras/data/ATHENA/athena_140gev_ep
@@ -0,0 +1,131 @@
+0.000129	1.29	0.505
+0.000205	1.29	0.319
+0.000205	2.05	0.505
+0.000325	1.29	0.201
+0.000325	2.05	0.319
+0.000325	3.25	0.505
+0.000515	1.29	0.127
+0.000515	2.05	0.201
+0.000515	3.25	0.319
+0.000515	5.15	0.505
+0.000815	1.29	0.08
+0.000815	2.05	0.127
+0.000815	3.25	0.201
+0.000815	5.15	0.319
+0.000815	8.15	0.505
+0.00129	1.29	0.0505
+0.00129	2.05	0.08
+0.00129	3.25	0.127
+0.00129	5.15	0.201
+0.00129	8.15	0.319
+0.00129	12.9	0.505
+0.00205	1.29	0.0319
+0.00205	2.05	0.0505
+0.00205	3.25	0.08
+0.00205	5.15	0.127
+0.00205	8.15	0.201
+0.00205	12.9	0.319
+0.00205	20.5	0.505
+0.00325	1.29	0.0201
+0.00325	2.05	0.0319
+0.00325	3.25	0.0505
+0.00325	5.15	0.08
+0.00325	8.15	0.127
+0.00325	12.9	0.201
+0.00325	20.5	0.319
+0.00325	32.5	0.505
+0.00515	2.05	0.0201
+0.00515	3.25	0.0319
+0.00515	5.15	0.0505
+0.00515	8.15	0.08
+0.00515	12.9	0.127
+0.00515	20.5	0.201
+0.00515	32.5	0.319
+0.00515	51.5	0.505
+0.00815	3.25	0.0201
+0.00815	5.15	0.0319
+0.00815	8.15	0.0505
+0.00815	12.9	0.08
+0.00815	20.5	0.127
+0.00815	32.5	0.201
+0.00815	51.5	0.319
+0.00815	81.5	0.505
+0.0129	5.15	0.0201
+0.0129	8.15	0.0319
+0.0129	12.9	0.0505
+0.0129	20.5	0.08
+0.0129	32.5	0.127
+0.0129	51.5	0.201
+0.0129	81.5	0.319
+0.0129	129	0.505
+0.0205	8.15	0.0201
+0.0205	12.9	0.0319
+0.0205	20.5	0.0505
+0.0205	32.5	0.08
+0.0205	51.5	0.127
+0.0205	81.5	0.201
+0.0205	129	0.319
+0.0205	205	0.505
+0.0325	12.9	0.0201
+0.0325	20.5	0.0319
+0.0325	32.5	0.0505
+0.0325	51.5	0.08
+0.0325	81.5	0.127
+0.0325	129	0.201
+0.0325	205	0.319
+0.0325	325	0.505
+0.0515	20.5	0.0201
+0.0515	32.5	0.0319
+0.0515	51.5	0.0505
+0.0515	81.5	0.08
+0.0515	129	0.127
+0.0515	205	0.201
+0.0515	325	0.319
+0.0515	515	0.505
+0.0815	32.5	0.0201
+0.0815	51.5	0.0319
+0.0815	81.5	0.0505
+0.0815	129	0.08
+0.0815	205	0.127
+0.0815	325	0.201
+0.0815	515	0.319
+0.0815	815	0.505
+0.129	51.5	0.0201
+0.129	81.5	0.0319
+0.129	129	0.0505
+0.129	205	0.08
+0.129	325	0.127
+0.129	515	0.201
+0.129	815	0.319
+0.129	1.29E+03	0.505
+0.205	81.5	0.0201
+0.205	129	0.0319
+0.205	205	0.0505
+0.205	325	0.08
+0.205	515	0.127
+0.205	815	0.201
+0.205	1.29E+03	0.319
+0.205	2.05E+03	0.505
+0.325	129	0.0201
+0.325	205	0.0319
+0.325	325	0.0505
+0.325	515	0.08
+0.325	815	0.127
+0.325	1.29E+03	0.201
+0.325	2.05E+03	0.319
+0.325	3.25E+03	0.505
+0.515	205	0.0201
+0.515	325	0.0319
+0.515	515	0.0505
+0.515	815	0.08
+0.515	1.29E+03	0.127
+0.515	2.05E+03	0.201
+0.515	3.25E+03	0.319
+0.515	5.15E+03	0.505
+0.815	325	0.0201
+0.815	515	0.0319
+0.815	815	0.0505
+0.815	1.29E+03	0.08
+0.815	2.05E+03	0.127
+0.815	3.25E+03	0.201
+0.815	5.15E+03	0.319
diff --git a/extras/data/ATHENA/athena_29gev_ep b/extras/data/ATHENA/athena_29gev_ep
new file mode 100644
index 00000000..ad3c66de
--- /dev/null
+++ b/extras/data/ATHENA/athena_29gev_ep
@@ -0,0 +1,76 @@
+0.00325	1.29	0.485
+0.00515	1.29	0.306
+0.00515	2.05	0.485
+0.00815	1.29	0.193
+0.00815	2.05	0.306
+0.00815	3.25	0.485
+0.0129	1.29	0.122
+0.0129	2.05	0.193
+0.0129	3.25	0.306
+0.0129	5.15	0.485
+0.0205	1.29	0.0769
+0.0205	2.05	0.122
+0.0205	3.25	0.193
+0.0205	5.15	0.306
+0.0205	8.15	0.485
+0.0325	1.29	0.0485
+0.0325	2.05	0.0769
+0.0325	3.25	0.122
+0.0325	5.15	0.193
+0.0325	8.15	0.306
+0.0325	12.9	0.485
+0.0515	1.29	0.0306
+0.0515	2.05	0.0485
+0.0515	3.25	0.0769
+0.0515	5.15	0.122
+0.0515	8.15	0.193
+0.0515	12.9	0.306
+0.0515	20.5	0.485
+0.0815	1.29	0.0193
+0.0815	2.05	0.0306
+0.0815	3.25	0.0485
+0.0815	5.15	0.0769
+0.0815	8.15	0.122
+0.0815	12.9	0.193
+0.0815	20.5	0.306
+0.0815	32.5	0.485
+0.129	2.05	0.0193
+0.129	3.25	0.0306
+0.129	5.15	0.0485
+0.129	8.15	0.0769
+0.129	12.9	0.122
+0.129	20.5	0.193
+0.129	32.5	0.306
+0.129	51.5	0.485
+0.205	3.25	0.0193
+0.205	5.15	0.0306
+0.205	8.15	0.0485
+0.205	12.9	0.0769
+0.205	20.5	0.122
+0.205	32.5	0.193
+0.205	51.5	0.306
+0.205	81.5	0.485
+0.325	5.15	0.0193
+0.325	8.15	0.0306
+0.325	12.9	0.0485
+0.325	20.5	0.0769
+0.325	32.5	0.122
+0.325	51.5	0.193
+0.325	81.5	0.306
+0.325	129	0.485
+0.515	8.15	0.0193
+0.515	12.9	0.0306
+0.515	20.5	0.0485
+0.515	32.5	0.0769
+0.515	51.5	0.122
+0.515	81.5	0.193
+0.515	129	0.306
+0.515	205	0.485
+0.815	12.9	0.0193
+0.815	20.5	0.0306
+0.815	32.5	0.0485
+0.815	51.5	0.0769
+0.815	81.5	0.122
+0.815	129	0.193
+0.815	205	0.306
+0.815	325	0.485
diff --git a/extras/data/ATHENA/athena_45gev_ep b/extras/data/ATHENA/athena_45gev_ep
new file mode 100644
index 00000000..62107b04
--- /dev/null
+++ b/extras/data/ATHENA/athena_45gev_ep
@@ -0,0 +1,92 @@
+0.00129	1.29	0.5
+0.00205	1.29	0.315
+0.00205	2.05	0.5
+0.00325	1.29	0.199
+0.00325	2.05	0.315
+0.00325	3.25	0.5
+0.00515	1.29	0.126
+0.00515	2.05	0.199
+0.00515	3.25	0.315
+0.00515	5.15	0.5
+0.00815	1.29	0.0792
+0.00815	2.05	0.126
+0.00815	3.25	0.199
+0.00815	5.15	0.315
+0.00815	8.15	0.5
+0.0129	1.29	0.05
+0.0129	2.05	0.0792
+0.0129	3.25	0.126
+0.0129	5.15	0.199
+0.0129	8.15	0.315
+0.0129	12.9	0.5
+0.0205	1.29	0.0315
+0.0205	2.05	0.05
+0.0205	3.25	0.0792
+0.0205	5.15	0.126
+0.0205	8.15	0.199
+0.0205	12.9	0.315
+0.0205	20.5	0.5
+0.0325	1.29	0.0199
+0.0325	2.05	0.0315
+0.0325	3.25	0.05
+0.0325	5.15	0.0792
+0.0325	8.15	0.126
+0.0325	12.9	0.199
+0.0325	20.5	0.315
+0.0325	32.5	0.5
+0.0515	2.05	0.0199
+0.0515	3.25	0.0315
+0.0515	5.15	0.05
+0.0515	8.15	0.0792
+0.0515	12.9	0.126
+0.0515	20.5	0.199
+0.0515	32.5	0.315
+0.0515	51.5	0.5
+0.0815	3.25	0.0199
+0.0815	5.15	0.0315
+0.0815	8.15	0.05
+0.0815	12.9	0.0792
+0.0815	20.5	0.126
+0.0815	32.5	0.199
+0.0815	51.5	0.315
+0.0815	81.5	0.5
+0.129	5.15	0.0199
+0.129	8.15	0.0315
+0.129	12.9	0.05
+0.129	20.5	0.0792
+0.129	32.5	0.126
+0.129	51.5	0.199
+0.129	81.5	0.315
+0.129	129	0.5
+0.205	8.15	0.0199
+0.205	12.9	0.0315
+0.205	20.5	0.05
+0.205	32.5	0.0792
+0.205	51.5	0.126
+0.205	81.5	0.199
+0.205	129	0.315
+0.205	205	0.5
+0.325	12.9	0.0199
+0.325	20.5	0.0315
+0.325	32.5	0.05
+0.325	51.5	0.0792
+0.325	81.5	0.126
+0.325	129	0.199
+0.325	205	0.315
+0.325	325	0.5
+0.515	20.5	0.0199
+0.515	32.5	0.0315
+0.515	51.5	0.05
+0.515	81.5	0.0792
+0.515	129	0.126
+0.515	205	0.199
+0.515	325	0.315
+0.515	515	0.5
+0.815	32.5	0.0199
+0.815	51.5	0.0315
+0.815	81.5	0.05
+0.815	129	0.0792
+0.815	205	0.126
+0.815	325	0.199
+0.815	515	0.315
+0.815	815	0.5
diff --git a/extras/data/ATHENA/athena_63gev_ep b/extras/data/ATHENA/athena_63gev_ep
new file mode 100644
index 00000000..754f5be6
--- /dev/null
+++ b/extras/data/ATHENA/athena_63gev_ep
@@ -0,0 +1,91 @@
+0.000815	1.29	0.396
+0.00129	1.29	0.25
+0.00129	2.05	0.396
+0.00205	1.29	0.158
+0.00205	2.05	0.25
+0.00205	3.25	0.396
+0.00325	1.29	0.0995
+0.00325	2.05	0.158
+0.00325	3.25	0.25
+0.00325	5.15	0.396
+0.00515	1.29	0.0628
+0.00515	2.05	0.0995
+0.00515	3.25	0.158
+0.00515	5.15	0.25
+0.00515	8.15	0.396
+0.00815	1.29	0.0396
+0.00815	2.05	0.0628
+0.00815	3.25	0.0995
+0.00815	5.15	0.158
+0.00815	8.15	0.25
+0.00815	12.9	0.396
+0.0129	1.29	0.025
+0.0129	2.05	0.0396
+0.0129	3.25	0.0628
+0.0129	5.15	0.0995
+0.0129	8.15	0.158
+0.0129	12.9	0.25
+0.0129	20.5	0.396
+0.0205	2.05	0.025
+0.0205	3.25	0.0396
+0.0205	5.15	0.0628
+0.0205	8.15	0.0995
+0.0205	12.9	0.158
+0.0205	20.5	0.25
+0.0205	32.5	0.396
+0.0325	3.25	0.025
+0.0325	5.15	0.0396
+0.0325	8.15	0.0628
+0.0325	12.9	0.0995
+0.0325	20.5	0.158
+0.0325	32.5	0.25
+0.0325	51.5	0.396
+0.0515	5.15	0.025
+0.0515	8.15	0.0396
+0.0515	12.9	0.0628
+0.0515	20.5	0.0995
+0.0515	32.5	0.158
+0.0515	51.5	0.25
+0.0515	81.5	0.396
+0.0815	8.15	0.025
+0.0815	12.9	0.0396
+0.0815	20.5	0.0628
+0.0815	32.5	0.0995
+0.0815	51.5	0.158
+0.0815	81.5	0.25
+0.0815	129	0.396
+0.129	12.9	0.025
+0.129	20.5	0.0396
+0.129	32.5	0.0628
+0.129	51.5	0.0995
+0.129	81.5	0.158
+0.129	129	0.25
+0.129	205	0.396
+0.205	20.5	0.025
+0.205	32.5	0.0396
+0.205	51.5	0.0628
+0.205	81.5	0.0995
+0.205	129	0.158
+0.205	205	0.25
+0.205	325	0.396
+0.325	32.5	0.025
+0.325	51.5	0.0396
+0.325	81.5	0.0628
+0.325	129	0.0995
+0.325	205	0.158
+0.325	325	0.25
+0.325	515	0.396
+0.515	51.5	0.025
+0.515	81.5	0.0396
+0.515	129	0.0628
+0.515	205	0.0995
+0.515	325	0.158
+0.515	515	0.25
+0.515	815	0.396
+0.815	81.5	0.025
+0.815	129	0.0396
+0.815	205	0.0628
+0.815	325	0.0995
+0.815	515	0.158
+0.815	815	0.25
+0.815	1.29E+03	0.396
diff --git a/extras/data/ATHENA/metadata.yaml b/extras/data/ATHENA/metadata.yaml
new file mode 100644
index 00000000..dcb0d7e4
--- /dev/null
+++ b/extras/data/ATHENA/metadata.yaml
@@ -0,0 +1,67 @@
+nnpdf_id: null
+fktable_id: null
+
+# For Sqrt_s=29 GeV and beam energies (5, 41) GeV
+ATHENA_NC_29GEV_EP_G1:
+  description: polarized structure function $g_1$ from ATHENA projections
+  y_label: 2xg1
+  y_label_tex: $2xg_1$
+  hepdata: null
+
+ATHENA_NC_29GEV_EP_F1:
+  description: unpolarized structure function $F_1$ from ATHENA projections
+  y_label: 2xF1
+  y_label_tex: $2xF_1$
+  hepdata: null
+
+# For Sqrt_s=45 GeV and beam energies (5, 100) GeV
+ATHENA_NC_45GEV_EP_G1:
+  description: polarized structure function $g_1$ from ATHENA projections
+  y_label: 2xg1
+  y_label_tex: $2xg_1$
+  hepdata: null
+
+ATHENA_NC_45GEV_EP_F1:
+  description: unpolarized structure function $F_1$ from ATHENA projections
+  y_label: 2xF1
+  y_label_tex: $2xF_1$
+  hepdata: null
+
+# For Sqrt_s=63 GeV and beam energies (10, 100) GeV
+ATHENA_NC_63GEV_EP_G1:
+  description: polarized structure function $g_1$ from ATHENA projections
+  y_label: 2xg1
+  y_label_tex: $2xg_1$
+  hepdata: null
+
+ATHENA_NC_63GEV_EP_F1:
+  description: unpolarized structure function $F_1$ from ATHENA projections
+  y_label: 2xF1
+  y_label_tex: $2xF_1$
+  hepdata: null
+
+# For Sqrt_s=105 GeV and beam energies (10, 275) GeV
+ATHENA_NC_105GEV_EP_G1:
+  description: polarized structure function $g_1$ from ATHENA projections
+  y_label: 2xg1
+  y_label_tex: $2xg_1$
+  hepdata: null
+
+ATHENA_NC_105GEV_EP_F1:
+  description: unpolarized structure function $F_1$ from ATHENA projections
+  y_label: 2xF1
+  y_label_tex: $2xF_1$
+  hepdata: null
+
+# For Sqrt_s=140 GeV and beam energies (18, 275) GeV
+ATHENA_NC_140GEV_EP_G1:
+  description: polarized structure function $g_1$ from ATHENA projections
+  y_label: 2xg1
+  y_label_tex: $2xg_1$
+  hepdata: null
+
+ATHENA_NC_140GEV_EP_F1:
+  description: unpolarized structure function $F_1$ from ATHENA projections
+  y_label: 2xF1
+  y_label_tex: $2xF_1$
+  hepdata: null
diff --git a/extras/data/EIC/EIC_18_275_A1c_100fb-1.txt b/extras/data/EIC/EIC_18_275_A1c_100fb-1.txt
new file mode 100644
index 00000000..efb8cd8a
--- /dev/null
+++ b/extras/data/EIC/EIC_18_275_A1c_100fb-1.txt
@@ -0,0 +1,11 @@
+0.000240225     2.73001 0.00260049
+0.000393498     3.45159 0.0032644
+0.000556682     4.03062 0.00393122
+0.000760131     4.63043 0.00450892
+0.001018        5.29036 0.00525977
+0.00135955      5.97483 0.00597521
+0.00182221      6.79478 0.00679294
+0.00247674      8.30593 0.00758583
+0.0035644       11.4853 0.00805148
+0.00577839      17.8019 0.00877917
+0.0182267       52.3854 0.0101136
diff --git a/extras/data/EIC/EIC_5_100_A1c_100fb-1.txt b/extras/data/EIC/EIC_5_100_A1c_100fb-1.txt
new file mode 100644
index 00000000..543cdf9e
--- /dev/null
+++ b/extras/data/EIC/EIC_5_100_A1c_100fb-1.txt
@@ -0,0 +1,10 @@
+0.00210275      2.61524 0.0044181
+0.00318165      3.22166 0.00523863
+0.00431087      3.76145 0.00594865
+0.00563938      4.26883 0.00659991
+0.0073065       4.85568 0.00739964
+0.00951243      5.58142 0.00834399
+0.012632        6.42464 0.00923507
+0.0174056       7.63892 0.0103193
+0.0260694       9.86135 0.0115804
+0.0627151       20.7037 0.0135544
diff --git a/extras/data/EIC/EIC_5_41_A1c_100fb-1.txt b/extras/data/EIC/EIC_5_41_A1c_100fb-1.txt
new file mode 100644
index 00000000..9343a26d
--- /dev/null
+++ b/extras/data/EIC/EIC_5_41_A1c_100fb-1.txt
@@ -0,0 +1,10 @@
+0.0048499       2.54933 0.00672086
+0.00703289      3.10815 0.00767392
+0.00920086      3.58839 0.00822064
+0.0117715       4.09389 0.00935268
+0.0149141       4.65683 0.00979612
+0.0190106       5.30941 0.0110492
+0.0246448       6.2185  0.0118684
+0.0332428       7.39412 0.0134677
+0.0489573       9.20167 0.0156306
+0.103627        15.9766 0.0205952
diff --git a/extras/data/EIC/metadata.yaml b/extras/data/EIC/metadata.yaml
new file mode 100644
index 00000000..9170f25c
--- /dev/null
+++ b/extras/data/EIC/metadata.yaml
@@ -0,0 +1,41 @@
+nnpdf_id: null
+fktable_id: null
+
+# For Sqrt_s=43 GeV and beam energies (5, 41) GeV
+EIC_NC_43GEV_EP_G1CHARM:
+  description: polarized structure function $g_1^c$ from EIC projections
+  y_label: 2xg1c
+  y_label_tex: $2xg_1^c$
+  hepdata: null
+
+EIC_NC_43GEV_EP_F1CHARM:
+  description: unpolarized structure function $F_1$ from EIC projections
+  y_label: 2xF1
+  y_label_tex: $2xF_1$
+  hepdata: null
+
+# For Sqrt_s=67 GeV and beam energies (5, 100) GeV
+EIC_NC_67GEV_EP_G1CHARM:
+  description: polarized structure function $g_1^c$ from EIC projections
+  y_label: 2xg1c
+  y_label_tex: $2xg_1^c$
+  hepdata: null
+
+EIC_NC_67GEV_EP_F1CHARM:
+  description: unpolarized structure function $F_1$ from EIC projections
+  y_label: 2xF1
+  y_label_tex: $2xF_1$
+  hepdata: null
+
+# For Sqrt_s=211 GeV and beam energies (18, 275) GeV
+EIC_NC_211GEV_EP_G1CHARM:
+  description: polarized structure function $g_1^c$ from EIC projections
+  y_label: 2xg1c
+  y_label_tex: $2xg_1^c$
+  hepdata: null
+
+EIC_NC_211GEV_EP_F1CHARM:
+  description: unpolarized structure function $F_1$ from EIC projections
+  y_label: 2xF1
+  y_label_tex: $2xF_1$
+  hepdata: null
diff --git a/extras/data/EIcC/EIcC_3_20_A1c_100fb-1.txt b/extras/data/EIcC/EIcC_3_20_A1c_100fb-1.txt
new file mode 100644
index 00000000..5186e33a
--- /dev/null
+++ b/extras/data/EIcC/EIcC_3_20_A1c_100fb-1.txt
@@ -0,0 +1,20 @@
+0.0118543       2.33943 0.0131741
+0.0147498       2.67647 0.0137443
+0.0170879       2.92672 0.0145816
+0.0193576       3.14972 0.0148745
+0.0216843       3.38092 0.0154729
+0.024134        3.61084 0.0163357
+0.026757        3.83911 0.0166505
+0.029609        4.07714 0.0173117
+0.0327378       4.32469 0.0177981
+0.036235        4.62301 0.0184076
+0.0401922       4.91469 0.0196155
+0.0447057       5.22312 0.0201606
+0.0498705       5.57079 0.0206674
+0.0559157       5.90818 0.0224443
+0.063158        6.30866 0.0235975
+0.0719283       6.76403 0.0249343
+0.082977        7.29287 0.028093
+0.098045        8.23912 0.0294843
+0.122323        9.93854 0.03264
+0.194617        15.7033 0.0412479
diff --git a/extras/data/EIcC/EIcC_5_25_A1c_100fb-1.txt b/extras/data/EIcC/EIcC_5_25_A1c_100fb-1.txt
new file mode 100644
index 00000000..12b9a0b4
--- /dev/null
+++ b/extras/data/EIcC/EIcC_5_25_A1c_100fb-1.txt
@@ -0,0 +1,20 @@
+0.0068164       2.35927 0.00858772
+0.00867301      2.70472 0.00918325
+0.0101997       2.9482  0.00989902
+0.0116997       3.18471 0.0105122
+0.0132466       3.41175 0.010999
+0.0148812       3.63892 0.0115985
+0.01666 3.8813  0.0119657
+0.018605        4.1459  0.01256
+0.0207568       4.43653 0.0129563
+0.0232027       4.74319 0.0135662
+0.0260104       5.05546 0.0141511
+0.0292666       5.42151 0.0149317
+0.0330757       5.86492 0.0155973
+0.0377102       6.34746 0.0165588
+0.0434833       6.871   0.0174989
+0.0507568       7.45673 0.0188441
+0.0604552       8.18451 0.0205689
+0.0743193       9.18998 0.0232922
+0.096939        10.822  0.0266716
+0.165807        17.5539 0.0342092
diff --git a/extras/data/EIcC/metadata.yaml b/extras/data/EIcC/metadata.yaml
new file mode 100644
index 00000000..1dbc2c43
--- /dev/null
+++ b/extras/data/EIcC/metadata.yaml
@@ -0,0 +1,28 @@
+nnpdf_id: null
+fktable_id: null
+
+# For Sqrt_s=15 GeV and beam energies (3.5, 20) GeV
+EIcC_NC_15GEV_EP_G1CHARM:
+  description: polarized structure function $g_1^c$ from EIcC projections
+  y_label: 2xg1c
+  y_label_tex: $2xg_1^c$
+  hepdata: null
+
+EIcC_NC_15GEV_EP_F1CHARM:
+  description: unpolarized structure function $F_1$ from EIcC projections
+  y_label: 2xF1
+  y_label_tex: $2xF_1$
+  hepdata: null
+
+# For Sqrt_s=22 GeV and beam energies (5, 25) GeV
+EIcC_NC_22GEV_EP_G1CHARM:
+  description: polarized structure function $g_1^c$ from EIcC projections
+  y_label: 2xg1c
+  y_label_tex: $2xg_1^c$
+  hepdata: null
+
+EIcC_NC_22GEV_EP_F1CHARM:
+  description: unpolarized structure function $F_1$ from EIcC projections
+  y_label: 2xF1
+  y_label_tex: $2xF_1$
+  hepdata: null
diff --git a/extras/data/machinery/generate/ATHENA.py b/extras/data/machinery/generate/ATHENA.py
new file mode 100644
index 00000000..a6f49932
--- /dev/null
+++ b/extras/data/machinery/generate/ATHENA.py
@@ -0,0 +1,12 @@
+import numpy as np
+
+from .utils import dump_polarized as dump
+
+# renaming
+new_names = {
+    "athena_29gev_ep": ["ATHENA_NC_29GEV_EP_G1", "ATHENA_NC_29GEV_EP_F1"],
+    "athena_45gev_ep": ["ATHENA_NC_45GEV_EP_G1", "ATHENA_NC_45GEV_EP_F1"],
+    "athena_63gev_ep": ["ATHENA_NC_63GEV_EP_G1", "ATHENA_NC_63GEV_EP_F1"],
+    "athena_105gev_ep": ["ATHENA_NC_105GEV_EP_G1", "ATHENA_NC_105GEV_EP_F1"],
+    "athena_140gev_ep": ["ATHENA_NC_140GEV_EP_G1", "ATHENA_NC_140GEV_EP_F1"],
+}
diff --git a/extras/data/machinery/generate/EIC.py b/extras/data/machinery/generate/EIC.py
new file mode 100644
index 00000000..b8cdffc8
--- /dev/null
+++ b/extras/data/machinery/generate/EIC.py
@@ -0,0 +1,10 @@
+import numpy as np
+
+from .utils import dump_polarized as dump
+
+# renaming
+new_names = {
+    "EIC_5_41_A1c_100fb-1": ["EIC_NC_43GEV_EP_G1", "EIC_NC_43GEV_EP_F1"],
+    "EIC_5_100_A1c_100fb-1": ["EIC_NC_67GEV_EP_G1", "EIC_NC_67GEV_EP_F1"],
+    "EIC_18_275_A1c_100fb-1": ["EIC_NC_211GEV_EP_G1", "EIC_NC_211GEV_EP_F1"],
+}
diff --git a/extras/data/machinery/generate/EIcC.py b/extras/data/machinery/generate/EIcC.py
new file mode 100644
index 00000000..89087a86
--- /dev/null
+++ b/extras/data/machinery/generate/EIcC.py
@@ -0,0 +1,9 @@
+import numpy as np
+
+from .utils import dump_polarized as dump
+
+# renaming
+new_names = {
+    "EIcC_3_20_A1c_100fb-1": ["EIcC_NC_15GEV_EP_G1", "EIcC_NC_15GEV_EP_F1"],
+    "EIcC_5_25_A1c_100fb-1": ["EIcC_NC_22GEV_EP_G1", "EIcC_NC_22GEV_EP_F1"],
+}
diff --git a/extras/data/machinery/generate/__init__.py b/extras/data/machinery/generate/__init__.py
index 02af6c76..687ba064 100644
--- a/extras/data/machinery/generate/__init__.py
+++ b/extras/data/machinery/generate/__init__.py
@@ -1,4 +1,5 @@
 from . import (
+    ATHENA,
     BCDMS,
     CHORUS,
     COMPASS15,
@@ -6,6 +7,7 @@
     E143,
     E154,
     E155,
+    EIC,
     EMC,
     HERA,
     HERMES,
@@ -21,6 +23,7 @@
     SLAC,
     SMC,
     SMCSX,
+    EIcC,
     utils,
 )
 
@@ -49,6 +52,9 @@
         NUTEV,
         POS,
         SLAC,
+        EIC,
+        EIcC,
+        ATHENA,
     ]
 }
 
diff --git a/extras/data/machinery/generate/utils.py b/extras/data/machinery/generate/utils.py
index b8a78492..76156fd3 100644
--- a/extras/data/machinery/generate/utils.py
+++ b/extras/data/machinery/generate/utils.py
@@ -81,15 +81,34 @@ def dump_polarized(src_path, target):
         observables dictionary, corresponding to the runcard
 
     """
+
+    # We make a case distinction for several experiments:
     obs = obs_template.copy()
-    data = load(src_path, 0, ["x", "Q2"])
-    dict_kins = [
-        dict(x=d["x"]["mid"], y=d["y"]["mid"], Q2=d["Q2"]["mid"]) for d in data
-    ]
+    data = np.genfromtxt(src_path)
+
+    if (
+        "ATHENA" in target.parent.name
+        or "EIC" in target.parent.name
+        or "EIcC" in target.parent.name
+    ):
+        dict_kins = [dict(x=float(d[0]), y=0.0, Q2=float(d[1])) for d in data]
+
+    else:
+        data = load(src_path, 0, ["x", "Q2"])
+        dict_kins = [
+            dict(x=d["x"]["mid"], y=d["y"]["mid"], Q2=d["Q2"]["mid"]) for d in data
+        ]
+
+    heavyness = "total"
+    if "EIC" in target.parent.name or "EIcC" in target.parent.name:
+        heavyness = "charm"
 
     obs["PolarizationDIS"] = 0.0 if "_F1" in target.parent.name else 1.0
-    observable_name = "F1_total" if "_F1" in target.parent.name else "g1_total"
+    observable_name = (
+        f"F1_{heavyness}" if "_F1" in target.parent.name else f"g1_{heavyness}"
+    )
     obs["observables"] = {observable_name: dict_kins}
+
     if "_ep_" in str(src_path.stem) or "_mup_" in str(src_path.stem):
         obs["TargetDIS"] = "proton"
     elif "_en_" in str(src_path.stem) or "_mun_" in str(src_path.stem):