Updated UML Diagram - Joe