Removing requirement for $dbname