Adjusted the Class Diagram again; some elements were not fully shown.