Change Options so that switches can now optionally take values