Updated client + database selection