Main/Supportive entities vs. Mandatory/Optional classes

[jimjyang]

In the final release of v.3.2.0, the terms "main entities" and "supportive entities" are introduced. However, the overview drawing is still using the terms "mandatory classes" and "optional classes" (the legend). Is it because the drawing is not (yet) updated, or are there still mandatory vs. optional classes in CPSV-AP?