Updated class diagram (after presentation)