Changed how options are handled