Feature/advanced rmd options