Improve options