Updated Entities Class Diagram