Drivers refactoring