Updated class Diagram