Updated the Class Diagrams... -Jude