Detailed Class Diagrams - update 3