Improve options inheritance