Version 2 of the DB Diagram