Add support for uninitialized options