diff --git a/modules/Loading/R/load_decadal.R b/modules/Loading/R/load_decadal.R
index 0170e9cd67b343b1ae5dc325e20a199fa643911b..d3b4f4399c3bf65a47239bdeb9423b8c29257d5b 100644
--- a/modules/Loading/R/load_decadal.R
+++ b/modules/Loading/R/load_decadal.R
@@ -24,8 +24,8 @@ load_decadal <- function(recipe) {
   #-------------------------
   # Read from recipe:
   #-------------------------
-  exp.name <- recipe$Analysis$Datasets$System$name #'HadGEM3'
-  ref.name <- recipe$Analysis$Datasets$Reference$name #'era5'
+  exp.name <- recipe$Analysis$Datasets$System$name # 'HadGEM3'
+  ref.name <- recipe$Analysis$Datasets$Reference$name # 'era5'
   member <- strsplit(recipe$Analysis$Datasets$System$member, ', | |,')[[1]] #c("r1i1p1f2", "r2i1p1f2")
   #  variable <- recipe$Analysis$Variables$name #'tas'
   variable <- strsplit(recipe$Analysis$Variables$name, ", | |,")[[1]]
diff --git a/modules/Loading/R/load_seasonal.R b/modules/Loading/R/load_seasonal.R
index 7eb357574c58d32b98f4a605af8508f27cc00ab7..42b74b162fd18a066600bf383db7a4805105462e 100644
--- a/modules/Loading/R/load_seasonal.R
+++ b/modules/Loading/R/load_seasonal.R
@@ -46,9 +46,8 @@ load_seasonal <- function(recipe) {
   ## TODO: define fcst.name
   ##fcst.name <- recipe$Analysis$Datasets$System[[sys]]$name
   
-  # get esarchive datasets dict:
-  ## TODO: Adapt to 'filesystem' option in recipe
-  archive <- read_yaml("conf/archive.yml")$esarchive
+  # get datasets dict:
+  archive <- read_yaml("conf/archive.yml")[[recipe$Run$filesystem]]
   exp_descrip <- archive$System[[exp.name]]
   
   freq.hcst <- unlist(exp_descrip[[store.freq]][variable[1]])