UML Update
Revert "UML Update"

This reverts commit 40270546725847f9a34aaea53c7946e8849e2feb.