Working on class diagram