Class Diagram Improvements.