Refactored the driver classes