Proper support for databases and password protected instances