DriverFactory now returns appropriate driver