Rebuilt class diagram