Updated UML Diagram. Draft.