Revert "Class diagram final today update"

This reverts commit 2955353f30df0aa3b99f4a55f67693a072ca69e6.
Revert "Revert "Class diagram final today update""

This reverts commit 01d6df290e39a42bbae4ecf725738684f3494866.