Added database selection