Updated draft UML diagram