Detailed Class Diagrams - update 2