Added support for database selector