Revised Class Diagram.