More changes for the Db->Database refactor