Add dbName support