Shoring up more of DB provider