Add CoreDriver to simplify DriverInterface changes