Moved another option set to support code.