Updated Class Diagram and Layer Diagram