diff --git a/.gitmodules b/.gitmodules
index 9d8e1963..87b6fa6f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,9 @@
 [submodule "ece2cmor3/resources/cmip7-cmor-tables"]
 	path = ece2cmor3/resources/cmip7-cmor-tables
 	url = https://github.com/WCRP-CMIP/cmip7-cmor-tables.git
+[submodule "ece2cmor3/resources/cmip6plus-tables/CMIP6Plus_CVs"]
+	path = ece2cmor3/resources/cmip6plus-tables/CMIP6Plus_CVs
+	url = https://github.com/WCRP-CMIP/CMIP6Plus_CVs.git
+[submodule "ece2cmor3/resources/cmip6plus-tables/mip-cmor-tables"]
+	path = ece2cmor3/resources/cmip6plus-tables/mip-cmor-tables
+	url = https://github.com/PCMDI/mip-cmor-tables.git
diff --git a/ece2cmor3/resources/cmip6plus-tables/CMIP6Plus_CV.json b/ece2cmor3/resources/cmip6plus-tables/CMIP6Plus_CV.json
new file mode 120000
index 00000000..75aa6c14
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/CMIP6Plus_CV.json
@@ -0,0 +1 @@
+CMIP6Plus_CVs/CVs/CMIP6Plus_CV.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/CMIP6Plus_CVs b/ece2cmor3/resources/cmip6plus-tables/CMIP6Plus_CVs
new file mode 160000
index 00000000..c3b18c69
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/CMIP6Plus_CVs
@@ -0,0 +1 @@
+Subproject commit c3b18c69a92a53acafbd152fabac168077b95bd6
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_ACmon.json b/ece2cmor3/resources/cmip6plus-tables/MIP_ACmon.json
new file mode 120000
index 00000000..3d1583e7
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_ACmon.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_ACmon.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_ACmonZ.json b/ece2cmor3/resources/cmip6plus-tables/MIP_ACmonZ.json
new file mode 120000
index 00000000..190acad9
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_ACmonZ.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_ACmonZ.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AE1hr.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AE1hr.json
new file mode 120000
index 00000000..fecf660a
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AE1hr.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AE1hr.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AE3hrPt.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AE3hrPt.json
new file mode 120000
index 00000000..d6e482c8
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AE3hrPt.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AE3hrPt.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AE3hrPtLev.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AE3hrPtLev.json
new file mode 120000
index 00000000..883ffe8b
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AE3hrPtLev.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AE3hrPtLev.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AE6hr.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AE6hr.json
new file mode 120000
index 00000000..833b3552
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AE6hr.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AE6hr.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AE6hrPt.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AE6hrPt.json
new file mode 120000
index 00000000..f47fd4a8
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AE6hrPt.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AE6hrPt.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AE6hrPtLev.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AE6hrPtLev.json
new file mode 120000
index 00000000..3095b52a
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AE6hrPtLev.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AE6hrPtLev.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AEday.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AEday.json
new file mode 120000
index 00000000..321801b5
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AEday.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AEday.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AEmon.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AEmon.json
new file mode 120000
index 00000000..ffbec582
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AEmon.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AEmon.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AEmonLev.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AEmonLev.json
new file mode 120000
index 00000000..cb4be64b
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AEmonLev.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AEmonLev.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AEmonZ.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AEmonZ.json
new file mode 120000
index 00000000..1b58ed92
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AEmonZ.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AEmonZ.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AEsubhrPt.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AEsubhrPt.json
new file mode 120000
index 00000000..00df18f9
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AEsubhrPt.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AEsubhrPt.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AEsubhrPtSite.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AEsubhrPtSite.json
new file mode 120000
index 00000000..b81f4388
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AEsubhrPtSite.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AEsubhrPtSite.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AP1hr.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AP1hr.json
new file mode 120000
index 00000000..c73c6d0d
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AP1hr.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AP1hr.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AP1hrPt.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AP1hrPt.json
new file mode 120000
index 00000000..db286279
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AP1hrPt.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AP1hrPt.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AP3hr.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AP3hr.json
new file mode 120000
index 00000000..07b067cc
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AP3hr.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AP3hr.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AP3hrPt.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AP3hrPt.json
new file mode 120000
index 00000000..90ae6b6c
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AP3hrPt.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AP3hrPt.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AP3hrPtLev.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AP3hrPtLev.json
new file mode 120000
index 00000000..c57d909d
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AP3hrPtLev.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AP3hrPtLev.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AP6hr.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AP6hr.json
new file mode 120000
index 00000000..2e38eb09
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AP6hr.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AP6hr.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AP6hrPt.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AP6hrPt.json
new file mode 120000
index 00000000..332bdd35
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AP6hrPt.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AP6hrPt.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AP6hrPtLev.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AP6hrPtLev.json
new file mode 120000
index 00000000..846ecb5a
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AP6hrPtLev.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AP6hrPtLev.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_AP6hrPtZ.json b/ece2cmor3/resources/cmip6plus-tables/MIP_AP6hrPtZ.json
new file mode 120000
index 00000000..0f09e9ff
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_AP6hrPtZ.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_AP6hrPtZ.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_APday.json b/ece2cmor3/resources/cmip6plus-tables/MIP_APday.json
new file mode 120000
index 00000000..795ad660
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_APday.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_APday.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_APdayLev.json b/ece2cmor3/resources/cmip6plus-tables/MIP_APdayLev.json
new file mode 120000
index 00000000..f3056e50
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_APdayLev.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_APdayLev.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_APdayZ.json b/ece2cmor3/resources/cmip6plus-tables/MIP_APdayZ.json
new file mode 120000
index 00000000..812dcd69
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_APdayZ.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_APdayZ.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_APfx.json b/ece2cmor3/resources/cmip6plus-tables/MIP_APfx.json
new file mode 120000
index 00000000..65fa3b77
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_APfx.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_APfx.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_APmon.json b/ece2cmor3/resources/cmip6plus-tables/MIP_APmon.json
new file mode 120000
index 00000000..5b3f1044
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_APmon.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_APmon.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_APmonClim.json b/ece2cmor3/resources/cmip6plus-tables/MIP_APmonClim.json
new file mode 120000
index 00000000..a7bd909f
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_APmonClim.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_APmonClim.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_APmonClimLev.json b/ece2cmor3/resources/cmip6plus-tables/MIP_APmonClimLev.json
new file mode 120000
index 00000000..60410ec5
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_APmonClimLev.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_APmonClimLev.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_APmonDiurnal.json b/ece2cmor3/resources/cmip6plus-tables/MIP_APmonDiurnal.json
new file mode 120000
index 00000000..131b4763
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_APmonDiurnal.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_APmonDiurnal.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_APmonLev.json b/ece2cmor3/resources/cmip6plus-tables/MIP_APmonLev.json
new file mode 120000
index 00000000..e82e258b
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_APmonLev.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_APmonLev.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_APmonZ.json b/ece2cmor3/resources/cmip6plus-tables/MIP_APmonZ.json
new file mode 120000
index 00000000..90b16b3b
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_APmonZ.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_APmonZ.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_APsubhrPt.json b/ece2cmor3/resources/cmip6plus-tables/MIP_APsubhrPt.json
new file mode 120000
index 00000000..22450b8b
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_APsubhrPt.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_APsubhrPt.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_APsubhrPtLev.json b/ece2cmor3/resources/cmip6plus-tables/MIP_APsubhrPtLev.json
new file mode 120000
index 00000000..0ecef3d6
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_APsubhrPtLev.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_APsubhrPtLev.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_APsubhrPtSite.json b/ece2cmor3/resources/cmip6plus-tables/MIP_APsubhrPtSite.json
new file mode 120000
index 00000000..37110e81
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_APsubhrPtSite.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_APsubhrPtSite.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_GIAfx.json b/ece2cmor3/resources/cmip6plus-tables/MIP_GIAfx.json
new file mode 120000
index 00000000..bfb3c4e8
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_GIAfx.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_GIAfx.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_GIAmon.json b/ece2cmor3/resources/cmip6plus-tables/MIP_GIAmon.json
new file mode 120000
index 00000000..4b12cb10
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_GIAmon.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_GIAmon.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_GIAyr.json b/ece2cmor3/resources/cmip6plus-tables/MIP_GIAyr.json
new file mode 120000
index 00000000..610af0c5
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_GIAyr.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_GIAyr.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_GIGfx.json b/ece2cmor3/resources/cmip6plus-tables/MIP_GIGfx.json
new file mode 120000
index 00000000..c74a744f
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_GIGfx.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_GIGfx.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_GIGmon.json b/ece2cmor3/resources/cmip6plus-tables/MIP_GIGmon.json
new file mode 120000
index 00000000..87dddf41
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_GIGmon.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_GIGmon.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_GIGyr.json b/ece2cmor3/resources/cmip6plus-tables/MIP_GIGyr.json
new file mode 120000
index 00000000..135cd3cb
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_GIGyr.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_GIGyr.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_LI3hrPt.json b/ece2cmor3/resources/cmip6plus-tables/MIP_LI3hrPt.json
new file mode 120000
index 00000000..d0838ab1
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_LI3hrPt.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_LI3hrPt.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_LI6hrPt.json b/ece2cmor3/resources/cmip6plus-tables/MIP_LI6hrPt.json
new file mode 120000
index 00000000..eca23dfc
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_LI6hrPt.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_LI6hrPt.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_LIday.json b/ece2cmor3/resources/cmip6plus-tables/MIP_LIday.json
new file mode 120000
index 00000000..062b403e
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_LIday.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_LIday.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_LIfx.json b/ece2cmor3/resources/cmip6plus-tables/MIP_LIfx.json
new file mode 120000
index 00000000..c93d4f61
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_LIfx.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_LIfx.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_LImon.json b/ece2cmor3/resources/cmip6plus-tables/MIP_LImon.json
new file mode 120000
index 00000000..de26140b
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_LImon.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_LImon.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_LIsubhrPtSite.json b/ece2cmor3/resources/cmip6plus-tables/MIP_LIsubhrPtSite.json
new file mode 120000
index 00000000..71fc7e8b
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_LIsubhrPtSite.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_LIsubhrPtSite.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_LP3hr.json b/ece2cmor3/resources/cmip6plus-tables/MIP_LP3hr.json
new file mode 120000
index 00000000..75f5088c
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_LP3hr.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_LP3hr.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_LP3hrPt.json b/ece2cmor3/resources/cmip6plus-tables/MIP_LP3hrPt.json
new file mode 120000
index 00000000..ff39f712
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_LP3hrPt.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_LP3hrPt.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_LP6hrPt.json b/ece2cmor3/resources/cmip6plus-tables/MIP_LP6hrPt.json
new file mode 120000
index 00000000..3f7c35ec
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_LP6hrPt.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_LP6hrPt.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_LPday.json b/ece2cmor3/resources/cmip6plus-tables/MIP_LPday.json
new file mode 120000
index 00000000..e77159a1
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_LPday.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_LPday.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_LPfx.json b/ece2cmor3/resources/cmip6plus-tables/MIP_LPfx.json
new file mode 120000
index 00000000..9699901a
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_LPfx.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_LPfx.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_LPmon.json b/ece2cmor3/resources/cmip6plus-tables/MIP_LPmon.json
new file mode 120000
index 00000000..b32b79b8
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_LPmon.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_LPmon.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_LPyr.json b/ece2cmor3/resources/cmip6plus-tables/MIP_LPyr.json
new file mode 120000
index 00000000..70f46f4a
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_LPyr.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_LPyr.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_LPyrPt.json b/ece2cmor3/resources/cmip6plus-tables/MIP_LPyrPt.json
new file mode 120000
index 00000000..b9765070
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_LPyrPt.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_LPyrPt.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OBday.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OBday.json
new file mode 120000
index 00000000..c54c4cb4
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OBday.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OBday.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OBmon.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OBmon.json
new file mode 120000
index 00000000..cbe23798
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OBmon.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OBmon.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OBmonLev.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OBmonLev.json
new file mode 120000
index 00000000..e52ac071
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OBmonLev.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OBmonLev.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OByr.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OByr.json
new file mode 120000
index 00000000..d371d555
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OByr.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OByr.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OByrLev.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OByrLev.json
new file mode 120000
index 00000000..533f2ebf
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OByrLev.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OByrLev.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OP3hrPt.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OP3hrPt.json
new file mode 120000
index 00000000..5ddc1915
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OP3hrPt.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OP3hrPt.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OPday.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OPday.json
new file mode 120000
index 00000000..5ec0987c
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OPday.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OPday.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OPdec.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OPdec.json
new file mode 120000
index 00000000..7d9a0e3f
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OPdec.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OPdec.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OPdecLev.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OPdecLev.json
new file mode 120000
index 00000000..e93ed563
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OPdecLev.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OPdecLev.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OPdecZ.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OPdecZ.json
new file mode 120000
index 00000000..a7a3cb92
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OPdecZ.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OPdecZ.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OPfx.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OPfx.json
new file mode 120000
index 00000000..41b93e0e
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OPfx.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OPfx.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OPmon.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OPmon.json
new file mode 120000
index 00000000..1225a1d5
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OPmon.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OPmon.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OPmonClim.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OPmonClim.json
new file mode 120000
index 00000000..59efbf7d
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OPmonClim.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OPmonClim.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OPmonClimLev.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OPmonClimLev.json
new file mode 120000
index 00000000..1fea8203
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OPmonClimLev.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OPmonClimLev.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OPmonLev.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OPmonLev.json
new file mode 120000
index 00000000..5a69377d
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OPmonLev.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OPmonLev.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OPmonZ.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OPmonZ.json
new file mode 120000
index 00000000..b64a95d5
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OPmonZ.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OPmonZ.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OPyr.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OPyr.json
new file mode 120000
index 00000000..f07a056e
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OPyr.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OPyr.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_OPyrLev.json b/ece2cmor3/resources/cmip6plus-tables/MIP_OPyrLev.json
new file mode 120000
index 00000000..8932e911
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_OPyrLev.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_OPyrLev.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_SIday.json b/ece2cmor3/resources/cmip6plus-tables/MIP_SIday.json
new file mode 120000
index 00000000..b03c525e
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_SIday.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_SIday.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_SImon.json b/ece2cmor3/resources/cmip6plus-tables/MIP_SImon.json
new file mode 120000
index 00000000..9e23d6fa
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_SImon.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_SImon.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_SImonPt.json b/ece2cmor3/resources/cmip6plus-tables/MIP_SImonPt.json
new file mode 120000
index 00000000..46681c58
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_SImonPt.json
@@ -0,0 +1 @@
+mip-cmor-tables/Tables/MIP_SImonPt.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_coordinate.json b/ece2cmor3/resources/cmip6plus-tables/MIP_coordinate.json
new file mode 120000
index 00000000..0481dbd2
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_coordinate.json
@@ -0,0 +1 @@
+mip-cmor-tables/Auxillary_files/MIP_coordinate.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_formula_terms.json b/ece2cmor3/resources/cmip6plus-tables/MIP_formula_terms.json
new file mode 120000
index 00000000..a56633d5
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_formula_terms.json
@@ -0,0 +1 @@
+mip-cmor-tables/Auxillary_files/MIP_formula_terms.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/MIP_grids.json b/ece2cmor3/resources/cmip6plus-tables/MIP_grids.json
new file mode 120000
index 00000000..995d36d6
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/MIP_grids.json
@@ -0,0 +1 @@
+mip-cmor-tables/Auxillary_files/MIP_grids.json
\ No newline at end of file
diff --git a/ece2cmor3/resources/cmip6plus-tables/mip-cmor-tables b/ece2cmor3/resources/cmip6plus-tables/mip-cmor-tables
new file mode 160000
index 00000000..e5bac791
--- /dev/null
+++ b/ece2cmor3/resources/cmip6plus-tables/mip-cmor-tables
@@ -0,0 +1 @@
+Subproject commit e5bac791f5cd1dfc926eaf00cbd91fc386b6d4a8
diff --git a/ece2cmor3/scripts/submit-script-examples/submit-at-hpc2020-ece2cmor-leg-job-test-all-cmip6Plus.sh b/ece2cmor3/scripts/submit-script-examples/submit-at-hpc2020-ece2cmor-leg-job-test-all-cmip6Plus.sh
index 278b870e..2c5eece4 100755
--- a/ece2cmor3/scripts/submit-script-examples/submit-at-hpc2020-ece2cmor-leg-job-test-all-cmip6Plus.sh
+++ b/ece2cmor3/scripts/submit-script-examples/submit-at-hpc2020-ece2cmor-leg-job-test-all-cmip6Plus.sh
@@ -38,7 +38,7 @@
    MIP=CMIP
    EXPERIMENT_NAME=esm-hist
 
-   TABLEDIR=/home/nktr/cmorize/cmip6plus-tables
+   TABLEDIR=../../resources/cmip6plus-tables/
    TABLEPREFIX=MIP
 
    ECEDIR=${SCRATCH}/${ece_branch_root_dir}/$EXPID/output/$COMPONENT/$LEG
diff --git a/ece2cmor3/scripts/submit-script-examples/submit-at-hpc2020-ece2cmor-leg-job-xfx-cmip6Plus.sh b/ece2cmor3/scripts/submit-script-examples/submit-at-hpc2020-ece2cmor-leg-job-xfx-cmip6Plus.sh
index b85535fa..313843d8 100755
--- a/ece2cmor3/scripts/submit-script-examples/submit-at-hpc2020-ece2cmor-leg-job-xfx-cmip6Plus.sh
+++ b/ece2cmor3/scripts/submit-script-examples/submit-at-hpc2020-ece2cmor-leg-job-xfx-cmip6Plus.sh
@@ -38,6 +38,9 @@
    MIP=TIPMIP
    EXPERIMENT_NAME=esm-up2p0-gwl2p0
 
+   TABLEDIR=../../resources/cmip6plus-tables/
+   TABLEPREFIX=MIP
+
    ECEDIR=${SCRATCH}/${ece_branch_root_dir}/$EXP/output/$COMPONENT/$LEG
    METADATA=${PWD}/../../resources/metadata-templates/cmip6Plus-${MIP}-metadata-$COMPONENT-template.json
    TEMPDIR=${SCRATCH}/temp-cmor-dir/$EXP/$COMPONENT/$LEG
@@ -58,18 +61,18 @@
    export UVCDAT_ANONYMOUS_LOG=false
   #export ECE2CMOR3_IFS_CLEANUP=FALSE
 
-   ece2cmor $ECEDIR --exp               $EXP                                \
-                    --ececonf           $ECEMODEL                           \
-                    --$COMPONENT                                            \
-                    --meta              $METADATA                           \
-                    --varlist           $VARLIST                            \
-                    --tabledir          /home/nktr/cmorize/cmip6plus-tables \
-                    --tableprefix       MIP                                 \
-                    --tmpdir            $TEMPDIR                            \
-                    --odir              $ODIR                               \
-                    --npp               $NPP                                \
-                    --overwritemode     replace                             \
-                    --skip_alevel_vars                                      \
+   ece2cmor $ECEDIR --exp               $EXP         \
+                    --ececonf           $ECEMODEL    \
+                    --$COMPONENT                     \
+                    --meta              $METADATA    \
+                    --varlist           $VARLIST     \
+                    --tabledir          $TABLEDIR    \
+                    --tableprefix       $TABLEPREFIX \
+                    --tmpdir            $TEMPDIR     \
+                    --odir              $ODIR        \
+                    --npp               $NPP         \
+                    --overwritemode     replace      \
+                    --skip_alevel_vars               \
                     --log
 
    if [ "$COMPONENT" = "nemo" ]; then
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 00000000..581150f9
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,4 @@
+# pytest.ini
+[pytest]
+testpaths =
+    test