Updated ClassDiagram to make a bit more sense.