Additional Classes, few fixed in ClassDiagram