Additional driver refactor