more refactoring to align the driver with new framework