UML Class Diagram Updated & Simplified