Updated driver classes to new specification