More work on the DB Class