Added support for selecting a database
(cannot confirm)