Add support for basic options.