Working on new class diagram