added support for database name