Added new classes and class diagram