Added support for multiple databases/users