Removed dependencies on db drivers