Updated main class diagram