Add support for multiple users/databases