#3 Updated class diagram