Update Database API to handle secondary DBs