Revert "Revert "Updated UML""

This reverts commit 93444661ebb2f4b5b1ee80a000b553ebd3310e1a.