Updated Master UML Diagram