Drive related refactoring.