Added classes and class diagram