Revised Database Diagram