restructuring driver options support - in progress.