Improve options and handling