DB Diagram modified