More use of DbClient