Class Diagram and CRC Update