Feature/Driver options fully added. Done!