Improve the options interface