Updated the DB constructor to reflect our latest DB design