Updated class diagram