Updated class diagrams