Add support for options with spaces in names