Updated class diagram and old diagrams according to feedback