Removed support for option names