Updated Entity Diagrams - Omar