Moved driver-parsing into Driver.cs