Added some classes and class diagram