Class Diagram[V1.4.1]

- Fix some issues