Update UML to current implementation