Implemented the rest of the DB objects and updated others