Updated my UML with recent changes