added support for multiple driver tables