Improved class diagram