Rearanged class diagram