Partial work on Driver integration