small changes in the driver utilities
Refactoring the Driver hierarchy