Data & Solution ClassDiagram Update