renamed driver fields and created company table support